Merge pull request Azure#9331 from Azure/sergey/ppg-id

PPG with Id for VM/VMSS

Author: markcowl

src/Compute/Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.cs

@@ -155,5 +155,19 @@ public void TestSimpleNewVmImageNameMicrosoftSqlUbuntu()
         {
             TestRunner.RunTestScript("Test-SimpleNewVmImageNameMicrosoftSqlUbuntu");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSimpleNewVmPpg()
+        {
+            TestRunner.RunTestScript("Test-SimpleNewVmPpg");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSimpleNewVmPpgId()
+        {
+            TestRunner.RunTestScript("Test-SimpleNewVmPpgId");
+        }
     }
 }

src/Compute/Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.ps1

@@ -500,4 +500,75 @@ function Test-SimpleNewVmImageNameMicrosoftSqlUbuntu
         # Cleanup
         Clean-ResourceGroup $vmname
     }
+}
+
+<#
+.SYNOPSIS
+Test Simple Parameter Set for New Vm with PPG
+#>
+function Test-SimpleNewVmPpg
+{
+    # Setup
+    $rgname = Get-ResourceName
+
+    try
+    {
+        $username = "admin01"
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+        $ppgname = "MyPpg"
+        $vmname = "MyVm"
+        [string]$domainNameLabel = "$vmname-$vmname".tolower();
+
+        # Common
+        $rg = New-AzResourceGroup -Name $rgname -Location "eastus"
+        $ppg = New-AzProximityPlacementGroup `
+            -ResourceGroupName $rgname `
+            -Name $ppgname `
+            -Location "eastus"
+        $vm = New-AzVM -Name $vmname -ResourceGroup $rgname -Credential $cred -DomainNameLabel $domainNameLabel -ProximityPlacementGroup $ppgname
+
+        Assert-AreEqual $vm.ProximityPlacementGroup.Id $ppg.Id
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
+<#
+.SYNOPSIS
+Test Simple Parameter Set for New Vm with PPG Id
+#>
+function Test-SimpleNewVmPpgId
+{
+    # Setup
+    $rgname = Get-ResourceName
+    $vmname = Get-ResourceName
+
+    try
+    {
+        $username = "admin01"
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+        $ppgname = "MyPpg"
+        [string]$domainNameLabel = "$vmname-$vmname".tolower();
+
+        # Common
+        $rg = New-AzResourceGroup -Name $rgname -Location "eastus"
+        $ppg = New-AzProximityPlacementGroup `
+            -ResourceGroupName $rgname `
+            -Name $ppgname `
+            -Location "eastus"
+        $vm = New-AzVM -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -ProximityPlacementGroup $ppg.Id
+
+        Assert-AreEqual $vm.ProximityPlacementGroup.Id $ppg.Id
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+        Clean-ResourceGroup $vmname
+    }
 }

src/Compute/Compute.Test/ScenarioTests/StrategiesVmssTests.cs

@@ -102,5 +102,12 @@ public void TestSimpleNewVmssWithoutDomainName()
             TestRunner.RunTestScript("Test-SimpleNewVmssWithoutDomainName");
             create.SetValue(null, oldCreate);
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSimpleNewVmssPpg()
+        {
+            TestRunner.RunTestScript("Test-SimpleNewVmssPpg");
+        }
     }
 }

src/Compute/Compute.Test/ScenarioTests/StrategiesVmssTests.ps1

@@ -368,3 +368,39 @@ function Test-SimpleNewVmssWithoutDomainName
         Clean-ResourceGroup $vmssname
     }
 }
+
+<#
+.SYNOPSIS
+Test Simple Paremeter Set for New Vm
+#>
+function Test-SimpleNewVmssPpg
+{
+    # Setup
+    $rgname = Get-ResourceName
+
+    try
+    {
+        $vmssname = "MyVmss"
+        $ppgname = "MyPpg"
+        $lbName = $vmssname + "LoadBalancer"
+        $username = "admin01"
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+        [string]$domainNameLabel = "$vmssname$vmssname".tolower();
+
+        # Common
+        $rg = New-AzResourceGroup -Name $rgname -Location "eastus"
+        $ppg = New-AzProximityPlacementGroup `
+            -ResourceGroupName $rgname `
+            -Name $ppgname `
+            -Location "eastus"
+        $vmss = New-AzVmss -Name $vmssname -ResourceGroup $rgname -Credential $cred -DomainNameLabel $domainNameLabel -LoadBalancerName $lbName -ProximityPlacementGroup $ppgname
+
+        Assert-AreEqual $vmss.ProximityPlacementGroup.Id $ppg.Id
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}