Skip to content

Commit bcfce79

Browse files
huangpfhuangpf
committed
update
1 parent e942b5c commit bcfce79

File tree

2 files changed

+31
-25
lines changed

2 files changed

+31
-25
lines changed

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

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function Test-VirtualMachine
2828
New-AzureResourceGroup -Name $rgname -Location $loc;
2929

3030
# VM Profile & Hardware
31-
$vmsize = 'Standard_A2';
31+
$vmsize = 'Standard_A4';
3232
$vmname = 'vm' + $rgname;
3333
$p = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
3434
Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize;
@@ -62,11 +62,11 @@ function Test-VirtualMachine
6262
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
6363
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
6464

65-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
65+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
6666

67-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
68-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
69-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
67+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
68+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
69+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
7070
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
7171

7272
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
@@ -75,11 +75,11 @@ function Test-VirtualMachine
7575
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
7676
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
7777
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
78-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 0;
78+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
7979
Assert-AreEqual $p.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
8080
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
8181
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
82-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 1;
82+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
8383
Assert-AreEqual $p.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
8484

8585
# OS & Image
@@ -91,7 +91,7 @@ function Test-VirtualMachine
9191
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
9292
$img = 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd';
9393

94-
$p.StorageProfile.OSDisk = $null;
94+
# $p.StorageProfile.OSDisk = $null;
9595
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
9696
$p = Set-AzureVMSourceImage -VM $p -Name $img;
9797

@@ -100,6 +100,9 @@ function Test-VirtualMachine
100100
Assert-AreEqual $p.OSProfile.AdminPassword $password;
101101
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
102102

103+
# TODO: Remove Data Disks for now
104+
$p.StorageProfile.DataDisks = $null;
105+
103106
# Virtual Machine
104107
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
105108
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
@@ -415,11 +418,11 @@ function Test-VirtualMachineSizeAndUsage
415418
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
416419
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
417420

418-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
421+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
419422

420-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
421-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
422-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
423+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
424+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
425+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
423426
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
424427

425428
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
@@ -428,11 +431,11 @@ function Test-VirtualMachineSizeAndUsage
428431
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
429432
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
430433
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
431-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 0;
434+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
432435
Assert-AreEqual $p.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
433436
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
434437
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
435-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 1;
438+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
436439
Assert-AreEqual $p.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
437440

438441
# OS & Image
@@ -452,6 +455,9 @@ function Test-VirtualMachineSizeAndUsage
452455
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
453456
Assert-AreEqual $p.OSProfile.AdminPassword $password;
454457
Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
458+
459+
# TODO: Remove Data Disks for now
460+
$p.StorageProfile.DataDisks = $null;
455461

456462
# Create VM
457463
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;

0 commit comments

Comments
 (0)