update

Author: huangpf

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1

@@ -382,7 +382,7 @@ function Test-VirtualMachineSizeAndUsage
 
         # Test Usage
         $u1 = Get-AzureVMUsage -Location ($loc -replace ' ');
-        Validate-VirtualMachineUsage $u1;
+        Validate-VirtualMachineUsage $u1.Usages;
 
         $passed = $true;
     }

src/ResourceManager/Compute/Commands.Compute/ExtensionImages/GetAzureVMExtensionImageCommand.cs

@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.Get, ProfileNouns.VirtualMachineExtensionImage)]
-    [OutputType(typeof(VirtualMachineExtensionImage))]
+    [OutputType(typeof(VirtualMachineExtensionImageGetResponse))]
     public class GetAzureVMExtensionImageCommand : VirtualMachineExtensionImageBaseCmdlet
     {
         [Parameter(Mandatory = true), ValidateNotNullOrEmpty]
@@ -51,7 +51,7 @@ public override void ExecuteCmdlet()
                 Version = Version
             };
 
-            var result = this.VirtualMachineExtensionImageClient.Get(parameters);
+            VirtualMachineExtensionImageGetResponse result = this.VirtualMachineExtensionImageClient.Get(parameters);
             WriteObject(result);
         }
     }

src/ResourceManager/Compute/Commands.Compute/ExtensionImages/GetAzureVMExtensionImageTypeCommand.cs

@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.Get, ProfileNouns.VirtualMachineExtensionImageType)]
-    [OutputType(typeof(VirtualMachineImageResource))]
+    [OutputType(typeof(VirtualMachineImageResourceList))]
     public class GetAzureVMExtensionImageTypeCommand : VirtualMachineExtensionImageBaseCmdlet
     {
         [Parameter(Mandatory = true), ValidateNotNullOrEmpty]
@@ -39,7 +39,7 @@ public override void ExecuteCmdlet()
                 Publishername = PublisherName
             };
 
-            var result = this.VirtualMachineExtensionImageClient.ListTypes(parameters);
+            VirtualMachineImageResourceList result = this.VirtualMachineExtensionImageClient.ListTypes(parameters);
             WriteObject(result);
         }
     }

src/ResourceManager/Compute/Commands.Compute/ExtensionImages/GetAzureVMExtensionImageVersionCommand.cs

@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.Get, ProfileNouns.VirtualMachineExtensionImageVersion)]
-    [OutputType(typeof(VirtualMachineImageResource))]
+    [OutputType(typeof(VirtualMachineImageResourceList))]
     public class GetAzureVMExtensionImageVersionCommand : VirtualMachineExtensionImageBaseCmdlet
     {
         [Parameter(Mandatory = true), ValidateNotNullOrEmpty]
@@ -47,7 +47,7 @@ public override void ExecuteCmdlet()
                 FilterExpression = FilterExpression
             };
 
-            var result = this.VirtualMachineExtensionImageClient.ListVersions(parameters);
+            VirtualMachineImageResourceList result = this.VirtualMachineExtensionImageClient.ListVersions(parameters);
             WriteObject(result);
         }
     }

src/ResourceManager/Compute/Commands.Compute/Images/GetAzureVMImageCommand.cs

@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.Get, ProfileNouns.VirtualMachineImage, DefaultParameterSetName = ListVirtualMachineImageParamSet)]
-    [OutputType(typeof(VirtualMachineImageResourceList), typeof(VirtualMachineImageGetResponse))]
+    [OutputType(typeof(VirtualMachineImageGetResponse), typeof(VirtualMachineImageResourceList))]
     public class GetAzureVMImageCommand : VirtualMachineImageBaseCmdlet
     {
         protected const string GetVirtualMachineImageDetailsParamSet = "GetVirtualMachineImageDetailsParamSet";
@@ -59,7 +59,7 @@ public override void ExecuteCmdlet()
                     Version = Version
                 };
 
-                var result = this.VirtualMachineImageClient.Get(parameters);
+                VirtualMachineImageGetResponse result = this.VirtualMachineImageClient.Get(parameters);
                 WriteObject(result);
             }
             else if (this.ParameterSetName == ListVirtualMachineImageParamSet)
@@ -73,7 +73,7 @@ public override void ExecuteCmdlet()
                     FilterExpression = FilterExpression
                 };
 
-                var result = this.VirtualMachineImageClient.List(parameters);
+                VirtualMachineImageResourceList result = this.VirtualMachineImageClient.List(parameters);
                 WriteObject(result);
             }
         }

src/ResourceManager/Compute/Commands.Compute/Images/GetAzureVMImageOfferCommand.cs

@@ -39,7 +39,7 @@ public override void ExecuteCmdlet()
                 Publishername = PublisherName
             };
 
-            var result = this.VirtualMachineImageClient.ListOffers(parameters);
+            VirtualMachineImageResourceList result = this.VirtualMachineImageClient.ListOffers(parameters);
             WriteObject(result);
         }
     }

src/ResourceManager/Compute/Commands.Compute/Images/GetAzureVMImagePublisherCommand.cs

@@ -35,7 +35,7 @@ public override void ExecuteCmdlet()
                 Location = Location
             };
 
-            var result = this.VirtualMachineImageClient.ListPublishers(parameters);
+            VirtualMachineImageResourceList result = this.VirtualMachineImageClient.ListPublishers(parameters);
             WriteObject(result);
         }
     }

src/ResourceManager/Compute/Commands.Compute/Images/GetAzureVMImageSkuCommand.cs

@@ -43,7 +43,7 @@ public override void ExecuteCmdlet()
                 Offer = Offer
             };
 
-            var result = this.VirtualMachineImageClient.ListSkus(parameters);
+            VirtualMachineImageResourceList result = this.VirtualMachineImageClient.ListSkus(parameters);
             WriteObject(result);
         }
     }

src/ResourceManager/Compute/Commands.Compute/Usage/GetAzureVMUsageCommand.cs

@@ -19,12 +19,10 @@
 
 namespace Microsoft.Azure.Commands.Compute
 {
-    [Cmdlet(VerbsCommon.Get, ProfileNouns.VirtualMachineUsage, DefaultParameterSetName = GetVirtualMachineUsageParamSet)]
-    [OutputType(typeof(Usage))]
+    [Cmdlet(VerbsCommon.Get, ProfileNouns.VirtualMachineUsage)]
+    [OutputType(typeof(ListUsagesResponse))]
     public class GetAzureVMUsageCommand : VirtualMachineUsageBaseCmdlet
     {
-        protected const string GetVirtualMachineUsageParamSet = "GetVirtualMachineUsageParamSet";
-
         [Parameter(
            Mandatory = true,
            Position = 0,
@@ -38,8 +36,7 @@ public override void ExecuteCmdlet()
             base.ExecuteCmdlet();
 
             ListUsagesResponse result = this.UsageClient.List(this.Location);
-
-            WriteObject(result.Usages, true);
+            WriteObject(result);
         }
     }
 }