Skip to content

Commit 5fbb249

Browse files
markcowlmarkcowl
committed
Merge pull request #708 from hyonholee/dev
AzureRT updates
2 parents af39f74 + 82c373d commit 5fbb249

22 files changed

+12936
-323
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
@@ -251,9 +251,15 @@
251251
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineCustomScriptExtension.json">
252252
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
253253
</None>
254+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineCustomScriptExtensionFileUri.json">
255+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
256+
</None>
254257
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineExtension.json">
255258
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
256259
</None>
260+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineExtensionUsingHashTable.json">
261+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
262+
</None>
257263
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestAddNetworkInterface.json">
258264
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
259265
</None>

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ function Get-MarketplaceImage
284284
{
285285
param([string] $location = "westus", [string] $pubFilter = '*', [string] $offerFilter = '*')
286286

287-
$imgs = Get-AzureVMImagePublisher -Location $location | where { $_.PublisherName -like $pubFilter } | Get-AzureVMImageOffer | where { $_.Offer -like $offerFilter } | Get-AzureVMImageSku | Get-AzureVMImage | Get-AzureVMImageDetail | where { $_.PurchasePlan -ne $null };
287+
$imgs = Get-AzureVMImagePublisher -Location $location | where { $_.PublisherName -like $pubFilter } | Get-AzureVMImageOffer | where { $_.Offer -like $offerFilter } | Get-AzureVMImageSku | Get-AzureVMImage | Get-AzureVMImage | where { $_.PurchasePlan -ne $null };
288288

289289
return $imgs;
290290
}
@@ -333,3 +333,22 @@ function Assert-OutputContains
333333
$st = Write-Verbose "Found.";
334334
}
335335
}
336+
337+
338+
# Create a SAS Uri
339+
function Get-SasUri
340+
{
341+
param ([string] $storageAccount, [string] $storageKey, [string] $container, [string] $file, [TimeSpan] $duration, [Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPermissions] $type)
342+
343+
$uri = [string]::Format("https://{0}.blob.core.windows.net/{1}/{2}", $storageAccount, $container, $file);
344+
345+
$destUri = New-Object -TypeName System.Uri($uri);
346+
$cred = New-Object -TypeName Microsoft.WindowsAzure.Storage.Auth.StorageCredentials($storageAccount, $storageKey);
347+
$destBlob = New-Object -TypeName Microsoft.WindowsAzure.Storage.Blob.CloudPageBlob($destUri, $cred);
348+
$policy = New-Object Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPolicy;
349+
$policy.Permissions = $type;
350+
$policy.SharedAccessExpiryTime = [DateTime]::UtcNow.Add($duration);
351+
$uri += $destBlob.GetSharedAccessSignature($policy);
352+
353+
return $uri;
354+
}

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest1.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function ps_vm_dynamic_test_func_1_pstestrg592
148148
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg592 - Creating VM';
149149

150150
$vmname = 'vm' + $rgname;
151-
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $vmconfig;
151+
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $vmconfig;
152152

153153
# Get VM
154154
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg592 - Getting VM';

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest2.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function ps_vm_dynamic_test_func_2_pstestrg2115
148148
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg2115 - Creating VM';
149149

150150
$vmname = 'vm' + $rgname;
151-
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $vmconfig;
151+
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $vmconfig;
152152

153153
# Get VM
154154
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg2115 - Getting VM';

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest3.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function ps_vm_dynamic_test_func_3_pstestrg4410
148148
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg4410 - Creating VM';
149149

150150
$vmname = 'vm' + $rgname;
151-
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $vmconfig;
151+
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $vmconfig;
152152

153153
# Get VM
154154
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg4410 - Getting VM';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ function ${generated_func_name}
372372
373373
`$vmname = `$rgname + 'vm';
374374
375-
`$st = New-AzureVM -ResourceGroupName `$rgname -Location `$loc -Name `$vmname -VM `$vmconfig -Tags (Get-ComputeTestTag `$global:ps_test_tag_name);
375+
`$st = New-AzureVM -ResourceGroupName `$rgname -Location `$loc -VM `$vmconfig -Tags (Get-ComputeTestTag `$global:ps_test_tag_name);
376376
377377
# Get VM
378378
`$st = Write-Verbose 'Running Test ${generated_func_name} - Getting VM';

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public void TestVirtualMachineExtension()
2525
{
2626
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineExtension");
2727
}
28-
29-
[Fact(Skip = "Set-AzureVMExtension does not return (for a long period of time).")]
28+
29+
[Fact]
3030
[Trait(Category.AcceptanceType, Category.CheckIn)]
3131
public void TestVirtualMachineExtensionUsingHashTable()
3232
{
@@ -40,6 +40,13 @@ public void TestVirtualMachineCustomScriptExtension()
4040
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineCustomScriptExtension");
4141
}
4242

43+
[Fact]
44+
[Trait(Category.AcceptanceType, Category.CheckIn)]
45+
public void TestVirtualMachineCustomScriptExtensionFileUri()
46+
{
47+
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineCustomScriptExtensionFileUri");
48+
}
49+
4350
[Fact]
4451
[Trait(Category.AcceptanceType, Category.CheckIn)]
4552
public void TestVirtualMachineAccessExtension()

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

Lines changed: 165 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function Test-VirtualMachineExtension
107107
Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
108108

109109
# Virtual Machine
110-
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
110+
New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
111111

112112
# Virtual Machine Extension
113113
$extname = 'csetest';
@@ -246,7 +246,7 @@ function Test-VirtualMachineExtensionUsingHashTable
246246
Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
247247

248248
# Virtual Machine Create
249-
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
249+
New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
250250

251251
# Virtual Machine Extension
252252
$extname = $rgname + 'ext';
@@ -255,7 +255,7 @@ function Test-VirtualMachineExtensionUsingHashTable
255255
$extver = '1.1';
256256

257257
# Set extension settings by hash table
258-
$settings = @{"fileUris" = ""; "commandToExecute" = ""};
258+
$settings = @{"fileUris" = @(); "commandToExecute" = ""};
259259
$protectedsettings = @{"storageAccountName" = $stoname; "storageAccountKey" = $stokey};
260260
Set-AzureVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -ExtensionType $exttype -TypeHandlerVersion $extver -Settings $settings -ProtectedSettings $protectedsettings;
261261

@@ -408,24 +408,24 @@ function Test-VirtualMachineCustomScriptExtension
408408

409409
# Virtual Machine
410410
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
411-
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
411+
New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
412412

413413
# Virtual Machine Extension
414414
$extname = $rgname + 'ext';
415415
$extver = '1.1';
416416
$publisher = 'Microsoft.Compute';
417417
$exttype = 'CustomScriptExtension';
418418
$fileToExecute = 'a.exe';
419-
$containderName = 'script';
419+
$containerName = 'script';
420420

421421
# Set custom script extension
422-
Set-AzureVMCustomScriptExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -TypeHandlerVersion $extver -StorageAccountName $stoname -StorageAccountKey $stokey -FileName $fileToExecute -ContainerName $containderName;
422+
Set-AzureVMCustomScriptExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -TypeHandlerVersion $extver -StorageAccountName $stoname -StorageAccountKey $stokey -FileName $fileToExecute -ContainerName $containerName;
423423

424424
# Get VM Extension
425425
$ext = Get-AzureVMCustomScriptExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname;
426426

427427
$expCommand = 'powershell -ExecutionPolicy Unrestricted -file ' + $fileToExecute + ' ';
428-
$expUri = $stoname + '.blob.core.windows.net/' + $containderName + '/' + $fileToExecute;
428+
$expUri = $stoname + '.blob.core.windows.net/' + $containerName + '/' + $fileToExecute;
429429
Assert-AreEqual $ext.ResourceGroupName $rgname;
430430
Assert-AreEqual $ext.Name $extname;
431431
Assert-AreEqual $ext.Publisher $publisher;
@@ -482,6 +482,163 @@ function Test-VirtualMachineCustomScriptExtension
482482
}
483483

484484

485+
<#
486+
.SYNOPSIS
487+
Test Virtual Machine Custom Script Extensions using FileUri
488+
#>
489+
function Test-VirtualMachineCustomScriptExtensionFileUri
490+
{
491+
# Setup
492+
$rgname = Get-ComputeTestResourceName
493+
494+
try
495+
{
496+
# Common
497+
$loc = 'westus';
498+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
499+
500+
# VM Profile & Hardware
501+
$vmsize = 'Standard_A4';
502+
$vmname = 'vm' + $rgname;
503+
$p = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
504+
Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize;
505+
506+
# NRP
507+
$subnet = New-AzureVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
508+
$vnet = New-AzureVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -DnsServer "10.1.1.1" -Subnet $subnet;
509+
$vnet = Get-AzureVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
510+
$subnetId = $vnet.Subnets[0].Id;
511+
$pubip = New-AzurePublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -AllocationMethod Dynamic -DomainNameLabel ('pubip' + $rgname);
512+
$pubip = Get-AzurePublicIpAddress -Name ('pubip' + $rgname) -ResourceGroupName $rgname;
513+
$pubipId = $pubip.Id;
514+
$nic = New-AzureNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
515+
$nic = Get-AzureNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
516+
$nicId = $nic.Id;
517+
518+
$p = Add-AzureVMNetworkInterface -VM $p -Id $nicId;
519+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
520+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
521+
522+
# Storage Account (SA)
523+
$stoname = 'sto' + $rgname;
524+
$stotype = 'Standard_GRS';
525+
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
526+
Retry-IfException { $global:stoaccount = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
527+
$stokey = (Get-AzureStorageAccountKey -ResourceGroupName $rgname -Name $stoname).Key1;
528+
529+
$osDiskName = 'osDisk';
530+
$osDiskCaching = 'ReadWrite';
531+
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
532+
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
533+
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
534+
535+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
536+
537+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
538+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
539+
540+
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
541+
Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
542+
Assert-AreEqual $p.StorageProfile.OSDisk.VirtualHardDisk.Uri $osDiskVhdUri;
543+
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
544+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
545+
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
546+
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
547+
Assert-AreEqual $p.StorageProfile.DataDisks[0].VirtualHardDisk.Uri $dataDiskVhdUri1;
548+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
549+
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
550+
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
551+
Assert-AreEqual $p.StorageProfile.DataDisks[1].VirtualHardDisk.Uri $dataDiskVhdUri2;
552+
553+
# OS & Image
554+
$user = "Foo12";
555+
$password = 'BaR@123' + $rgname;
556+
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
557+
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
558+
$computerName = 'test';
559+
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
560+
561+
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
562+
563+
$imgRef = Get-DefaultCRPWindowsImageOffline;
564+
$p = ($imgRef | Set-AzureVMSourceImage -VM $p);
565+
566+
Assert-AreEqual $p.OSProfile.AdminUsername $user;
567+
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
568+
Assert-AreEqual $p.OSProfile.AdminPassword $password;
569+
Assert-AreEqual $p.OSProfile.WindowsConfiguration.ProvisionVMAgent $true;
570+
571+
# Virtual Machine
572+
New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
573+
574+
# Virtual Machine Extension
575+
$extname = $rgname + 'ext';
576+
$extver = '1.1';
577+
$publisher = 'Microsoft.Compute';
578+
$exttype = 'CustomScriptExtension';
579+
$containerName = 'scripts';
580+
$fileToExecute = 'test1.ps1';
581+
$duration = New-Object -TypeName TimeSpan(2,0,0);
582+
$type = [Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPermissions]::Read;
583+
584+
$sasFile1 = Get-SasUri $stoname $stokey $containerName $fileToExecute $duration $type;
585+
$sasFile2 = Get-SasUri $stoname $stokey $containerName $fileToExecute $duration $type;
586+
587+
# Set custom script extension
588+
Set-AzureVMCustomScriptExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -TypeHandlerVersion $extver -Run $fileToExecute -FileUri $sasFile1, $sasFile2;
589+
590+
# Get VM Extension
591+
$ext = Get-AzureVMCustomScriptExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname;
592+
593+
$expCommand = 'powershell -ExecutionPolicy Unrestricted -file ' + $fileToExecute+ ' ';
594+
$expUri = $stoname + '.blob.core.windows.net/' + $containerName + '/' + $fileToExecute;
595+
Assert-AreEqual $ext.ResourceGroupName $rgname;
596+
Assert-AreEqual $ext.Name $extname;
597+
Assert-AreEqual $ext.Publisher $publisher;
598+
Assert-AreEqual $ext.ExtensionType $exttype;
599+
Assert-AreEqual $ext.TypeHandlerVersion $extver;
600+
Assert-AreEqual $ext.CommandToExecute $expCommand;
601+
Assert-True {$ext.Uri[0].Contains($expUri)};
602+
Assert-True {$ext.Uri[1].Contains($expUri)};
603+
Assert-NotNull $ext.ProvisioningState;
604+
605+
$ext = Get-AzureVMCustomScriptExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname -Status;
606+
Assert-AreEqual $ext.ResourceGroupName $rgname;
607+
Assert-AreEqual $ext.Name $extname;
608+
Assert-AreEqual $ext.Publisher $publisher;
609+
Assert-AreEqual $ext.ExtensionType $exttype;
610+
Assert-AreEqual $ext.TypeHandlerVersion $extver;
611+
Assert-AreEqual $ext.CommandToExecute $expCommand;
612+
Assert-True {$ext.Uri[0].Contains($expUri)};
613+
Assert-True {$ext.Uri[1].Contains($expUri)};
614+
Assert-NotNull $ext.ProvisioningState;
615+
Assert-NotNull $ext.Statuses;
616+
617+
# Get VM
618+
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
619+
Assert-AreEqual $vm1.Name $vmname;
620+
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
621+
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
622+
623+
Assert-AreEqual $vm1.OSProfile.AdminUsername $user;
624+
Assert-AreEqual $vm1.OSProfile.ComputerName $computerName;
625+
Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
626+
627+
# Check Extensions in VM
628+
Assert-AreEqual $vm1.Extensions.Count 1;
629+
Assert-AreEqual $vm1.Extensions[0].Name $extname;
630+
Assert-AreEqual $vm1.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions';
631+
Assert-AreEqual $vm1.Extensions[0].Publisher $publisher;
632+
Assert-AreEqual $vm1.Extensions[0].ExtensionType $exttype;
633+
Assert-AreEqual $vm1.Extensions[0].TypeHandlerVersion $extver;
634+
Assert-NotNull $vm1.Extensions[0].Settings;
635+
}
636+
finally
637+
{
638+
# Cleanup
639+
Clean-ResourceGroup $rgname
640+
}
641+
}
485642

486643
<#
487644
.SYNOPSIS
@@ -578,7 +735,7 @@ function Test-VirtualMachineAccessExtension
578735

579736
# Virtual Machine
580737
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
581-
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
738+
New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
582739

583740
# Virtual Machine Extension
584741
$extname = 'csetest';

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function Test-SingleNetworkInterface
110110

111111
# Virtual Machine
112112
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
113-
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
113+
New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
114114

115115
# Get VM
116116
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
@@ -215,7 +215,7 @@ function Test-SingleNetworkInterfaceDnsSettings
215215

216216
# Virtual Machine
217217
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
218-
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
218+
New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
219219

220220
# Get VM
221221
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
@@ -324,7 +324,7 @@ function Test-MultipleNetworkInterface
324324

325325
# Virtual Machine
326326
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
327-
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
327+
New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
328328

329329
# Get VM
330330
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
@@ -447,7 +447,7 @@ function Test-AddNetworkInterface
447447

448448
# Virtual Machine
449449
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
450-
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
450+
New-AzureVM -ResourceGroupName $rgname -Location $loc -VM $p;
451451

452452
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
453453
Assert-AreEqual $vm1.Name $vmname;

0 commit comments

Comments
 (0)