Skip to content

Commit fa6f785

Browse files
huangpfhuangpf
committed
Merge pull request #497 from Azure/dev
HPF PR: dev <- Azure:dev
2 parents eb2ccb7 + 380d900 commit fa6f785

File tree

188 files changed

+30594
-25905
lines changed

Some content is hidden

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

188 files changed

+30594
-25905
lines changed

‎ChangeLog.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
##2016.03.03 version 1.2.2
1+
##2016.03.30 version 1.2.3
2+
* Azure Storage
3+
* Made Protocol parameter in following cmdlets to be nullable and optional
4+
- New-AzureStorageBlobSASToken
5+
- New-AzureStorageContainerSASToken
6+
- New-AzureStorageFileSASToken
7+
- New-AzureStorageShareSASToken
8+
- New-AzureStorageQueueSASToken
9+
- New-AzureStorageTableSASToken
10+
- New-AzureStorageAccountSASToken
11+
12+
##2016.03.03 version 1.2.2
213
* Azure Compute (ARM):
314
* Add -LicenseType parameter to New-AzureRmVM for bring your own license (BYOL)
415
* Add -SecureExecution parameter to Set-AzureRmVMCustomScriptExtension

‎setup/azurecmdfiles.wxi‎

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

src/ResourceManager/Cdn/AzureCdn.psd1 renamed to src/ResourceManager/Cdn/AzureRM.Cdn.psd1

File renamed without changes.

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/TestController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void RunPsTestWorkflow(
135135
"ScenarioTests\\" + callingClassName + ".ps1",
136136
_helper.RMProfileModule,
137137
_helper.RMResourceModule,
138-
@"AzureRm.Cdn.psd1");
138+
@"AzureRM.Cdn.psd1");
139139

140140
try
141141
{

‎src/ResourceManager/Cdn/Commands.Cdn/AzureRm.Cdn.psd1‎

-5.21 KB
Binary file not shown.

‎src/ResourceManager/Cdn/Commands.Cdn/Commands.Cdn.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@
168168
</ProjectReference>
169169
</ItemGroup>
170170
<ItemGroup>
171-
<None Include="AzureRm.Cdn.psd1">
171+
<None Include="..\AzureRM.Cdn.psd1">
172+
<Link>AzureRM.Cdn.psd1</Link>
172173
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
173174
</None>
174175
<None Include="Microsoft.Azure.Commands.Cdn.dll-help.psd1" />

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,12 @@
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, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.11.3.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
70-
<Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.3.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
70+
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
7273
<Private>True</Private>
7374
</Reference>
7475
<Reference Include="Microsoft.Azure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 99 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -923,15 +923,15 @@ function Test-AzureDiskEncryptionExtension
923923
{
924924
# This test should be run in Live mode only not in Playback mode
925925
#Pre-requisites to be filled in before running this test. The AAD app should belong to the directory as the user running the test.
926-
$aadClientID = "";
927-
$aadClientSecret = "";
928-
#Fill in VM admin user and password
929-
$adminUser = "";
930-
$adminPassword = "";
931-
926+
$aadAppName = "detestaadapp";
927+
932928
#Resource group variables
933-
$rgName = "detestrg";
934-
$loc = "South Central US";
929+
$rgName = Get-ComputeTestResourceName;
930+
$loc = Get-ComputeVMLocation;
931+
932+
#Fill in VM admin user and password
933+
$adminUser = "Foo12";
934+
$adminPassword = "BaR@123" + $rgName;
935935

936936
#KeyVault config variables
937937
$vaultName = "detestvault";
@@ -951,30 +951,54 @@ function Test-AzureDiskEncryptionExtension
951951
$osDiskName = 'osdisk' + $vmName;
952952
$dataDiskName = 'datadisk' + $vmName;
953953
$osDiskCaching = 'ReadWrite';
954+
$extraDataDiskName1 = $dataDiskName + '1';
955+
$extraDataDiskName2 = $dataDiskName + '2';
954956

955957
#Network config variables
956958
$vnetName = "detestvnet";
957959
$subnetName = "detestsubnet";
958960
$publicIpName = 'pubip' + $vmName;
959961
$nicName = 'nic' + $vmName;
960-
961-
962+
962963
#Disk encryption variables
963964
$keyEncryptionAlgorithm = "RSA-OAEP";
964965
$volumeType = "All";
965966

966967
try
967968
{
968-
Login-AzureRmAccount;
969-
# Create new resource group
970-
New-AzureRmResourceGroup -Name $rgname -Location $loc -Force;
969+
# Create new resource group
970+
New-AzureRmResourceGroup -Name $rgName -Location $loc -Force;
971+
972+
#Check if AAD app was already created
973+
$SvcPrincipals = (Get-AzureRmADServicePrincipal -SearchString $aadAppName);
974+
if(-not $SvcPrincipals)
975+
{
976+
# Create a new AD application if not created before
977+
$identifierUri = [string]::Format("http://localhost:8080/{0}", $rgname);
978+
$defaultHomePage = 'http://contoso.com';
979+
$now = [System.DateTime]::Now;
980+
$oneYearFromNow = $now.AddYears(1);
981+
$aadClientSecret = Get-ResourceName;
982+
$ADApp = New-AzureRmADApplication -DisplayName $aadAppName -HomePage $defaultHomePage -IdentifierUris $identifierUri -StartDate $now -EndDate $oneYearFromNow -Password $aadClientSecret;
983+
Assert-NotNull $ADApp;
984+
$servicePrincipal = New-AzureRmADServicePrincipal -ApplicationId $ADApp.ApplicationId;
985+
$SvcPrincipals = (Get-AzureRmADServicePrincipal -SearchString $aadAppName);
986+
# Was AAD app created?
987+
Assert-NotNull $SvcPrincipals;
988+
$aadClientID = $servicePrincipal.ApplicationId;
989+
}
990+
else
991+
{
992+
# Was AAD app already created?
993+
Assert-NotNull $aadClientSecret;
994+
$aadClientID = $SvcPrincipals[0].ApplicationId;
995+
}
971996

972997
# Create new KeyVault
973998
$keyVault = New-AzureRmKeyVault -VaultName $vaultName -ResourceGroupName $rgname -Location $loc -Sku standard;
974999
$keyVault = Get-AzureRmKeyVault -VaultName $vaultName -ResourceGroupName $rgname
9751000
#set enabledForDiskEncryption
976-
Write-Host 'Press go to https://resources.azure.com and set enabledForDiskEncryption flag on KeyVault. [ENTER] to continue or [CTRL-C] to abort...'
977-
Read-Host
1001+
Set-AzureRmKeyVaultAccessPolicy -VaultName $vaultName -ResourceGroupName $rgname -EnabledForDiskEncryption;
9781002
#set permissions to AAD app to write secrets and keys
9791003
Set-AzureRmKeyVaultAccessPolicy -VaultName $vaultName -ServicePrincipalName $aadClientID -PermissionsToKeys all -PermissionsToSecrets all
9801004
#create a key in KeyVault to use as Kek
@@ -1019,17 +1043,69 @@ function Test-AzureDiskEncryptionExtension
10191043

10201044
$p = Set-AzureRmVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -ProvisionVMAgent;
10211045
$p = Set-AzureRmVMSourceImage -VM $p -PublisherName $imagePublisher -Offer $imageOffer -Skus $imageSku -Version "latest";
1022-
1023-
1046+
10241047
# Virtual Machine
10251048
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
10261049

10271050
#Enable encryption on the VM
10281051
Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName -AadClientID $aadClientID -AadClientSecret $aadClientSecret -DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId -KeyEncryptionKeyUrl $keyEncryptionKeyUrl -KeyEncryptionKeyVaultId $keyVaultResourceId -Force;
10291052
#Get encryption status
10301053
$encryptionStatus = Get-AzureRmVmDiskEncryptionStatus -ResourceGroupName $rgname -VMName $vmName;
1054+
#Verify encryption is enabled on OS volume and data volumes
1055+
$OsVolumeEncryptionSettings = $encryptionStatus.OsVolumeEncryptionSettings;
1056+
Assert-AreEqual $encryptionStatus.OsVolumeEncrypted $true;
1057+
Assert-AreEqual $encryptionStatus.DataVolumesEncrypted $true;
1058+
#verify diskencryption keyvault url & kek url are not null
1059+
Assert-NotNull $OsVolumeEncryptionSettings;
1060+
Assert-NotNull $OsVolumeEncryptionSettings.DiskEncryptionKey.SecretUrl;
1061+
Assert-NotNull $OsVolumeEncryptionSettings.DiskEncryptionKey.SourceVault;
1062+
1063+
#Add a couple of data volumes to encrypt them
1064+
$p = Add-AzureRmVMDataDisk -VM $p -Name $extraDataDiskName1 -Caching 'ReadOnly' -DiskSizeInGB 2 -Lun 1 -VhdUri $dataDiskVhdUri -CreateOption Empty;
1065+
$p = Add-AzureRmVMDataDisk -VM $p -Name $extraDataDiskName2 -Caching 'ReadOnly' -DiskSizeInGB 2 -Lun 1 -VhdUri $dataDiskVhdUri -CreateOption Empty;
1066+
#Enable encryption on the VM
1067+
Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName -AadClientID $aadClientID -AadClientSecret $aadClientSecret -DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId -KeyEncryptionKeyUrl $keyEncryptionKeyUrl -KeyEncryptionKeyVaultId $keyVaultResourceId -Force;
1068+
#Get encryption status
1069+
$encryptionStatus = Get-AzureRmVmDiskEncryptionStatus -ResourceGroupName $rgname -VMName $vmName;
1070+
#Verify encryption is enabled on OS volume and data volumes
1071+
$OsVolumeEncryptionSettings = $encryptionStatus.OsVolumeEncryptionSettings;
1072+
Assert-AreEqual $encryptionStatus.OsVolumeEncrypted $true;
1073+
Assert-AreEqual $encryptionStatus.DataVolumesEncrypted $true;
1074+
#verify diskencryption keyvault url & kek url are not null
1075+
Assert-NotNull $OsVolumeEncryptionSettings;
1076+
Assert-NotNull $OsVolumeEncryptionSettings.DiskEncryptionKey.SecretUrl;
1077+
Assert-NotNull $OsVolumeEncryptionSettings.DiskEncryptionKey.SourceVault;
1078+
1079+
#Disable encryption on the VM
1080+
Disable-AzureRmVMDiskEncryption -ResourceGroupName $rgname -VMName $vmName;
1081+
#Get encryption status
1082+
$encryptionStatus = Get-AzureRmVmDiskEncryptionStatus -ResourceGroupName $rgname -VMName $p.StorageProfile.OSDisk.Name;
1083+
#Verify encryption is disabled on OS volume and data volumes
1084+
$OsVolumeEncryptionSettings = $encryptionStatus.OsVolumeEncryptionSettings;
1085+
Assert-AreEqual $encryptionStatus.OsVolumeEncrypted $false;
1086+
Assert-AreEqual $encryptionStatus.DataVolumesEncrypted $false;
1087+
10311088
#Remove AzureDiskEncryption extension
10321089
Remove-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName;
1090+
#Get encryption status again to make sure it's the same as before when the extension was installed
1091+
$encryptionStatus = Get-AzureRmVmDiskEncryptionStatus -ResourceGroupName $rgname -VMName $vmName;
1092+
#Verify encryption is disabled on OS volume and data volumes
1093+
$OsVolumeEncryptionSettings = $encryptionStatus.OsVolumeEncryptionSettings;
1094+
Assert-AreEqual $encryptionStatus.OsVolumeEncrypted $false;
1095+
Assert-AreEqual $encryptionStatus.DataVolumesEncrypted $false;
1096+
1097+
#Enable encryption on the VM
1098+
Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName -AadClientID $aadClientID -AadClientSecret $aadClientSecret -DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId -KeyEncryptionKeyUrl $keyEncryptionKeyUrl -KeyEncryptionKeyVaultId $keyVaultResourceId -Force;
1099+
#Get encryption status
1100+
$encryptionStatus = Get-AzureRmVmDiskEncryptionStatus -ResourceGroupName $rgname -VMName $vmName;
1101+
#Verify encryption is enabled on OS volume and data volumes
1102+
$OsVolumeEncryptionSettings = $encryptionStatus.OsVolumeEncryptionSettings;
1103+
Assert-AreEqual $encryptionStatus.OsVolumeEncrypted $true;
1104+
Assert-AreEqual $encryptionStatus.DataVolumesEncrypted $true;
1105+
#verify diskencryption keyvault url & kek url are not null
1106+
Assert-NotNull $OsVolumeEncryptionSettings;
1107+
Assert-NotNull $OsVolumeEncryptionSettings.DiskEncryptionKey.SecretUrl;
1108+
Assert-NotNull $OsVolumeEncryptionSettings.DiskEncryptionKey.SourceVault;
10331109

10341110
#Remove the VM
10351111
Remove-AzureRmVm -ResourceGroupName $rgname -Name $vmName -Force;
@@ -1041,12 +1117,12 @@ function Test-AzureDiskEncryptionExtension
10411117
$p = Set-AzureRmVMOSDisk -VM $p -Name $p.StorageProfile.OSDisk.Name -VhdUri $p.StorageProfile.OSDisk.Vhd.Uri -Caching ReadWrite -CreateOption attach -DiskEncryptionKeyUrl $encryptionStatus.OsVolumeEncryptionSettings.DiskEncryptionKey.SecretUrl -DiskEncryptionKeyVaultId $encryptionStatus.OsVolumeEncryptionSettings.DiskEncryptionKey.SourceVault.Id -Windows;
10421118

10431119
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
1044-
10451120
}
10461121
finally
10471122
{
10481123
# Cleanup
1049-
Remove-AzureRmResourceGroup -Name $rgname -Force;
1124+
Clean-ResourceGroup $rgname;
1125+
#Remove-AzureRmADApplication -ApplicationObjectId $ADApp.ApplicationId -Force;
10501126
}
10511127
}
10521128

@@ -1306,7 +1382,10 @@ function Test-VirtualMachineExtensionWithSwitch
13061382
# Set extension settings by raw strings
13071383
$settingstr = '{"fileUris":[],"commandToExecute":""}';
13081384
$protectedsettingstr = '{"storageAccountName":"' + $stoname + '","storageAccountKey":"' + $stokey + '"}';
1309-
Set-AzureRmVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -ExtensionType $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr -DisableAutoUpgradeMinorVersion -ForceRerun
1385+
Set-AzureRmVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname `
1386+
-Name $extname -Publisher $publisher `
1387+
-ExtensionType $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr `
1388+
-DisableAutoUpgradeMinorVersion -ForceRerun "RerunExtension";
13101389

13111390
# Get VM Extension
13121391
$ext = Get-AzureRmVMExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ function Test-VirtualMachineProfile
165165
Assert-AreEqual $timeZone $p.OSProfile.WindowsConfiguration.TimeZone;
166166

167167
# Verify Additional Unattend Content
168-
Assert-AreEqual "Microsoft-Windows-Shell-Setup" $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[0].ComponentName;
168+
#Assert-AreEqual "Microsoft-Windows-Shell-Setup" $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[0].ComponentName;
169169
Assert-AreEqual $aucContent $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[0].Content;
170170
Assert-AreEqual "oobeSystem" $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[0].PassName;
171171
Assert-AreEqual $aucSetting $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[0].SettingName;
172-
Assert-AreEqual "Microsoft-Windows-Shell-Setup" $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[1].ComponentName;
172+
#Assert-AreEqual "Microsoft-Windows-Shell-Setup" $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[1].ComponentName;
173173
Assert-AreEqual $aucContent $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[1].Content;
174174
Assert-AreEqual "oobeSystem" $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[1].PassName;
175175
Assert-AreEqual $aucSetting $p.OSProfile.WindowsConfiguration.AdditionalUnattendContent[1].SettingName;

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

Lines changed: 7 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,6 @@ function Test-VirtualMachinePiping
237237
# VM Profile & Hardware
238238
$vmsize = 'Standard_A4';
239239
$vmname = 'vm' + $rgname;
240-
$p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize;
241-
Assert-AreEqual $p.HardwareProfile.VmSize $vmsize;
242240

243241
# NRP
244242
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
@@ -252,16 +250,6 @@ function Test-VirtualMachinePiping
252250
$nic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
253251
$nicId = $nic.Id;
254252

255-
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
256-
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
257-
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
258-
259-
# Adding the same Nic but not set it Primary
260-
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId -Primary;
261-
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
262-
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Id $nicId;
263-
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].Primary $true;
264-
265253
# Storage Account (SA)
266254
$stoname = 'sto' + $rgname;
267255
$stotype = 'Standard_GRS';
@@ -275,23 +263,6 @@ function Test-VirtualMachinePiping
275263
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
276264
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
277265

278-
$p = Set-AzureRmVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage;
279-
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
280-
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
281-
282-
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
283-
Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
284-
Assert-AreEqual $p.StorageProfile.OSDisk.Vhd.Uri $osDiskVhdUri;
285-
Assert-AreEqual $p.StorageProfile.DataDisks.Count 2;
286-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Caching 'ReadOnly';
287-
Assert-AreEqual $p.StorageProfile.DataDisks[0].DiskSizeGB 10;
288-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Lun 1;
289-
Assert-AreEqual $p.StorageProfile.DataDisks[0].Vhd.Uri $dataDiskVhdUri1;
290-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Caching 'ReadOnly';
291-
Assert-AreEqual $p.StorageProfile.DataDisks[1].DiskSizeGB 11;
292-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Lun 2;
293-
Assert-AreEqual $p.StorageProfile.DataDisks[1].Vhd.Uri $dataDiskVhdUri2;
294-
295266
# OS & Image
296267
$user = "Foo12";
297268
$password = 'BaR@123' + $rgname;
@@ -300,23 +271,15 @@ function Test-VirtualMachinePiping
300271
$computerName = 'test';
301272
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
302273

303-
$p = Set-AzureRmVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
274+
$p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize `
275+
| Add-AzureRmVMNetworkInterface -Id $nicId -Primary `
276+
| Set-AzureRmVMOSDisk -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage `
277+
| Add-AzureRmVMDataDisk -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -VhdUri $dataDiskVhdUri1 -CreateOption Empty `
278+
| Add-AzureRmVMDataDisk -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 -VhdUri $dataDiskVhdUri2 -CreateOption Empty `
279+
| Set-AzureRmVMOperatingSystem -Windows -ComputerName $computerName -Credential $cred;
304280

305281
$imgRef = Get-DefaultCRPImage -loc $loc;
306-
$p = ($imgRef | Set-AzureRmVMSourceImage -VM $p);
307-
308-
Assert-AreEqual $p.OSProfile.AdminUsername $user;
309-
Assert-AreEqual $p.OSProfile.ComputerName $computerName;
310-
Assert-AreEqual $p.OSProfile.AdminPassword $password;
311-
312-
Assert-AreEqual $p.StorageProfile.ImageReference.Offer $imgRef.Offer;
313-
Assert-AreEqual $p.StorageProfile.ImageReference.Publisher $imgRef.PublisherName;
314-
Assert-AreEqual $p.StorageProfile.ImageReference.Sku $imgRef.Skus;
315-
Assert-AreEqual $p.StorageProfile.ImageReference.Version $imgRef.Version;
316-
317-
# Virtual Machine
318-
# TODO: Still need to do retry for New-AzureRmVM for SA, even it's returned in Get-.
319-
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
282+
$imgRef | Set-AzureRmVMSourceImage -VM $p | New-AzureRmVM -ResourceGroupName $rgname -Location $loc;
320283

321284
# Get VM
322285
$vm1 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;

0 commit comments

Comments
 (0)