Skip to content

Commit 2a8c7b0

Browse files
hyonholeehyonholee
authored
Merge pull request #11 from prashmo/release-3.5.0
Add TestVirtualMachine_Managed test.
2 parents 75e8090 + 3f41043 commit 2a8c7b0

File tree

6 files changed

+8910
-1438
lines changed

6 files changed

+8910
-1438
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function Test-AvailabilitySet
3131
$nonDefaultUD = 2;
3232
$nonDefaultFD = 3;
3333

34-
New-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -PlatformUpdateDomainCount $nonDefaultUD -PlatformFaultDomainCount $nonDefaultFD;
34+
New-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -PlatformUpdateDomainCount $nonDefaultUD -PlatformFaultDomainCount $nonDefaultFD -Sku 'Classic';
3535

3636
$asets = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname;
3737
Assert-NotNull $asets;
@@ -52,7 +52,6 @@ function Test-AvailabilitySet
5252
Assert-AreEqual $aset.Name $asetName;
5353
Assert-AreEqual $nonDefaultUD $aset.PlatformUpdateDomainCount;
5454
Assert-AreEqual $nonDefaultFD $aset.PlatformFaultDomainCount;
55-
Assert-True {$aset.Managed};
5655
Assert-AreEqual 'Aligned' $aset.Sku;
5756

5857
$aset | Update-AzureRmAvailabilitySet -Sku 'Aligned';
@@ -62,7 +61,6 @@ function Test-AvailabilitySet
6261
Assert-AreEqual $aset.Name $asetName;
6362
Assert-AreEqual $nonDefaultUD $aset.PlatformUpdateDomainCount;
6463
Assert-AreEqual $nonDefaultFD $aset.PlatformFaultDomainCount;
65-
Assert-True {$aset.Managed};
6664
Assert-AreEqual 'Aligned' $aset.Sku;
6765

6866
Remove-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Force;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ public void TestVirtualMachine()
3131
ComputeTestController.NewInstance.RunPsTest(@"Test-VirtualMachine $null");
3232
}
3333

34+
[Fact]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
36+
public void TestVirtualMachine_Managed()
37+
{
38+
ComputeTestController.NewInstance.RunPsTest(@"Test-VirtualMachine $null $true");
39+
}
40+
3441
[Fact]
3542
[Trait(Category.AcceptanceType, Category.CheckIn)]
3643
public void TestVirtualMachinePiping()

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

Lines changed: 51 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Test Virtual Machines
1818
#>
1919
function Test-VirtualMachine
2020
{
21-
param ($loc)
21+
param ($loc, [bool] $hasManagedDisks = $false)
2222
# Setup
2323
$rgname = Get-ComputeTestResourceName
2424

@@ -65,33 +65,36 @@ function Test-VirtualMachine
6565
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
6666
$stoaccount = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
6767

68-
$osDiskName = 'osDisk';
69-
$osDiskCaching = 'ReadWrite';
70-
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
71-
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
72-
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
73-
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
74-
75-
$p = Set-AzureRmVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
7668

77-
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
78-
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
79-
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
80-
$p = Remove-AzureRmVMDataDisk -VM $p -Name 'testDataDisk3';
69+
if($hasManagedDisks -eq $false)
70+
{
71+
$osDiskName = 'osDisk';
72+
$osDiskCaching = 'ReadWrite';
73+
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
74+
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
75+
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
76+
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
77+
78+
$p = Set-AzureRmVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
79+
80+
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
81+
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
82+
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
83+
$p = Remove-AzureRmVMDataDisk -VM $p -Name 'testDataDisk3';
8184

82-
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
83-
Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
84-
Assert-AreEqual $p.StorageProfile.OSDisk.Vhd.Uri $osDiskVhdUri;
85-
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
86-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
87-
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
88-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
89-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Vhd.Uri $dataDiskVhdUri1;
90-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
91-
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
92-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
93-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Vhd.Uri $dataDiskVhdUri2;
94-
85+
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
86+
Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
87+
Assert-AreEqual $p.StorageProfile.OSDisk.Vhd.Uri $osDiskVhdUri;
88+
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
89+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
90+
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
91+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
92+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Vhd.Uri $dataDiskVhdUri1;
93+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
94+
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
95+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
96+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Vhd.Uri $dataDiskVhdUri2;
97+
}
9598
# OS & Image
9699
$user = "Foo12";
97100
$password = $PLACEHOLDER;
@@ -114,7 +117,7 @@ function Test-VirtualMachine
114117
Assert-AreEqual $p.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
115118
Assert-AreEqual $p.StorageProfile.ImageReference.Sku $imgRef.Skus;
116119
Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
117-
120+
118121
# Virtual Machine
119122
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
120123

@@ -181,8 +184,7 @@ function Test-VirtualMachine
181184

182185
Assert-AreEqual $true $vm2.DiagnosticsProfile.BootDiagnostics.Enabled;
183186
Assert-AreEqual $stoaccount.PrimaryEndpoints.Blob $vm2.DiagnosticsProfile.BootDiagnostics.StorageUri;
184-
185-
187+
186188
$vms = Get-AzureRmVM -ResourceGroupName $rgname;
187189
$a = $vms | Out-String;
188190
Write-Verbose("Get-AzureRmVM (List) output:");
@@ -203,22 +205,32 @@ function Test-VirtualMachine
203205
Get-AzureRmVM -ResourceGroupName $rgname | Remove-AzureRmVM -ResourceGroupName $rgname -Force;
204206
$vms = Get-AzureRmVM -ResourceGroupName $rgname;
205207
Assert-AreEqual $vms $null;
206-
208+
207209
# Availability Set
208210
$asetName = 'aset' + $rgname;
209-
$st = New-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc;
210-
Assert-NotNull $st.RequestId;
211-
Assert-NotNull $st.StatusCode;
211+
$asetSkuName = 'Classic';
212+
$UD = 3;
213+
$FD = 3;
214+
if($hasManagedDisks -eq $true)
215+
{
216+
$asetSkuName = 'Aligned';
217+
$FD = 2;
218+
}
219+
220+
New-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -PlatformUpdateDomainCount $UD -PlatformFaultDomainCount $FD -Sku $asetSkuName;
212221

213222
$asets = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname;
214223
Assert-NotNull $asets;
215224
Assert-AreEqual $asetName $asets[0].Name;
216-
Assert-NotNull $asets[0].RequestId;
217-
Assert-NotNull $asets[0].StatusCode;
218225

219226
$aset = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName;
220227
Assert-NotNull $aset;
221228
Assert-AreEqual $asetName $aset.Name;
229+
Assert-AreEqual $UD $aset.PlatformUpdateDomainCount;
230+
Assert-AreEqual $FD $aset.PlatformFaultDomainCount;
231+
Assert-AreEqual $asetSkuName $aset.Sku;
232+
Assert-NotNull $asets[0].RequestId;
233+
Assert-NotNull $asets[0].StatusCode;
222234

223235
$subId = Get-SubscriptionIdFromResourceGroup $rgname;
224236

@@ -231,7 +243,10 @@ function Test-VirtualMachine
231243
$p2.StorageProfile = $p.StorageProfile;
232244

233245
$p2.StorageProfile.DataDisks = $null;
234-
$p2.StorageProfile.OsDisk.Vhd.Uri = "https://$stoname.blob.core.windows.net/test/os2.vhd";
246+
if($hasManagedDisks -eq $false)
247+
{
248+
$p2.StorageProfile.OsDisk.Vhd.Uri = "https://$stoname.blob.core.windows.net/test/os2.vhd";
249+
}
235250
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p2;
236251

237252
$vm2 = Get-AzureRmVM -Name $vmname2 -ResourceGroupName $rgname;

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AvailabilitySetTests/TestAvailabilitySet.json

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

0 commit comments

Comments
 (0)