Merge pull request #7311 from wastoresh/locationusage

[Storage] Support get Storage Location Usage

Author: cormacpayne

src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.cs

@@ -121,5 +121,12 @@ public void TestSetAzureStorageAccountStorageV2()
         {
             TestController.NewInstance.RunPsTest(_logger, "Test-SetAzureStorageAccountStorageV2");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetAzureStorageLocationUsage()
+        {
+            TestController.NewInstance.RunPsTest(_logger, "Test-GetAzureStorageLocationUsage");
+        }
     }
 }

src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.ps1

@@ -657,3 +657,19 @@ function Test-SetAzureStorageAccountStorageV2
         Clean-ResourceGroup $rgname
     }
 }
+
+<#
+.SYNOPSIS
+Test GetAzureStorageUsage with current Location
+.Description
+AzureAutomationTest
+#>
+function Test-GetAzureStorageLocationUsage
+{
+        # Test
+        $loc = Get-ProviderLocation_Stage ResourceManagement; 
+
+        $usage = Get-AzureRmStorageUsage -Location $loc
+        Assert-AreNotEqual 0 $usage.Limit;
+        Assert-AreNotEqual 0 $usage.CurrentValue;      
+}

src/ResourceManager/Storage/Commands.Management.Storage.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestGetAzureStorageLocationUsage.json

@@ -0,0 +1,71 @@
+{
+  "Entries": [
+    {
+      "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/providers/Microsoft.Storage/locations/eastus2(stage)/usages?api-version=2018-03-01-preview",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzMiUyOHN0YWdlJTI5L3VzYWdlcz9hcGktdmVyc2lvbj0yMDE4LTAzLTAxLXByZXZpZXc=",
+      "RequestMethod": "GET",
+      "RequestBody": "",
+      "RequestHeaders": {
+        "x-ms-client-request-id": [
+          "a9a430c2-5ecf-4f95-ad41-90e0b9977ac2"
+        ],
+        "accept-language": [
+          "en-US"
+        ],
+        "User-Agent": [
+          "FxVersion/4.7.3163.0",
+          "OSName/Windows10Enterprise",
+          "OSVersion/6.3.17134",
+          "Microsoft.Azure.Management.Storage.StorageManagementClient/8.1.0.0"
+        ]
+      },
+      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 16,\r\n      \"limit\": 250,\r\n      \"name\": {\r\n        \"value\": \"StorageAccounts\",\r\n        \"localizedValue\": \"Storage Accounts\"\r\n      }\r\n    }\r\n  ]\r\n}",
+      "ResponseHeaders": {
+        "Content-Length": [
+          "129"
+        ],
+        "Content-Type": [
+          "application/json"
+        ],
+        "Expires": [
+          "-1"
+        ],
+        "Pragma": [
+          "no-cache"
+        ],
+        "x-ms-request-id": [
+          "0c699dac-d2a0-4c63-8707-2ff8c39e1980"
+        ],
+        "Strict-Transport-Security": [
+          "max-age=31536000; includeSubDomains"
+        ],
+        "x-ms-ratelimit-remaining-subscription-reads": [
+          "11999"
+        ],
+        "x-ms-correlation-request-id": [
+          "96f88cf3-b6ed-41f4-84bb-f30350aa6106"
+        ],
+        "x-ms-routing-request-id": [
+          "SOUTHEASTASIA:20180920T091605Z:96f88cf3-b6ed-41f4-84bb-f30350aa6106"
+        ],
+        "X-Content-Type-Options": [
+          "nosniff"
+        ],
+        "Cache-Control": [
+          "no-cache"
+        ],
+        "Date": [
+          "Thu, 20 Sep 2018 09:16:05 GMT"
+        ],
+        "Server": [
+          "Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
+        ]
+      },
+      "StatusCode": 200
+    }
+  ],
+  "Names": {},
+  "Variables": {
+    "SubscriptionId": "ce4a7590-4722-4bcf-a2c6-e473e9f11778"
+  }
+}

src/ResourceManager/Storage/Commands.Management.Storage/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Support get the Storage resource usage of a specific location
+    - Get-AzureRmStorageUsage
 
 ## Version 5.1.0
 * Upgrade to Azure Storage Client Library 9.3.0 

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/GetAzureStorageUsage.cs

@@ -13,19 +13,41 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Management.Storage.Models;
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Storage;
+using Microsoft.Azure.Management.Storage.Models;
+using System.Collections.Generic;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Management.Storage.StorageAccount
 {
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "StorageUsage"), OutputType(typeof(PSUsage))]
     public class GetAzureStorageUsageCommand : StorageAccountBaseCmdlet
     {
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Storage Accounts Location.")]
+        [LocationCompleter("Microsoft.Storage/storageAccounts")]
+        [ValidateNotNullOrEmpty]
+        public string Location { get; set; }
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
-            foreach (var usage in this.StorageClient.Usages.List())
+            //Get usage
+            IEnumerable<Usage> usages;
+            if (Location == null)
+            {
+                usages = this.StorageClient.Usages.List();
+            }
+            else
+            {
+                usages = this.StorageClient.Usages.ListByLocation(Location);
+            }
+
+            //Output usage
+            foreach (var usage in usages)
             {
                 WriteObject(new PSUsage()
                 {

src/ResourceManager/Storage/Commands.Management.Storage/help/Get-AzureRmStorageUsage.md

@@ -14,7 +14,7 @@ Gets the Storage resource usage of the current subscription.
 ## SYNTAX
 
 ```
-Get-AzureRmStorageUsage [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+Get-AzureRmStorageUsage [-Location <String>] [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -28,6 +28,20 @@ PS C:\>Get-AzureRmStorageUsage
 ```
 
 This command gets the Storage resources usage of the current subscription.
+ 
+
+### Example 2: Get the storage resources usage of specified location
+```
+PS C:\>Get-AzureRmStorageUsage -Location 'West US'
+
+LocalizedName : Storage Accounts
+Name          : StorageAccounts
+Unit          : Count
+CurrentValue  : 18
+Limit         : 250
+```
+
+This command gets the Storage resources usage of of specified location under the current subscription.
 
 ## PARAMETERS
 
@@ -46,6 +60,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Location
+Indicate to get Storage resources usage on the specified location.
+If not specified, will get Storage resources usage on all locations under the subscription.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).