Fix PSOperation

huangpf · huangpf · commit dfe1eaaae54a · 2015-06-09T15:28:38.000-07:00
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1
@@ -144,11 +144,15 @@ function Test-VirtualMachine
 
         # Availability Set
         $asetName = 'aset' + $rgname;
-        New-AzureAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc;
+        $st = New-AzureAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc;
+        Assert-NotNull $st.RequestId;
+        Assert-NotNull $st.StatusCode;
 
         $asets = Get-AzureAvailabilitySet -ResourceGroupName $rgname;
         Assert-NotNull $asets;
         Assert-AreEqual $asetName $asets[0].Name;
+        Assert-NotNull $asets[0].RequestId;
+        Assert-NotNull $asets[0].StatusCode;
 
         $aset = Get-AzureAvailabilitySet -ResourceGroupName $rgname -Name $asetName;
         Assert-NotNull $aset;
@@ -468,6 +472,8 @@ function Test-VirtualMachineSizeAndUsage
         # Test Sizes
         $s1 = Get-AzureVMSize -Location ($loc -replace ' ');
         Assert-NotNull $s1;
+        Assert-NotNull $s1.RequestId;
+        Assert-NotNull $s1.StatusCode;
         Validate-VirtualMachineSize $vmsize $s1;
 
         $s2 = Get-AzureVMSize -ResourceGroupName $rgname -VMName $vmname;
@@ -526,6 +532,8 @@ function Validate-VirtualMachineUsage
         Assert-NotNull $item.Name.Value;
         Assert-NotNull $item.Name.LocalizedValue;
         Assert-True { $item.CurrentValue -le $item.Limit };
+        Assert-NotNull $item.RequestId;
+        Assert-NotNull $item.StatusCode;
     }
 
     return $valid;
@@ -1069,8 +1077,12 @@ function Test-VirtualMachineTags
 
         # Test Tags
         $tags = @{Name = "test1"; Value = "testval1"}, @{ Name = "test2"; Value = "testval2" };
-        New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p -Tags $tags;
+        $st = New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p -Tags $tags;
+        Assert-NotNull $st.RequestId;
+        Assert-NotNull $st.StatusCode;
         $vm = Get-AzureVM -ResourceGroupName $rgname -Name $vmname;
+        Assert-NotNull $vm.RequestId;
+        Assert-NotNull $vm.StatusCode;
 
         # Assert
         Assert-AreEqual $tags[0].Value $vm.Tags[$tags[0].Name];
diff --git a/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/GetAzureAvailabilitySetCommand.cs b/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/GetAzureAvailabilitySetCommand.cs
@@ -53,6 +53,7 @@ public override void ExecuteCmdlet()
                 foreach (var item in result.AvailabilitySets)
                 {
                     var psItem = Mapper.Map<PSAvailabilitySet>(item);
+                    psItem = Mapper.Map<AzureOperationResponse, PSAvailabilitySet>(result, psItem);
                     psResultList.Add(psItem);
                 }
 
@@ -62,6 +63,7 @@ public override void ExecuteCmdlet()
             {
                 var result = this.AvailabilitySetClient.Get(this.ResourceGroupName, this.Name);
                 var psResult = Mapper.Map<PSAvailabilitySet>(result.AvailabilitySet);
+                psResult = Mapper.Map<AzureOperationResponse, PSAvailabilitySet>(result, psResult);
                 WriteObject(psResult);
             }
         }
diff --git a/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/NewAzureAvailabilitySetCommand.cs b/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/NewAzureAvailabilitySetCommand.cs
@@ -81,6 +81,7 @@ public override void ExecuteCmdlet()
                 avSetParams);
 
             var psResult = Mapper.Map<PSAvailabilitySet>(result.AvailabilitySet);
+            psResult = Mapper.Map<AzureOperationResponse, PSAvailabilitySet>(result, psResult);
             WriteObject(psResult);
         }
     }
diff --git a/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/RemoveAzureAvailabilitySetCommand.cs b/src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/RemoveAzureAvailabilitySetCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.Remove, ProfileNouns.AvailabilitySet)]
-    [OutputType(typeof(PSOperationResponse))]
+    [OutputType(typeof(PSOperation))]
     public class RemoveAzureAvailabilitySetCommand : AvailabilitySetBaseCmdlet
     {
         [Parameter(
@@ -55,7 +55,7 @@ public override void ExecuteCmdlet()
                                    Properties.Resources.AvailabilitySetRemovalCaption))
             {
                 AzureOperationResponse op = this.AvailabilitySetClient.Delete(this.ResourceGroupName, this.Name);
-                var result = Mapper.Map<PSOperationResponse>(op);
+                var result = Mapper.Map<PSOperation>(op);
                 WriteObject(result);
             }
         }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
@@ -177,7 +177,6 @@
     <Compile Include="Images\GetAzureVMImageOfferCommand.cs" />
     <Compile Include="Images\GetAzureVMImageDetailCommand.cs" />
     <Compile Include="Images\VirtualMachineImageBaseCmdlet.cs" />
-    <Compile Include="Models\PSOperationResponse.cs" />
     <Compile Include="Models\PSUsage.cs" />
     <Compile Include="Models\PSVirtualMachineExtensionImage.cs" />
     <Compile Include="Models\PSVirtualMachineImage.cs" />
diff --git a/src/ResourceManager/Compute/Commands.Compute/Common/ComputeAutoMapperProfile.cs b/src/ResourceManager/Compute/Commands.Compute/Common/ComputeAutoMapperProfile.cs
@@ -68,12 +68,20 @@ public static bool Initialize()
 
         protected override void Configure()
         {
+            Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSOperation>();
+            Mapper.CreateMap<FROM.ComputeLongRunningOperationResponse, TO.PSComputeLongRunningOperation>();
+
             Mapper.CreateMap<FROM.AvailabilitySet, TO.PSAvailabilitySet>();
+            Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSAvailabilitySet>();
+
             Mapper.CreateMap<FROM.VirtualMachine, TO.PSVirtualMachine>();
+            Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSVirtualMachine>();
+
             Mapper.CreateMap<FROM.VirtualMachineSize, TO.PSVirtualMachineSize>();
+            Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSVirtualMachineSize>();
+
             Mapper.CreateMap<FROM.Usage, TO.PSUsage>();
-            Mapper.CreateMap<FROM.ComputeLongRunningOperationResponse, TO.PSComputeLongRunningOperation>();
-            Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSOperationResponse>();
+            Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSUsage>();
         }
     }
 }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.format.ps1xml b/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.format.ps1xml
@@ -90,9 +90,9 @@
       </ListControl>
     </View>
     <View>
-      <Name>Microsoft.Azure.Commands.Compute.Models.PSOperationResponse</Name>
+      <Name>Microsoft.Azure.Commands.Compute.Models.PSOperation</Name>
       <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.Compute.Models.PSOperationResponse</TypeName>
+        <TypeName>Microsoft.Azure.Commands.Compute.Models.PSOperation</TypeName>
       </ViewSelectedBy>
       <ListControl>
         <ListEntries>
diff --git a/src/ResourceManager/Compute/Commands.Compute/Models/PSOperation.cs b/src/ResourceManager/Compute/Commands.Compute/Models/PSOperation.cs
@@ -21,7 +21,7 @@
 
 using System.Net;
 
-namespace Microsoft.Azure.Commands.Compute
+namespace Microsoft.Azure.Commands.Compute.Models
 {
     public class PSOperation
     {
diff --git a/src/ResourceManager/Compute/Commands.Compute/Models/PSOperationResponse.cs b/src/ResourceManager/Compute/Commands.Compute/Models/PSOperationResponse.cs
diff --git a/src/ResourceManager/Compute/Commands.Compute/Usage/GetAzureVMUsageCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Usage/GetAzureVMUsageCommand.cs
@@ -44,6 +44,7 @@ public override void ExecuteCmdlet()
             foreach (var item in result.Usages)
             {
                 var psItem = Mapper.Map<PSUsage>(item);
+                psItem = Mapper.Map<AzureOperationResponse, PSUsage>(result, psItem);
                 psResultList.Add(psItem);
             }
 
diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/GetAzureVMCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/GetAzureVMCommand.cs
@@ -83,6 +83,7 @@ public override void ExecuteCmdlet()
                 {
                     var result = this.VirtualMachineClient.Get(this.ResourceGroupName, this.Name);
                     var psResult = Mapper.Map<PSVirtualMachine>(result.VirtualMachine);
+                    psResult = Mapper.Map<AzureOperationResponse, PSVirtualMachine>(result, psResult);
                     WriteObject(psResult);
                 }
             }
@@ -108,6 +109,7 @@ public override void ExecuteCmdlet()
                 foreach (var item in result.VirtualMachines)
                 {
                     var psItem = Mapper.Map<PSVirtualMachine>(item);
+                    psItem = Mapper.Map<AzureOperationResponse, PSVirtualMachine>(result, psItem);
                     psResultList.Add(psItem);
                 }
 
diff --git a/src/ResourceManager/Compute/Commands.Compute/VirtualMachineSizes/GetAzureVMSizeCommand.cs b/src/ResourceManager/Compute/Commands.Compute/VirtualMachineSizes/GetAzureVMSizeCommand.cs
@@ -98,7 +98,8 @@ public override void ExecuteCmdlet()
             List<PSVirtualMachineSize> psResultList = new List<PSVirtualMachineSize>();
             foreach (var item in result.VirtualMachineSizes)
             {
-                var psItem = Mapper.Map<PSVirtualMachineSize>(item);
+                var psItem = Mapper.Map<VirtualMachineSize, PSVirtualMachineSize>(item);
+                psItem = Mapper.Map<AzureOperationResponse, PSVirtualMachineSize>(result, psItem);
                 psResultList.Add(psItem);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public override void ExecuteCmdlet()`
`53`	`53`	`foreach (var item in result.AvailabilitySets)`
`54`	`54`	`{`
`55`	`55`	`var psItem = Mapper.Map<PSAvailabilitySet>(item);`
	`56`	`+ psItem = Mapper.Map<AzureOperationResponse, PSAvailabilitySet>(result, psItem);`
`56`	`57`	`psResultList.Add(psItem);`
`57`	`58`	`}`
`58`	`59`
`@@ -62,6 +63,7 @@ public override void ExecuteCmdlet()`
`62`	`63`	`{`
`63`	`64`	`var result = this.AvailabilitySetClient.Get(this.ResourceGroupName, this.Name);`
`64`	`65`	`var psResult = Mapper.Map<PSAvailabilitySet>(result.AvailabilitySet);`
	`66`	`+ psResult = Mapper.Map<AzureOperationResponse, PSAvailabilitySet>(result, psResult);`
`65`	`67`	`WriteObject(psResult);`
`66`	`68`	`}`
`67`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ public override void ExecuteCmdlet()`
`81`	`81`	`avSetParams);`
`82`	`82`
`83`	`83`	`var psResult = Mapper.Map<PSAvailabilitySet>(result.AvailabilitySet);`
	`84`	`+ psResult = Mapper.Map<AzureOperationResponse, PSAvailabilitySet>(result, psResult);`
`84`	`85`	`WriteObject(psResult);`
`85`	`86`	`}`
`86`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`namespace Microsoft.Azure.Commands.Compute`
`22`	`22`	`{`
`23`	`23`	`[Cmdlet(VerbsCommon.Remove, ProfileNouns.AvailabilitySet)]`
`24`		`- [OutputType(typeof(PSOperationResponse))]`
	`24`	`+ [OutputType(typeof(PSOperation))]`
`25`	`25`	`public class RemoveAzureAvailabilitySetCommand : AvailabilitySetBaseCmdlet`
`26`	`26`	`{`
`27`	`27`	`[Parameter(`
`@@ -55,7 +55,7 @@ public override void ExecuteCmdlet()`
`55`	`55`	`Properties.Resources.AvailabilitySetRemovalCaption))`
`56`	`56`	`{`
`57`	`57`	`AzureOperationResponse op = this.AvailabilitySetClient.Delete(this.ResourceGroupName, this.Name);`
`58`		`- var result = Mapper.Map<PSOperationResponse>(op);`
	`58`	`+ var result = Mapper.Map<PSOperation>(op);`
`59`	`59`	`WriteObject(result);`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,20 @@ public static bool Initialize()`
`68`	`68`
`69`	`69`	`protected override void Configure()`
`70`	`70`	`{`
	`71`	`+ Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSOperation>();`
	`72`	`+ Mapper.CreateMap<FROM.ComputeLongRunningOperationResponse, TO.PSComputeLongRunningOperation>();`
	`73`	`+`
`71`	`74`	`Mapper.CreateMap<FROM.AvailabilitySet, TO.PSAvailabilitySet>();`
	`75`	`+ Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSAvailabilitySet>();`
	`76`	`+`
`72`	`77`	`Mapper.CreateMap<FROM.VirtualMachine, TO.PSVirtualMachine>();`
	`78`	`+ Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSVirtualMachine>();`
	`79`	`+`
`73`	`80`	`Mapper.CreateMap<FROM.VirtualMachineSize, TO.PSVirtualMachineSize>();`
	`81`	`+ Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSVirtualMachineSize>();`
	`82`	`+`
`74`	`83`	`Mapper.CreateMap<FROM.Usage, TO.PSUsage>();`
`75`		`- Mapper.CreateMap<FROM.ComputeLongRunningOperationResponse, TO.PSComputeLongRunningOperation>();`
`76`		`- Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSOperationResponse>();`
	`84`	`+ Mapper.CreateMap<Microsoft.Azure.AzureOperationResponse, TO.PSUsage>();`
`77`	`85`	`}`
`78`	`86`	`}`
`79`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public override void ExecuteCmdlet()`
`44`	`44`	`foreach (var item in result.Usages)`
`45`	`45`	`{`
`46`	`46`	`var psItem = Mapper.Map<PSUsage>(item);`
	`47`	`+ psItem = Mapper.Map<AzureOperationResponse, PSUsage>(result, psItem);`
`47`	`48`	`psResultList.Add(psItem);`
`48`	`49`	`}`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ public override void ExecuteCmdlet()`
`83`	`83`	`{`
`84`	`84`	`var result = this.VirtualMachineClient.Get(this.ResourceGroupName, this.Name);`
`85`	`85`	`var psResult = Mapper.Map<PSVirtualMachine>(result.VirtualMachine);`
	`86`	`+ psResult = Mapper.Map<AzureOperationResponse, PSVirtualMachine>(result, psResult);`
`86`	`87`	`WriteObject(psResult);`
`87`	`88`	`}`
`88`	`89`	`}`
`@@ -108,6 +109,7 @@ public override void ExecuteCmdlet()`
`108`	`109`	`foreach (var item in result.VirtualMachines)`
`109`	`110`	`{`
`110`	`111`	`var psItem = Mapper.Map<PSVirtualMachine>(item);`
	`112`	`+ psItem = Mapper.Map<AzureOperationResponse, PSVirtualMachine>(result, psItem);`
`111`	`113`	`psResultList.Add(psItem);`
`112`	`114`	`}`
`113`	`115`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,8 @@ public override void ExecuteCmdlet()`
`98`	`98`	`List<PSVirtualMachineSize> psResultList = new List<PSVirtualMachineSize>();`
`99`	`99`	`foreach (var item in result.VirtualMachineSizes)`
`100`	`100`	`{`
`101`		`- var psItem = Mapper.Map<PSVirtualMachineSize>(item);`
	`101`	`+ var psItem = Mapper.Map<VirtualMachineSize, PSVirtualMachineSize>(item);`
	`102`	`+ psItem = Mapper.Map<AzureOperationResponse, PSVirtualMachineSize>(result, psItem);`
`102`	`103`	`psResultList.Add(psItem);`
`103`	`104`	`}`
`104`	`105`