Skip to content

Commit 613aaed

Browse files
huangpfhuangpf
committed
Merge pull request #16 from Azure/build
u
2 parents f5d355a + d1fd2f6 commit 613aaed

File tree

41 files changed

+13272
-706
lines changed

Some content is hidden

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

41 files changed

+13272
-706
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,12 @@
249249
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestStorageAccount.json">
250250
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
251251
</None>
252+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineAccessExtension.json">
253+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
254+
</None>
255+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineCustomScriptExtension.json">
256+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
257+
</None>
252258
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineExtension.json">
253259
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
254260
</None>

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,15 @@ public void TestVirtualMachineExtension()
2626
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineExtension");
2727
}
2828

29-
[Fact
30-
(Skip = "Disable this test until the breaking api is checked in.")]
29+
[Fact]
3130
[Trait(Category.AcceptanceType, Category.CheckIn)]
3231
public void TestVirtualMachineCustomScriptExtension()
3332
{
3433
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineCustomScriptExtension");
3534
}
3635

37-
[Fact
38-
(Skip = "Disable this test until the breaking api is checked in.")]
39-
[Trait(Category.AcceptanceType, Category.CheckIn)] // disable this test until the breaking api is checked in.
36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4038
public void TestVirtualMachineAccessExtension()
4139
{
4240
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineAccessExtension");

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

Lines changed: 44 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function Test-VirtualMachineExtension
2525
try
2626
{
2727
# Common
28-
$loc = 'West US';
28+
$loc = 'East Asia';
2929
New-AzureResourceGroup -Name $rgname -Location $loc;
3030

3131
# VM Profile & Hardware
@@ -64,11 +64,11 @@ function Test-VirtualMachineExtension
6464
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
6565
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
6666

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

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

7474
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
@@ -77,11 +77,11 @@ function Test-VirtualMachineExtension
7777
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
7878
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
7979
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
80-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 0;
80+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
8181
Assert-AreEqual $p.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
8282
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
8383
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
84-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 1;
84+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
8585
Assert-AreEqual $p.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
8686

8787
# OS & Image
@@ -93,7 +93,6 @@ function Test-VirtualMachineExtension
9393
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
9494
$img = 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd';
9595

96-
$p.StorageProfile.OSDisk = $null;
9796
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
9897
$p = Set-AzureVMSourceImage -VM $p -Name $img;
9998

@@ -203,11 +202,11 @@ function Test-VirtualMachineCustomScriptExtension
203202
try
204203
{
205204
# Common
206-
$loc = Get-ProviderLocation ResourceManagement;
205+
$loc = 'East Asia';
207206
New-AzureResourceGroup -Name $rgname -Location $loc;
208207

209208
# VM Profile & Hardware
210-
$vmsize = 'Standard_A2';
209+
$vmsize = 'Standard_A4';
211210
$vmname = 'vm' + $rgname;
212211
$p = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
213212
Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize;
@@ -240,26 +239,23 @@ function Test-VirtualMachineCustomScriptExtension
240239
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
241240
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
242241
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
243-
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
244242

245-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
243+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
246244

247-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
248-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
249-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
250-
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
245+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
246+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
251247

252248
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
253249
Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
254250
Assert-AreEqual $p.StorageProfile.OSDisk.VirtualHardDisk.Uri $osDiskVhdUri;
255251
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
256252
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
257253
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
258-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 0;
254+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
259255
Assert-AreEqual $p.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
260256
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
261257
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
262-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 1;
258+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
263259
Assert-AreEqual $p.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
264260

265261
# OS & Image
@@ -271,7 +267,6 @@ function Test-VirtualMachineCustomScriptExtension
271267
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
272268
$img = 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd';
273269

274-
$p.StorageProfile.OSDisk = $null;
275270
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
276271
$p = Set-AzureVMSourceImage -VM $p -Name $img;
277272

@@ -290,21 +285,24 @@ function Test-VirtualMachineCustomScriptExtension
290285
$extver = '1.1';
291286
$publisher = 'Microsoft.Compute';
292287
$exttype = 'CustomScriptExtension';
293-
$fileToExecute = "a.exe";
294-
$containderName = "script"
288+
$fileToExecute = 'a.exe';
289+
$containderName = 'script';
295290

296291
# Set custom script extension
297292
Set-AzureVMCustomScriptExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -TypeHandlerVersion $extver -StorageAccountName $stoname -StorageAccountKey $stokey -FileName $fileToExecute -ContainerName $containderName;
298293

299294
# Get VM Extension
300295
$ext = Get-AzureVMCustomScriptExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname;
296+
297+
$expCommand = 'powershell -ExecutionPolicy Unrestricted -file ' + $fileToExecute + ' ';
298+
$expUri = $stoname + '.blob.core.windows.net/' + $containderName + '/' + $fileToExecute;
301299
Assert-AreEqual $ext.ResourceGroupName $rgname;
302300
Assert-AreEqual $ext.Name $extname;
303301
Assert-AreEqual $ext.Publisher $publisher;
304302
Assert-AreEqual $ext.ExtensionType $exttype;
305303
Assert-AreEqual $ext.TypeHandlerVersion $extver;
306-
Assert-AreEqual $ext.CommandToExecute "powershell -ExecutionPolicy Unrestricted -file " + $fileToExecute + " ";
307-
Assert-True $ext.Uri[0].Contains($stoname + ".blob.core.windows.net/" + $containderName + "/" + $fileToExecute);
304+
Assert-AreEqual $ext.CommandToExecute $expCommand;
305+
Assert-True {$ext.Uri[0].Contains($expUri)};
308306
Assert-NotNull $ext.ProvisioningState;
309307

310308
$ext = Get-AzureVMCustomScriptExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname -Status;
@@ -313,8 +311,8 @@ function Test-VirtualMachineCustomScriptExtension
313311
Assert-AreEqual $ext.Publisher $publisher;
314312
Assert-AreEqual $ext.ExtensionType $exttype;
315313
Assert-AreEqual $ext.TypeHandlerVersion $extver;
316-
Assert-AreEqual $ext.CommandToExecute "powershell -ExecutionPolicy Unrestricted -file " + $fileToExecute + " ";
317-
Assert-True $ext.Uri[0].Contains($stoname + ".blob.core.windows.net/" + $containderName + "/" + $fileToExecute);
314+
Assert-AreEqual $ext.CommandToExecute $expCommand;
315+
Assert-True {$ext.Uri[0].Contains($expUri)};
318316
Assert-NotNull $ext.ProvisioningState;
319317
Assert-NotNull $ext.Statuses;
320318

@@ -329,13 +327,13 @@ function Test-VirtualMachineCustomScriptExtension
329327
Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
330328

331329
# Check Extensions in VM
332-
Assert-AreEqual $vm1.Resources.Extensions.Count 1;
333-
Assert-AreEqual $vm1.Resources.Extensions[0].Name $extname;
334-
Assert-AreEqual $vm1.Resources.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions';
335-
Assert-AreEqual $vm1.Resources.Extensions[0].Publisher $publisher;
336-
Assert-AreEqual $vm1.Resources.Extensions[0].ExtensionType $exttype;
337-
Assert-AreEqual $vm1.Resources.Extensions[0].TypeHandlerVersion $extver;
338-
Assert-NotNull $vm1.Resources.Extensions[0].Settings;
330+
Assert-AreEqual $vm1.Extensions.Count 1;
331+
Assert-AreEqual $vm1.Extensions[0].Name $extname;
332+
Assert-AreEqual $vm1.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions';
333+
Assert-AreEqual $vm1.Extensions[0].Publisher $publisher;
334+
Assert-AreEqual $vm1.Extensions[0].ExtensionType $exttype;
335+
Assert-AreEqual $vm1.Extensions[0].TypeHandlerVersion $extver;
336+
Assert-NotNull $vm1.Extensions[0].Settings;
339337

340338
# *** TODO: The removal call did not return. 12/12/2014
341339
}
@@ -360,11 +358,11 @@ function Test-VirtualMachineAccessExtension
360358
try
361359
{
362360
# Common
363-
$loc = Get-ProviderLocation ResourceManagement;;
361+
$loc = 'East Asia';
364362
New-AzureResourceGroup -Name $rgname -Location $loc;
365363

366364
# VM Profile & Hardware
367-
$vmsize = 'Standard_A2';
365+
$vmsize = 'Standard_A4';
368366
$vmname = 'vm' + $rgname;
369367
$p = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
370368
Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize;
@@ -397,26 +395,23 @@ function Test-VirtualMachineAccessExtension
397395
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
398396
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
399397
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
400-
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
401398

402-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
399+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
403400

404-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
405-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
406-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
407-
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
401+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
402+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
408403

409404
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
410405
Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
411406
Assert-AreEqual $p.StorageProfile.OSDisk.VirtualHardDisk.Uri $osDiskVhdUri;
412407
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
413408
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
414409
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
415-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 0;
410+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
416411
Assert-AreEqual $p.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
417412
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
418413
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
419-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 1;
414+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
420415
Assert-AreEqual $p.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
421416

422417
# OS & Image
@@ -428,7 +423,6 @@ function Test-VirtualMachineAccessExtension
428423
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
429424
$img = 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd';
430425

431-
$p.StorageProfile.OSDisk = $null;
432426
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
433427
$p = Set-AzureVMSourceImage -VM $p -Name $img;
434428

@@ -484,13 +478,13 @@ function Test-VirtualMachineAccessExtension
484478
Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
485479

486480
# Check Extensions in VM
487-
Assert-AreEqual $vm1.Resources.Extensions.Count 1;
488-
Assert-AreEqual $vm1.Resources.Extensions[0].Name $extname;
489-
Assert-AreEqual $vm1.Resources.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions';
490-
Assert-AreEqual $vm1.Resources.Extensions[0].Publisher $publisher;
491-
Assert-AreEqual $vm1.Resources.Extensions[0].ExtensionType $exttype;
492-
Assert-AreEqual $vm1.Resources.Extensions[0].TypeHandlerVersion $extver;
493-
Assert-NotNull $vm1.Resources.Extensions[0].Settings;
481+
Assert-AreEqual $vm1.Extensions.Count 1;
482+
Assert-AreEqual $vm1.Extensions[0].Name $extname;
483+
Assert-AreEqual $vm1.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions';
484+
Assert-AreEqual $vm1.Extensions[0].Publisher $publisher;
485+
Assert-AreEqual $vm1.Extensions[0].ExtensionType $exttype;
486+
Assert-AreEqual $vm1.Extensions[0].TypeHandlerVersion $extver;
487+
Assert-NotNull $vm1.Extensions[0].Settings;
494488

495489
# *** TODO: The removal call did not return. 12/12/2014
496490
}

0 commit comments

Comments
 (0)