Skip to content

Commit da95b28

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#3141 from hyonholee/dev
[AzureRT] October update
2 parents 51c8809 + 0ad3a65 commit da95b28

File tree

60 files changed

+6366
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+6366
-176
lines changed

‎src/ResourceManager/Compute/ChangeLog.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,12 @@
1717
* Overview of change #1
1818
- Additional information about change #1
1919
-->
20-
## Current Release
20+
## Current Release
21+
22+
* Update formats for list of VMs, VMScaleSets and ContainerService
23+
- The default format of Get-AzureRmVM, Get-AzureRmVmss and Get-AzureRmContainerService is not table format when these cmdlets call List Operation
24+
* Fix overprovision issue for VMScaleSet
25+
- Because of the bug in Compute client library (and Swagger spec) regarding overprovision property of VMScaleSet, this property did not show up correctly.
26+
* Better piping scenario for VMScaleSets and ContainerService cmdlets
27+
- VMScaleSet and ContainerService now have "ResourceGroupName" property, so when piping Get command to Delete/Update command, -ResourceGroupName is not required.
28+
* Separate paremater sets for Set-AzureRmVM with Generalized and Redeploy parameter

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.Compute">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.4-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.1.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.Network, Version=7.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -448,6 +448,9 @@
448448
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineDataDiskNegative.json">
449449
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
450450
</None>
451+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineGetStatus.json">
452+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
453+
</None>
451454
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineImageList.json">
452455
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
453456
</None>

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ContainerServiceTests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ function Test-ContainerService
2727
$loc = 'australiasoutheast';
2828
New-AzureRMResourceGroup -Name $rgname -Location $loc -Force;
2929

30-
3130
$csName = 'cs' + $rgname;
3231
$masterDnsPrefixName = 'master' + $rgname;
3332
$agentPoolDnsPrefixName = 'ap' + $rgname;
@@ -63,10 +62,13 @@ function Test-ContainerService
6362
| Add-AzureRmContainerServiceAgentPoolProfile -Name $agentPoolProfileName -VmSize $vmSize -DnsPrefix $agentPoolDnsPrefixName `
6463
| New-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
6564

66-
6765
$cs = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
66+
$output = $cs | Out-String;
67+
Assert-True { $output.Contains("AgentPoolProfiles") };
6868

6969
$cslist = Get-AzureRmContainerService -ResourceGroupName $rgname;
70+
$output = $cslist | Out-String;
71+
Assert-False { $output.Contains("AgentPoolProfiles") };
7072

7173
$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
7274
}
@@ -92,7 +94,6 @@ function Test-ContainerServiceUpdate
9294
$loc = 'australiasoutheast';
9395
New-AzureRMResourceGroup -Name $rgname -Location $loc -Force;
9496

95-
9697
$csName = 'cs' + $rgname;
9798
$masterDnsPrefixName = 'master' + $rgname;
9899
$agentPoolDnsPrefixName = 'ap' + $rgname;
@@ -141,10 +142,9 @@ function Test-ContainerServiceUpdate
141142
-VmSize $vmSize `
142143
-DnsPrefix $agentPoolDnsPrefixName `
143144
-Count 2 `
144-
| Update-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
145+
| Update-AzureRmContainerService;
145146

146-
$cs = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
147-
$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
147+
$st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService;
148148
}
149149
finally
150150
{

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ function Test-VirtualMachineScaleSet
131131

132132
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmss');
133133
$vmssResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
134+
Assert-AreEqual $vmssName $vmssResult.Name;
134135
Assert-True { $vmssName -eq $vmssResult.Name };
135136
$output = $vmssResult | Out-String;
136137
Write-Verbose ($output);
@@ -142,18 +143,15 @@ function Test-VirtualMachineScaleSet
142143
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
143144
$output = $vmssList | Out-String;
144145
Write-Verbose ($output);
145-
Assert-True { $output.Contains("VirtualMachineProfile") };
146-
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmss | Format-Table');
147-
$output = $vmssList | Format-Table | Out-String;
148-
Write-Verbose ($output);
146+
Assert-False { $output.Contains("VirtualMachineProfile") };
149147

150148
# List from RG
151149
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmss List');
152150
$vmssList = Get-AzureRmVmss -ResourceGroupName $rgname;
153151
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
154152
$output = $vmssList | Out-String;
155153
Write-Verbose ($output);
156-
Assert-True { $output.Contains("VirtualMachineProfile") };
154+
Assert-False { $output.Contains("VirtualMachineProfile") };
157155

158156
# List Skus
159157
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssSku');
@@ -170,10 +168,7 @@ function Test-VirtualMachineScaleSet
170168
$vmListResult = Get-AzureRmVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName;
171169
$output = $vmListResult | Out-String;
172170
Write-Verbose ($output);
173-
Assert-True { $output.Contains("StorageProfile") };
174-
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssVM | Format-Table');
175-
$output = $vmListResult | Format-Table | Out-String;
176-
Write-Verbose ($output);
171+
Assert-False { $output.Contains("StorageProfile") };
177172

178173
# List each VM
179174
for ($i = 0; $i -lt 2; $i++)
@@ -189,29 +184,30 @@ function Test-VirtualMachineScaleSet
189184
$vmInstance = Get-AzureRmVmssVM -InstanceView -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $i;
190185
Assert-NotNull $vmInstance;
191186
$output = $vmInstance | Out-String;
187+
192188
Write-Verbose($output);
193189
Assert-True { $output.Contains("PlatformUpdateDomain") };
194190
}
195191

196-
$st = Stop-AzureRmVmss -StayProvision -ResourceGroupName $rgname -VMScaleSetName $vmssName;
197-
$st = Stop-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
198-
$st = Start-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
199-
$st = Restart-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
192+
$st = $vmssResult | Stop-AzureRmVmss -StayProvision;
193+
$st = $vmssResult | Stop-AzureRmVmss;
194+
$st = $vmssResult | Start-AzureRmVmss;
195+
$st = $vmssResult | Restart-AzureRmVmss;
200196

201197
$instanceListParam = @();
202198
for ($i = 0; $i -lt 2; $i++)
203199
{
204200
$instanceListParam += $i.ToString();
205201
}
206202

207-
$st = Stop-AzureRmVmss -StayProvision -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $instanceListParam;
208-
$st = Stop-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $instanceListParam;
209-
$st = Start-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $instanceListParam;
210-
$st = Restart-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $instanceListParam;
203+
$st = $vmssResult | Stop-AzureRmVmss -StayProvision -InstanceId $instanceListParam;
204+
$st = $vmssResult | Stop-AzureRmVmss -InstanceId $instanceListParam;
205+
$st = $vmssResult | Start-AzureRmVmss -InstanceId $instanceListParam;
206+
$st = $vmssResult | Restart-AzureRmVmss -InstanceId $instanceListParam;
211207

212208
# Remove
213209
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1;
214-
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
210+
$st = $vmssResult | Remove-AzureRmVmss;
215211
}
216212
finally
217213
{
@@ -491,15 +487,15 @@ function Test-VirtualMachineScaleSetLB
491487
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
492488
$output = $vmssList | Out-String;
493489
Write-Verbose ($output);
494-
Assert-True { $output.Contains("VirtualMachineProfile") };
490+
Assert-False { $output.Contains("VirtualMachineProfile") };
495491

496492
# List from RG
497493
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmss List');
498494
$vmssList = Get-AzureRmVmss -ResourceGroupName $rgname;
499495
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
500496
$output = $vmssList | Out-String;
501497
Write-Verbose ($output);
502-
Assert-True { $output.Contains("VirtualMachineProfile") };
498+
Assert-False { $output.Contains("VirtualMachineProfile") };
503499

504500
# List Skus
505501
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssSku');
@@ -512,7 +508,7 @@ function Test-VirtualMachineScaleSetLB
512508
$vmListResult = Get-AzureRmVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName; # -Select $null;
513509
$output = $vmListResult | Out-String;
514510
Write-Verbose ($output);
515-
Assert-True { $output.Contains("StorageProfile") };
511+
Assert-False { $output.Contains("StorageProfile") };
516512

517513
# List each VM
518514
for ($i = 0; $i -lt 2; $i++)

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,5 +191,12 @@ public void TestVirtualMachineRedeploy()
191191
{
192192
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineRedeploy");
193193
}
194+
195+
[Fact]
196+
[Trait(Category.AcceptanceType, Category.CheckIn)]
197+
public void TestVirtualMachineGetStatus()
198+
{
199+
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineGetStatus");
200+
}
194201
}
195202
}

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

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ function Test-VirtualMachine
176176
$a = $vms | Out-String;
177177
Write-Verbose("Get-AzureRmVM (List) output:");
178178
Write-Verbose($a);
179+
Assert-True{$a.Contains("NIC");}
179180
Assert-AreNotEqual $vms $null;
180181

181182
# Remove All VMs
@@ -2657,3 +2658,133 @@ function Test-VirtualMachineRedeploy
26572658
Clean-ResourceGroup $rgname
26582659
}
26592660
}
2661+
2662+
<#
2663+
.SYNOPSIS
2664+
Test Virtual Machines
2665+
#>
2666+
function Test-VirtualMachineGetStatus
2667+
{
2668+
param ($loc)
2669+
# Setup
2670+
$rgname = Get-ComputeTestResourceName
2671+
2672+
try
2673+
{
2674+
# Common
2675+
if ($loc -eq $null)
2676+
{
2677+
$loc = Get-ComputeVMLocation;
2678+
}
2679+
New-AzureRmResourceGroup -Name $rgname -Location $loc -Force;
2680+
2681+
# VM Profile & Hardware
2682+
$vmsize = 'Standard_A4';
2683+
$vmname = 'vm' + $rgname;
2684+
$p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize;
2685+
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
2686+
2687+
# NRP
2688+
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
2689+
$vnet = New-AzureRmVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
2690+
$vnet = Get-AzureRmVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
2691+
$subnetId = $vnet.Subnets[0].Id;
2692+
$pubip = New-AzureRmPublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -AllocationMethod Dynamic -DomainNameLabel ('pubip' + $rgname);
2693+
$pubip = Get-AzureRmPublicIpAddress -Name ('pubip' + $rgname) -ResourceGroupName $rgname;
2694+
$pubipId = $pubip.Id;
2695+
$nic = New-AzureRmNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
2696+
$nic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
2697+
$nicId = $nic.Id;
2698+
2699+
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
2700+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
2701+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
2702+
2703+
# Storage Account (SA)
2704+
$stoname = 'sto' + $rgname;
2705+
$stotype = 'Standard_GRS';
2706+
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
2707+
$stoaccount = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
2708+
2709+
$osDiskName = 'osDisk';
2710+
$osDiskCaching = 'ReadWrite';
2711+
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
2712+
2713+
$p = Set-AzureRmVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
2714+
2715+
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
2716+
Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
2717+
Assert-AreEqual $p.StorageProfile.OSDisk.Vhd.Uri $osDiskVhdUri;
2718+
2719+
# OS & Image
2720+
$user = "Foo12";
2721+
$password = $PLACEHOLDER;
2722+
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
2723+
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
2724+
$computerName = 'test';
2725+
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
2726+
2727+
# $p.StorageProfile.OSDisk = $null;
2728+
$p = Set-AzureRmVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
2729+
2730+
$imgRef = Get-DefaultCRPImage -loc $loc;
2731+
$p = ($imgRef | Set-AzureRmVMSourceImage -VM $p);
2732+
2733+
Assert-AreEqual $p.OSProfile.AdminUsername $user;
2734+
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
2735+
Assert-AreEqual $p.OSProfile.AdminPassword $password;
2736+
2737+
Assert-AreEqual $p.StorageProfile.ImageReference.Offer $imgRef.Offer;
2738+
Assert-AreEqual $p.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
2739+
Assert-AreEqual $p.StorageProfile.ImageReference.Sku $imgRef.Skus;
2740+
Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
2741+
2742+
# Virtual Machine
2743+
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
2744+
2745+
# Get VM
2746+
$vm1 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
2747+
$a = $vm1 | Out-String;
2748+
Write-Verbose("Get-AzureRmVM output:");
2749+
Write-Verbose($a);
2750+
$a = $vm1 | Format-Table | Out-String;
2751+
Write-Verbose("Get-AzureRmVM | Format-Table output:");
2752+
Write-Verbose($a);
2753+
2754+
Assert-AreEqual $vm1.Name $vmname;
2755+
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
2756+
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].Id $nicId;
2757+
2758+
Assert-AreEqual $vm1.StorageProfile.ImageReference.Offer $imgRef.Offer;
2759+
Assert-AreEqual $vm1.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
2760+
Assert-AreEqual $vm1.StorageProfile.ImageReference.Sku $imgRef.Skus;
2761+
Assert-AreEqual $vm1.StorageProfile.ImageReference.Version $imgRef.Version;
2762+
2763+
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
2764+
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;
2765+
Assert-AreEqual $vm1.HardwareProfile.VmSize $vmsize;
2766+
2767+
$vm = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Status;
2768+
$a = $vm | Out-String;
2769+
Write-Verbose($a);
2770+
Assert-True {$a.Contains("Statuses");}
2771+
2772+
$vms = Get-AzureRmVM -ResourceGroupName $rgname -Status;
2773+
$a = $vms | Out-String;
2774+
Write-Verbose($a);
2775+
Assert-True {$a.Contains("PowerState");}
2776+
2777+
$vms = Get-AzureRmVM -Status;
2778+
$a = $vms | Out-String;
2779+
Write-Verbose($a);
2780+
Assert-True {$a.Contains("PowerState");}
2781+
2782+
# Remove
2783+
Remove-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Force;
2784+
}
2785+
finally
2786+
{
2787+
# Cleanup
2788+
Clean-ResourceGroup $rgname
2789+
}
2790+
}

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineGetStatus.json

Lines changed: 5155 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.2.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.Compute" version="13.0.4-prerelease" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Compute" version="13.1.0-prerelease" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Network" version="7.1.2-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6052.28118-prerelease" targetFramework="net45" />

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<Private>True</Private>
7878
</Reference>
7979
<Reference Include="Microsoft.Azure.Management.Compute">
80-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.4-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
80+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.1.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
8383
<Reference Include="Microsoft.Azure.Management.Network, Version=7.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -307,6 +307,8 @@
307307
<Compile Include="Models\PSAvailabilitySet.cs" />
308308
<Compile Include="Models\PSVirtualMachineImageResource.cs" />
309309
<Compile Include="Models\PSVirtualMachineInstanceView.cs" />
310+
<Compile Include="Models\PSVirtualMachineList.cs" />
311+
<Compile Include="Models\PSVirtualMachineListStatus.cs" />
310312
<Compile Include="Models\PSVirtualMachineSize.cs" />
311313
<Compile Include="Common\LocationStringExtensions.cs" />
312314
<Compile Include="Models\UploadParameters.cs" />

‎src/ResourceManager/Compute/Commands.Compute/Common/ComputeAutoMapperProfile.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,23 @@ protected override void Configure()
165165
Mapper.CreateMap<AzureOperationResponse<IEnumerable<FROM.VirtualMachine>>, TO.PSVirtualMachine>()
166166
.ForMember(c => c.StatusCode, o => o.MapFrom(r => r.Response.StatusCode));
167167

168+
// VirtualMachine => PSVirtualMachineListStatusContext
169+
Mapper.CreateMap<FROM.VirtualMachine, TO.PSVirtualMachineListStatus>()
170+
.ForMember(c => c.AvailabilitySetReference, o => o.MapFrom(r => r.AvailabilitySet))
171+
.ForMember(c => c.Extensions, o => o.MapFrom(r => r.Resources))
172+
.ForMember(c => c.OSProfile, o => o.MapFrom(r => r.OsProfile));
173+
174+
Mapper.CreateMap<AzureOperationResponse<FROM.VirtualMachine>, TO.PSVirtualMachineListStatus>()
175+
.ForMember(c => c.StatusCode, o => o.MapFrom(r => r.Response.StatusCode));
176+
177+
Mapper.CreateMap<AzureOperationResponse<IPage<FROM.VirtualMachine>>, TO.PSVirtualMachineListStatus>()
178+
.ForMember(c => c.StatusCode, o => o.MapFrom(r => r.Response.StatusCode));
179+
180+
Mapper.CreateMap<AzureOperationResponse<IEnumerable<FROM.VirtualMachine>>, TO.PSVirtualMachineListStatus>()
181+
.ForMember(c => c.StatusCode, o => o.MapFrom(r => r.Response.StatusCode));
182+
183+
Mapper.CreateMap<TO.PSVirtualMachineListStatus, TO.PSVirtualMachineList>();
184+
168185
// VirtualMachineSize => PSVirtualMachineSize
169186
Mapper.CreateMap<FROM.VirtualMachineSize, TO.PSVirtualMachineSize>();
170187

0 commit comments

Comments
 (0)