Merge pull request #9 from soshekar/release-3.5.0

Powershell tests for VMSS with managed disks

Author: hyonholee

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.cs

@@ -31,6 +31,12 @@ public void TestVirtualMachineScaleSet()
             ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineScaleSet");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineScaleSet_ManagedDisks()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineScaleSet-ManagedDisks");
+        }
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineScaleSetReimageUpdate()

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

@@ -53,6 +53,18 @@ Update-AzureRmVmssInstance                         1.2.4      AzureRM.Compute
 Test Virtual Machine Scale Set
 #>
 function Test-VirtualMachineScaleSet
+{
+    Test-VirtualMachineScaleSet-Common $false
+}
+<#
+.SYNOPSIS
+Test Virtual Machine Scale Set with Managed disks
+#>
+function Test-VirtualMachineScaleSet-ManagedDisks
+{
+    Test-VirtualMachineScaleSet-Common $true
+}
+function Test-VirtualMachineScaleSet-Common($IsManaged)
 {
     # Setup
     $rgname = Get-ComputeTestResourceName
@@ -91,16 +103,25 @@ function Test-VirtualMachineScaleSet
         $extver = '2.1';
 
         $ipCfg = New-AzureRmVmssIPConfig -Name 'test' -SubnetId $subnetId;
-        $vmss = New-AzureRmVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'automatic' -NetworkInterfaceConfiguration $netCfg `
+        $vmss = New-AzureRmVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'automatic' -NetworkInterfaceConfiguration $netCfg -Overprovision $false `
             | Add-AzureRmVmssNetworkInterfaceConfiguration -Name 'test' -Primary $true -IPConfiguration $ipCfg `
             | Set-AzureRmVmssOSProfile -ComputerNamePrefix 'test' -AdminUsername $adminUsername -AdminPassword $adminPassword `
-            | Set-AzureRmVmssStorageProfile -Name 'test' -OsDiskCreateOption 'FromImage' -OsDiskCaching 'None' `
-            -ImageReferenceOffer $imgRef.Offer -ImageReferenceSku $imgRef.Skus -ImageReferenceVersion $imgRef.Version `
-            -ImageReferencePublisher $imgRef.PublisherName -VhdContainer $vhdContainer `
             | Add-AzureRmVmssExtension -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -AutoUpgradeMinorVersion $true `
             | Remove-AzureRmVmssExtension -Name $extname `
             | Add-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2' -IPConfiguration $ipCfg `
             | Remove-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2'
+        if ($IsManaged -eq $true)
+        {
+            $vmss = $vmss | Set-AzureRmVmssStorageProfile -OsDiskCreateOption 'FromImage' -OsDiskCaching 'None' `
+                    -ImageReferenceOffer $imgRef.Offer -ImageReferenceSku $imgRef.Skus -ImageReferenceVersion $imgRef.Version `
+                    -ImageReferencePublisher $imgRef.PublisherName
+        }
+        else
+        {
+            $vmss = $vmss| Set-AzureRmVmssStorageProfile -Name 'test' -OsDiskCreateOption 'FromImage' -OsDiskCaching 'None' `
+                    -ImageReferenceOffer $imgRef.Offer -ImageReferenceSku $imgRef.Skus -ImageReferenceVersion $imgRef.Version `
+                    -ImageReferencePublisher $imgRef.PublisherName -VhdContainer $vhdContainer `
+        }
 
         # Validate Remove Network profile
         Assert-AreEqual 'test' $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].Name;
@@ -127,10 +148,14 @@ function Test-VirtualMachineScaleSet
         Assert-Null $vmss.VirtualMachineProfile.OsProfile.AdminPassword;
 
         # Validate Storage Profile
-        Assert-AreEqual 'test' $vmss.VirtualMachineProfile.StorageProfile.OsDisk.Name;
+
         Assert-AreEqual 'FromImage' $vmss.VirtualMachineProfile.StorageProfile.OsDisk.CreateOption;
         Assert-AreEqual 'None' $vmss.VirtualMachineProfile.StorageProfile.OsDisk.Caching;
-        Assert-AreEqual $vhdContainer $vmss.VirtualMachineProfile.StorageProfile.OsDisk.VhdContainers[0];
+        if($IsManaged -eq $false)
+        {
+            Assert-AreEqual 'test' $vmss.VirtualMachineProfile.StorageProfile.OsDisk.Name;
+            Assert-AreEqual $vhdContainer $vmss.VirtualMachineProfile.StorageProfile.OsDisk.VhdContainers[0];
+        }
         Assert-AreEqual $imgRef.Offer $vmss.VirtualMachineProfile.StorageProfile.ImageReference.Offer;
         Assert-AreEqual $imgRef.Skus $vmss.VirtualMachineProfile.StorageProfile.ImageReference.Sku;
         Assert-AreEqual $imgRef.Version $vmss.VirtualMachineProfile.StorageProfile.ImageReference.Version;
@@ -201,6 +226,10 @@ function Test-VirtualMachineScaleSet
         $st = $vmssResult | Start-AzureRmVmss;
         $st = $vmssResult | Restart-AzureRmVmss;
 
+        if ($IsManaged -eq $true)
+        {
+            $st = $vmssResult | Set-AzureRmVmss -ReimageAll;
+        }
         $instanceListParam = @();
         for ($i = 0; $i -lt 2; $i++)
         {
@@ -211,6 +240,13 @@ function Test-VirtualMachineScaleSet
         $st = $vmssResult | Stop-AzureRmVmss -InstanceId $instanceListParam -Force;
         $st = $vmssResult | Start-AzureRmVmss -InstanceId $instanceListParam;
         $st = $vmssResult | Restart-AzureRmVmss -InstanceId $instanceListParam;
+        if ($IsManaged -eq $true)
+        {
+            for ($j = 0; $j -lt 2; $j++)
+            {
+                $st = Set-AzureRmVmssVM -ReimageAll -ResourceGroupName $rgname  -VMScaleSetName $vmssName -InstanceId $j
+            }
+        }
 
         # Remove
         $st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1 -Force;