Skip to content

Set-AzureRmVMAEMExtension: Add support for new Premium Disk sizes and M series #4239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 21, 2017
Merged

Set-AzureRmVMAEMExtension: Add support for new Premium Disk sizes and M series #4239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f7c593
add support for new Premium Disk sizes
MSSedusch Jul 5, 2017
d5ab6df
add changelog
MSSedusch Jul 5, 2017
2fd1f14
Merge branch 'preview' into preview
MSSedusch Jul 5, 2017
2ad2a22
resolve merge conflict
MSSedusch Jul 18, 2017
3173657
fix merge conflicts
MSSedusch Jul 19, 2017
d0ea5bd
fix merge conflict
MSSedusch Jul 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/ResourceManager/Compute/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- Additional information about change #1
-->
## Current Release
* Set-AzureRmVMAEMExtension: Add support for new Premium Disk sizes
* Set-AzureRmVMAEMExtension: Add support for M series

## Version 3.2.1
- Fix issue with VM DIsk and VM Disk snapshot create and update cmdlets, (link)[https://github.com/azure/azure-powershell/issues/4309]
Expand Down
82 changes: 50 additions & 32 deletions src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AEMExtensionTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ function Test-AEMExtensionBasicWindowsWAD

# Get with not extension
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
# Test with not extension
$testResult = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
Assert-False { $testResult.Result }
Assert-False { $testResult.Result } (GetWrongTestResult $testResult $true)

# Set and Get command.
Set-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorage -EnableWAD
Expand All @@ -48,13 +48,13 @@ function Test-AEMExtensionBasicWindowsWAD

# Test command.
$testResult = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -WaitTimeInMinutes 50 -SkipStorageCheck
Assert-True { $testResult.Result }
Assert-True { $testResult.Result } (GetWrongTestResult $testResult $false)
Assert-True { ($testResult.PartialResults.Count -gt 0) }

# Remove command.
Remove-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
}
finally
{
Expand All @@ -76,7 +76,7 @@ function Test-AEMExtensionBasicWindows

# Get with not extension
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
# Test with not extension
$testResult = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
Assert-False { $testResult.Result }
Expand All @@ -100,7 +100,7 @@ function Test-AEMExtensionBasicWindows
# Remove command.
Remove-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
}
finally
{
Expand All @@ -116,21 +116,21 @@ function Test-AEMExtensionAdvancedWindowsWAD

try
{
Write-Verbose "Start the test Test-AEMExtensionAdvancedWindows"
Write-Output "Start the test Test-AEMExtensionAdvancedWindows"
# Setup
$vm = Create-AdvancedVM -rgname $rgname -loc $loc -vmsize 'Standard_DS2' -stotype 'Premium_LRS' -nicCount 2
$vmname = $vm.Name
Write-Verbose "Test-AEMExtensionAdvancedWindows: VM created"
Write-Host "Test-AEMExtensionAdvancedWindows: VM created"

# Get with not extension
Write-Verbose "Test-AEMExtensionAdvancedWindows: Get with no extension"
Write-Output "Test-AEMExtensionAdvancedWindows: Get with no extension"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"

# Test with not extension
Write-Verbose "Test-AEMExtensionAdvancedWindows: Test with no extension"
$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
Assert-False { $res.Result }
Assert-False { $res.Result } (GetWrongTestResult $res $true)
Write-Verbose "Test-AEMExtensionAdvancedWindows: Test done"

$stoname = 'sto' + $rgname + "2";
Expand All @@ -155,7 +155,7 @@ function Test-AEMExtensionAdvancedWindowsWAD
# Test command.
Write-Verbose "Test-AEMExtensionAdvancedWindows: Test with extension"
$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
Assert-True { $res.Result }
Assert-True { $res.Result } (GetWrongTestResult $res $false)
Assert-True { ($res.PartialResults.Count -gt 0) }
Write-Verbose "Test-AEMExtensionAdvancedWindows: Test done"

Expand All @@ -166,7 +166,7 @@ function Test-AEMExtensionAdvancedWindowsWAD

Write-Verbose "Test-AEMExtensionAdvancedWindows: Get after remove"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
Write-Verbose "Test-AEMExtensionAdvancedWindows: Get after remove done"
}
finally
Expand All @@ -192,7 +192,7 @@ function Test-AEMExtensionAdvancedWindows
# Get with not extension
Write-Verbose "Test-AEMExtensionAdvancedWindows: Get with no extension"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"

# Test with not extension
Write-Verbose "Test-AEMExtensionAdvancedWindows: Test with no extension"
Expand Down Expand Up @@ -233,7 +233,7 @@ function Test-AEMExtensionAdvancedWindows

Write-Verbose "Test-AEMExtensionAdvancedWindows: Get after remove"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
Write-Verbose "Test-AEMExtensionAdvancedWindows: Get after remove done"
}
finally
Expand All @@ -259,7 +259,7 @@ function Test-AEMExtensionAdvancedWindowsMD
# Get with not extension
Write-Verbose "Test-AEMExtensionAdvancedWindowsMD: Get with no extension"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"

# Test with not extension
Write-Verbose "Test-AEMExtensionAdvancedWindowsMD: Test with no extension"
Expand Down Expand Up @@ -301,7 +301,7 @@ function Test-AEMExtensionAdvancedWindowsMD

Write-Verbose "Test-AEMExtensionAdvancedWindowsMD: Get after remove"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
Write-Verbose "Test-AEMExtensionAdvancedWindowsMD: Get after remove done"
}
finally
Expand All @@ -323,15 +323,15 @@ function Test-AEMExtensionAdvancedLinuxMD
$vm = Create-AdvancedVM -rgname $rgname -loc $loc -vmsize 'Standard_DS2' -stotype 'Premium_LRS' -nicCount 2 -useMD -linux
$vmname = $vm.Name
$vm = Get-AzureRmVM -ResourceGroupName $rgname -Name $vmname
Add-AzureRmVMDataDisk -VM $vm -StorageAccountType PremiumLRS -Lun (($vm.StorageProfile.DataDisks | select -ExpandProperty Lun | Measure-Object -Maximum).Maximum + 1) -CreateOption Empty -DiskSizeInGB 1023 | Update-AzureRmVM
Add-AzureRmVMDataDisk -VM $vm -StorageAccountType PremiumLRS -Lun (($vm.StorageProfile.DataDisks | select -ExpandProperty Lun | Measure-Object -Maximum).Maximum + 1) -CreateOption Empty -DiskSizeInGB 2059 | Update-AzureRmVM


Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: VM created"

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

# Test with not extension
Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: Test with no extension"
Expand Down Expand Up @@ -374,7 +374,7 @@ function Test-AEMExtensionAdvancedLinuxMD

Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: Get after remove"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
Write-Verbose "Test-AEMExtensionAdvancedLinuxMD: Get after remove done"
}
finally
Expand All @@ -397,7 +397,7 @@ function Test-AEMExtensionBasicLinuxWAD

# Get with not extension
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
# Test with not extension
$testResult = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
Assert-False { $testResult.Result }
Expand All @@ -421,7 +421,7 @@ function Test-AEMExtensionBasicLinuxWAD
# Remove command.
Remove-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
}
finally
{
Expand All @@ -443,7 +443,7 @@ function Test-AEMExtensionBasicLinux

# Get with not extension
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
# Test with not extension
$testResult = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
Assert-False { $testResult.Result }
Expand All @@ -467,7 +467,7 @@ function Test-AEMExtensionBasicLinux
# Remove command.
Remove-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
}
finally
{
Expand All @@ -492,13 +492,13 @@ function Test-AEMExtensionAdvancedLinuxWAD
# Get with not extension
Write-Verbose "Test-AEMExtensionAdvancedLinux: Get with no extension"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"

# Test with not extension
Write-Verbose "Test-AEMExtensionAdvancedLinux: Test with no extension"
$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
Write-Verbose ("Test-AEMExtensionAdvancedLinux: Test result " + $res.Result)
Assert-False { $res.Result }
Assert-False { $res.Result } (GetWrongTestResult $res $true)
Write-Verbose "Test-AEMExtensionAdvancedLinux: Test done"

$stoname = 'sto' + $rgname + "2";
Expand All @@ -523,7 +523,7 @@ function Test-AEMExtensionAdvancedLinuxWAD
# Test command.
Write-Verbose "Test-AEMExtensionAdvancedLinux: Test with extension"
$res = Test-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname -SkipStorageCheck
Assert-True { $res.Result }
Assert-True { $res.Result } (GetWrongTestResult $res $false)
Assert-True { ($res.PartialResults.Count -gt 0) }
Write-Verbose "Test-AEMExtensionAdvancedLinux: Test done"

Expand All @@ -534,7 +534,7 @@ function Test-AEMExtensionAdvancedLinuxWAD

Write-Verbose "Test-AEMExtensionAdvancedLinux: Get after remove"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
Write-Verbose "Test-AEMExtensionAdvancedLinux: Get after remove done"
}
finally
Expand All @@ -560,7 +560,7 @@ function Test-AEMExtensionAdvancedLinux
# Get with not extension
Write-Verbose "Test-AEMExtensionAdvancedLinux: Get with no extension"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"

# Test with not extension
Write-Verbose "Test-AEMExtensionAdvancedLinux: Test with no extension"
Expand Down Expand Up @@ -602,7 +602,7 @@ function Test-AEMExtensionAdvancedLinux

Write-Verbose "Test-AEMExtensionAdvancedLinux: Get after remove"
$extension = Get-AzureRmVMAEMExtension -ResourceGroupName $rgname -VMName $vmname
Assert-Null $extension
Assert-Null $extension "Extension is not null"
Write-Verbose "Test-AEMExtensionAdvancedLinux: Get after remove done"
}
finally
Expand Down Expand Up @@ -682,7 +682,7 @@ function Create-AdvancedVM($rgname, $vmname, $loc, $vmsize, $stotype, $nicCount,
$disk3Uri = @{"VhdUri"=$dataDiskVhdUri3}
}

$p = Set-AzureRmVMOSDisk -VM $p -Name $osDiskName @osURI -Caching $osDiskCaching -CreateOption FromImage;
$p = Set-AzureRmVMOSDisk -VM $p -Name $osDiskName @osURI -Caching $osDiskCaching -CreateOption FromImage -DiskSizeInGB 128;

$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 @disk1Uri -CreateOption Empty;
$p = Add-AzureRmVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 2 @disk2Uri -CreateOption Empty;
Expand Down Expand Up @@ -757,5 +757,23 @@ function Create-AdvancedVM($rgname, $vmname, $loc, $vmsize, $stotype, $nicCount,

function Get-LinuxImage
{
return Create-ComputeVMImageObject 'SUSE' 'SLES' '12-SP1' 'latest';
return Create-ComputeVMImageObject 'SUSE' 'SLES' '12-SP2' 'latest';
}

function GetWrongTestResult($TestResult, $searchFor, $level)
{
$result = ""

if (-not $level) {$level = 0}

if ($TestResult.Result -eq $searchFor)
{
$result += [String]::new("`t", $level) + $TestResult.TestName + " is not expected. Actual result is " + $TestResult.Result + [Environment]::NewLine
}
foreach ($tmpRes in $TestResult.PartialResults)
{
$result += GetWrongTestResult $tmpRes $searchFor ($level+1)
}

return $result
}
Loading