Skip to content

Commit b841e45

Browse files
cormacpaynecormacpayne
authored
Merge pull request #3263 from hyonholee/dev
[AzureRT] December release
2 parents 33a4326 + 40c778b commit b841e45

File tree

34 files changed

+21081
-1467
lines changed

34 files changed

+21081
-1467
lines changed

‎src/ResourceManager/Compute/AzureRM.Compute.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ CmdletsToExport = 'Remove-AzureRmAvailabilitySet', 'Get-AzureRmAvailabilitySet',
100100
'Get-AzureRmRemoteDesktopFile', 'Get-AzureRmVMUsage',
101101
'Get-AzureRmVMSize', 'Save-AzureRmVMImage', 'Set-AzureRmVM',
102102
'Add-AzureRmVMAdditionalUnattendContent',
103-
'Add-AzureRmVMSshPublicKey', 'Add-AzureRmVMSecret',
103+
'Add-AzureRmVMSshPublicKey', 'Add-AzureRmVMSecret', 'Remove-AzureRmVMSecret',
104104
'Remove-AzureRmVMNetworkInterface', 'Remove-AzureRmVMDataDisk',
105105
'Set-AzureRmVMBootDiagnostics', 'Set-AzureRmVMDataDisk',
106106
'Set-AzureRmVMPlan', 'Set-AzureRmVMSourceImage',

‎src/ResourceManager/Compute/ChangeLog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
-->
2020
## Current Release
2121

22+
* Add Remove-AzureRmVMSecret cmdlet.
23+
24+
* Add DisplayHint property to VM object to enable Compact and Expand display modes.
25+
26+
* Add DisplayHint parameter to Get-AzureRmVM to choose display mode of VM object.
27+
2228
* Updated Set-AzureRmVMChefExtension cmdlet to add following new options :
2329
- JsonAttribute : A JSON string to be added to the first run of chef-client. e.g. -JsonAttribute '{"container_service": {"chef-init-test": {"command": "C:\\opscode\\chef\\bin"}}}'
2430

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ function Test-ContainerService
7070
$output = $cslist | Out-String;
7171
Assert-False { $output.Contains("AgentPoolProfiles") };
7272

73-
$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
73+
#$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName -Force;
74+
$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
7475
}
7576
finally
7677
{
@@ -144,7 +145,8 @@ function Test-ContainerServiceUpdate
144145
-Count 2 `
145146
| Update-AzureRmContainerService;
146147

147-
$st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService;
148+
#$st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService -Force;
149+
$st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService;
148150
}
149151
finally
150152
{

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,30 @@ function Test-VirtualMachineProfile
130130
$certUrl2 = "https://testvault123.vault.azure.net/secrets/Test1/514ceb769c984379a7e0230bddaaaaaa";
131131
$p = Add-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri -CertificateStore $certStore2 -CertificateUrl $certUrl2;
132132

133+
Assert-AreEqual 2 $p.OSProfile.Secrets.Count;
134+
Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.Id $referenceUri;
135+
Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateStore $certStore;
136+
Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateUrl $certUrl;
137+
Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.Id $referenceUri;
138+
Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[1].CertificateStore $certStore2;
139+
Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[1].CertificateUrl $certUrl2;
140+
Assert-AreEqual $p.OSProfile.Secrets[1].SourceVault.Id $referenceUri2;
141+
Assert-AreEqual $p.OSProfile.Secrets[1].VaultCertificates[0].CertificateStore $certStore;
142+
Assert-AreEqual $p.OSProfile.Secrets[1].VaultCertificates[0].CertificateUrl $certUrl;
143+
144+
$p = Remove-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri;
145+
Assert-AreEqual 1 $p.OSProfile.Secrets.Count;
146+
Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.Id $referenceUri2;
147+
Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateStore $certStore;
148+
Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateUrl $certUrl;
149+
150+
$p = Remove-AzureRmVMSecret -VM $p;
151+
Assert-AreEqual 0 $p.OSProfile.Secrets.Count;
152+
153+
$p = Add-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri -CertificateStore $certStore -CertificateUrl $certUrl;
154+
$p = Add-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri2 -CertificateStore $certStore -CertificateUrl $certUrl;
155+
$p = Add-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri -CertificateStore $certStore2 -CertificateUrl $certUrl2;
156+
133157
$aucSetting = "AutoLogon";
134158
$aucContent = "<UserAccounts><AdministratorPassword><Value>" + $password + "</Value><PlainText>true</PlainText></AdministratorPassword></UserAccounts>";
135159
$p = Add-AzureRmVMAdditionalUnattendContent -VM $p -Content $aucContent -SettingName $aucSetting;

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,15 @@ function Test-VirtualMachineScaleSet
100100
| Add-AzureRmVmssExtension -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -AutoUpgradeMinorVersion $true `
101101
| Remove-AzureRmVmssExtension -Name $extname `
102102
| Add-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2' -IPConfiguration $ipCfg `
103-
| Remove-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2' `
104-
| New-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName;
103+
| Remove-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2'
104+
105+
# Validate Remove Network profile
106+
Assert-AreEqual 'test' $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].Name;
107+
Assert-AreEqual $true $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].Primary;
108+
Assert-AreEqual $subnetId `
109+
$vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].Subnet.Id;
110+
111+
$vmss = New-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmss;
105112

106113
Assert-AreEqual $loc $vmss.Location;
107114
Assert-AreEqual 2 $vmss.Sku.Capacity;
@@ -206,6 +213,8 @@ function Test-VirtualMachineScaleSet
206213
$st = $vmssResult | Restart-AzureRmVmss -InstanceId $instanceListParam;
207214

208215
# Remove
216+
#$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1 -Force;
217+
#$st = $vmssResult | Remove-AzureRmVmss -Force;
209218
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1;
210219
$st = $vmssResult | Remove-AzureRmVmss;
211220
}
@@ -332,6 +341,8 @@ function Test-VirtualMachineScaleSetReimageUpdate
332341
"Conflict";
333342

334343
# Remove
344+
#$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1 -Force;
345+
#$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force;
335346
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1;
336347
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
337348
}
@@ -431,13 +442,14 @@ function Test-VirtualMachineScaleSetLB
431442
Assert-AreEqual $expectedLb.BackendAddressPools[0].Id $ipCfg.LoadBalancerBackendAddressPools[0].Id;
432443
Assert-AreEqual $subnetId $ipCfg.Subnet.Id;
433444

445+
$settingString = ‘{ “AntimalwareEnabled”: true}’;
434446
$vmss = New-AzureRmVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'automatic' -NetworkInterfaceConfiguration $netCfg `
435447
| Add-AzureRmVmssNetworkInterfaceConfiguration -Name 'test' -Primary $true -IPConfiguration $ipCfg `
436448
| Set-AzureRmVmssOSProfile -ComputerNamePrefix 'test' -AdminUsername $adminUsername -AdminPassword $adminPassword `
437449
| Set-AzureRmVmssStorageProfile -Name 'test' -OsDiskCreateOption 'FromImage' -OsDiskCaching 'None' `
438450
-ImageReferenceOffer $imgRef.Offer -ImageReferenceSku $imgRef.Skus -ImageReferenceVersion $imgRef.Version `
439451
-ImageReferencePublisher $imgRef.PublisherName -VhdContainer $vhdContainer `
440-
| Add-AzureRmVmssExtension -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -AutoUpgradeMinorVersion $true `
452+
| Add-AzureRmVmssExtension -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -AutoUpgradeMinorVersion $true -Setting $settingString `
441453
| Remove-AzureRmVmssExtension -Name $extname `
442454
| Add-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2' -IPConfiguration $ipCfg `
443455
| Remove-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2' `
@@ -528,6 +540,7 @@ function Test-VirtualMachineScaleSetLB
528540
Assert-True { $output.Contains("PlatformUpdateDomain") };
529541
}
530542

543+
#$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force;
531544
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
532545
}
533546
finally

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

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,25 @@ function Test-VirtualMachine
119119
New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
120120

121121
# Get VM
122-
$vm1 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
122+
$vm1 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname -DisplayHint Expand;
123+
124+
# VM Expand output
123125
$a = $vm1 | Out-String;
124126
Write-Verbose("Get-AzureRmVM output:");
125127
Write-Verbose($a);
128+
Assert-True {$a.Contains("Sku");}
129+
130+
# VM Compact output
131+
$vm1.DisplayHint = "Compact";
132+
$a = $vm1 | Out-String;
133+
Assert-False {$a.Contains("Sku");}
134+
135+
# Table format output
126136
$a = $vm1 | Format-Table | Out-String;
127137
Write-Verbose("Get-AzureRmVM | Format-Table output:");
128138
Write-Verbose($a);
129139

140+
Assert-NotNull $vm1.VmId;
130141
Assert-AreEqual $vm1.Name $vmname;
131142
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
132143
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].Id $nicId;
@@ -179,6 +190,15 @@ function Test-VirtualMachine
179190
Assert-True{$a.Contains("NIC");}
180191
Assert-AreNotEqual $vms $null;
181192

193+
# VM Compact output
194+
$a = $vms[0] | Format-Custom | Out-String;
195+
Assert-False {$a.Contains("Sku");}
196+
197+
# VM Expand output
198+
$vms[0].DisplayHint = "Expand";
199+
$a = $vms[0] | Format-Custom | Out-String;
200+
Assert-True {$a.Contains("Sku");}
201+
182202
# Remove All VMs
183203
Get-AzureRmVM -ResourceGroupName $rgname | Remove-AzureRmVM -ResourceGroupName $rgname -Force;
184204
$vms = Get-AzureRmVM -ResourceGroupName $rgname;
@@ -1644,12 +1664,32 @@ function Test-VirtualMachineTags
16441664
Write-Verbose("Get-AzureRmVM output:");
16451665
Write-Verbose($a);
16461666

1647-
#Assert-NotNull $vm.RequestId;
1667+
Assert-NotNull $vm.RequestId;
16481668
Assert-NotNull $vm.StatusCode;
16491669

16501670
# Assert
16511671
Assert-AreEqual "testval1" $vm.Tags["test1"];
16521672
Assert-AreEqual "testval2" $vm.Tags["test2"];
1673+
1674+
# Update VM
1675+
$vm = $vm | Update-AzureRmVM;
1676+
$vm = Get-AzureRmVM -ResourceGroupName $rgname -Name $vmname;
1677+
1678+
Assert-NotNull $vm.RequestId;
1679+
Assert-NotNull $vm.StatusCode;
1680+
Assert-AreEqual "testval1" $vm.Tags["test1"];
1681+
Assert-AreEqual "testval2" $vm.Tags["test2"];
1682+
1683+
# Update VM with new Tags
1684+
$new_tags = @{test1 = "testval3"; test2 = "testval4" };
1685+
$st = $vm | Update-AzureRmVM -Tags $new_tags;
1686+
$vm = Get-AzureRmVM -ResourceGroupName $rgname -Name $vmname;
1687+
1688+
Assert-NotNull $vm.RequestId;
1689+
Assert-NotNull $vm.StatusCode;
1690+
Assert-AreEqual "testval3" $vm.Tags["test1"];
1691+
Assert-AreEqual "testval4" $vm.Tags["test2"];
1692+
16531693
}
16541694
finally
16551695
{
@@ -2779,6 +2819,15 @@ function Test-VirtualMachineGetStatus
27792819
Write-Verbose($a);
27802820
Assert-True {$a.Contains("PowerState");}
27812821

2822+
# VM Compact output
2823+
$a = $vms[0] | Format-Custom | Out-String;
2824+
Assert-False{$a.Contains("Sku");};
2825+
2826+
# VM Expand output
2827+
$vms[0].DisplayHint = "Expand"
2828+
$a = $vms[0] | Format-Custom | Out-String;
2829+
Assert-True{$a.Contains("Sku");};
2830+
27822831
# Remove
27832832
Remove-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Force;
27842833
}

0 commit comments

Comments
 (0)