Skip to content

Commit 5b6e1ce

Browse files
authored
Merge pull request Azure#4055 from MSSedusch/preview
Fix Test cmdlet for managed disks
2 parents cc9a484 + 7b1876a commit 5b6e1ce

File tree

4 files changed

+22683
-105806
lines changed

4 files changed

+22683
-105806
lines changed

src/ResourceManager/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Fix Test-AzureRmVMAEMExtension for virtual machines with multiple managed disks
2122
* Updated Set-AzureRmVMAEMExtension: Add caching information for Premium managed disks
2223

2324
## Version 3.0.0

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AEMExtensionTests.ps1

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,20 +323,21 @@ function Test-AEMExtensionAdvancedLinuxMD
323323
$vm = Create-AdvancedVM -rgname $rgname -loc $loc -vmsize 'Standard_DS2' -stotype 'Premium_LRS' -nicCount 2 -useMD -linux
324324
$vmname = $vm.Name
325325
$vm = Get-AzureRmVM -ResourceGroupName $rgname -Name $vmname
326-
Add-AzureRmVMDataDisk -VM $vm -StorageAccountType StandardLRS -Lun (($vm.StorageProfile.DataDisks | select -ExpandProperty Lun | Measure-Object -Maximum).Maximum + 1) -CreateOption Empty -DiskSizeInGB 10 | Update-AzureRmVM
326+
Add-AzureRmVMDataDisk -VM $vm -StorageAccountType PremiumLRS -Lun (($vm.StorageProfile.DataDisks | select -ExpandProperty Lun | Measure-Object -Maximum).Maximum + 1) -CreateOption Empty -DiskSizeInGB 1023 | Update-AzureRmVM
327327

328328

329329
Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: VM created"
330330

331331
# Get with not extension
332332
Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: Get with no extension"
333333
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
334-
Assert-Null $extension
334+
Assert-Null $extension "Extension is not null"
335335

336336
# Test with not extension
337337
Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: Test with no extension"
338338
$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
339-
Assert-False { $res.Result }
339+
$tmp = $res;$out = &{while ($true) { if ($tmp) { foreach ($tmpRes in $tmp) {($tmpRes.TestName + " " + $tmpRes.Result)};$tmp = @($tmp.PartialResults)} else {break}}};
340+
Assert-False { $res.Result } "Test result is not false $out"
340341
Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: Test done"
341342

342343
$stoname = 'sto' + $rgname + "2";
@@ -361,7 +362,8 @@ function Test-AEMExtensionAdvancedLinuxMD
361362
# Test command.
362363
Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: Test with extension"
363364
$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
364-
Assert-True { $res.Result }
365+
$tmp = $res;$out = &{while ($true) { if ($tmp) { foreach ($tmpRes in $tmp) {($tmpRes.TestName + " " + $tmpRes.Result)};$tmp = @($tmp.PartialResults)} else {break}}};
366+
Assert-True { $res.Result } "Test result is not false $out"
365367
Assert-True { ($res.PartialResults.Count -gt 0) }
366368
Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: Test done"
367369

0 commit comments

Comments
 (0)