dedicated host changes for vmss

wastoresh · Aug 10, 2020 · fc103bd · fc103bd
1 parent 387ccca
commit fc103bd
Show file tree

Hide file tree

Showing 5 changed files with 962 additions and 4,856 deletions.
diff --git a/src/Compute/Compute.Test/ScenarioTests/DedicatedHostTests.ps1 b/src/Compute/Compute.Test/ScenarioTests/DedicatedHostTests.ps1
@@ -134,10 +134,10 @@ function Test-DedicatedHostVirtualMachine
 
         # Create a VM first
         $hostGroupName = $rgname + 'hostgroup'
-        New-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -Location $loc -PlatformFaultDomain 2 -Zone "2" -SupportAutomaticPlacement $false -Tag @{key1 = "val1"};
+        New-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -Location $loc -PlatformFaultDomain 2 -SupportAutomaticPlacement $true -Tag @{key1 = "val1"};
         $hostGroup = Get-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName;
 
-        Assert-AreEqual $false $hostGroup.SupportAutomaticPlacement;
+        #Assert-AreEqual $false $hostGroup.SupportAutomaticPlacement;
 
         $hostName = $rgname + 'host'
         New-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName -Location $loc -Sku "ESv3-Type1" -PlatformFaultDomain 1 -Tag @{key1 = "val2"};
@@ -155,89 +155,10 @@ function Test-DedicatedHostVirtualMachine
         $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
         [string]$domainNameLabel = "$vmname0-$vmname0".tolower();
 
-        New-AzVM -ResourceGroupName $rgname -Name $vmname0 -Credential $cred -Zone "2" -Size $vmsize -HostId $dedicatedHostId -DomainNameLabel $domainNameLabel;
-        $vm0 = Get-AzVM -ResourceGroupName $rgname -Name $vmname0;
-        Assert-AreEqual $dedicatedHostId $vm0.Host.Id;
+        New-AzVM -ResourceGroupName $rgname -Name $vmname0 -Credential $cred -Size $vmsize -HostGroupId $hostGroup.Id -DomainNameLabel $domainNameLabel;
+        $vm0 = Get-AzVM -ResourceGroupName $rgname -Name $vmname0 -Status;
+        Assert-AreEqual $dedicatedHostId $vm0.assignedHost;
 
-        $vmname1 = 'vm' + $rgname;
-
-        # NRP
-        $subnet = New-AzVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
-        $vnet = New-AzVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
-        $subnetId = $vnet.Subnets[0].Id;
-        $pubip = New-AzPublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -Zone "2" -Sku "Standard" -AllocationMethod "Static" -DomainNameLabel ('pubip' + $rgname);
-        $pubipId = $pubip.Id;
-        $nic = New-AzNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
-        $nicId = $nic.Id;
-
-        # OS & Image
-        $user = "Foo12";
-        $password = $PLACEHOLDER;
-        $securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
-        $cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
-        $computerName = 'test';
-
-        $p = New-AzVMConfig -VMName $vmname1 -VMSize $vmsize -Zone "2" -HostId $dedicatedHostId `
-             | Add-AzVMNetworkInterface -Id $nicId -Primary `
-             | Set-AzVMOperatingSystem -Windows -ComputerName $computerName -Credential $cred;
-
-        $imgRef = Get-DefaultCRPImage -loc $loc;
-        $imgRef | Set-AzVMSourceImage -VM $p | New-AzVM -ResourceGroupName $rgname -Location $loc;
-
-        # Get VM
-        $vm1 = Get-AzVM -ResourceGroupName $rgname -Name $vmname1;
-        Assert-AreEqual $dedicatedHostId $vm1.Host.Id;
-
-        $dedicatedHost = Get-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName;
-        Assert-AreEqual 2 $dedicatedHost.VirtualMachines.Count;
-        Assert-AreEqual $vm0.Id $dedicatedHost.VirtualMachines[0].Id;
-        Assert-AreEqual $vm1.Id $dedicatedHost.VirtualMachines[1].Id;
-
-        $dedicatedHostGroup = Get-AzHostGroup -ResourceGroupName $rgname -HostGroupName $hostGroupNam;
-        Assert-AreEqual 1 $dedicatedHostGroup.Hosts.Count;
-        Assert-AreEqual $dedicatedHostId $dedicatedHostGroup.Hosts[0].Id;
-
-        # Remove Host from VM
-        Stop-AzVM -ResourceGroupName $rgname -Name $vmName1 -Force;
-        $vm1 = Get-AzVM -ResourceGroupName $rgname -Name $vmName1;
-        Update-AzVM -ResourceGroupName $rgname -VM $vm1 -HostId $null;
-
-        $vm1 = Get-AzVM -ResourceGroupName $rgname -Name $vmname1;
-        Assert-Null $vm1.Host;
-        $dedicatedHost = Get-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName;
-        Assert-AreEqual 1 $dedicatedHost.VirtualMachines.Count;
-        Assert-AreEqual $vm0.Id $dedicatedHost.VirtualMachines[0].Id;
-        $dedicatedHostGroup = Get-AzHostGroup -ResourceGroupName $rgname -HostGroupName $hostGroupNam;
-        Assert-AreEqual 1 $dedicatedHostGroup.Hosts.Count;
-        Assert-AreEqual $dedicatedHostId $dedicatedHostGroup.Hosts[0].Id;
-
-        # Add Host back to the VM
-        Update-AzVM -ResourceGroupName $rgname -VM $vm1 -HostId $dedicatedHostId;
-
-        $vm1 = Get-AzVM -ResourceGroupName $rgname -Name $vmname1;
-        Assert-AreEqual $dedicatedHostId $vm1.Host.Id;
-        $dedicatedHost = Get-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName;
-        Assert-AreEqual 2 $dedicatedHost.VirtualMachines.Count;
-        Assert-AreEqual $vm0.Id $dedicatedHost.VirtualMachines[0].Id;
-        Assert-AreEqual $vm1.Id $dedicatedHost.VirtualMachines[1].Id;
-        $dedicatedHostGroup = Get-AzHostGroup -ResourceGroupName $rgname -HostGroupName $hostGroupNam;
-        Assert-AreEqual 1 $dedicatedHostGroup.Hosts.Count;
-        Assert-AreEqual $dedicatedHostId $dedicatedHostGroup.Hosts[0].Id;
-
-        # Remove the VMs
-        Remove-AzVM -ResourceGroupName $rgname -Name $vmname1 -Force;
-
-        $dedicatedHost = Get-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName;
-        Assert-AreEqual 1 $dedicatedHost.VirtualMachines.Count;
-        Assert-AreEqual $vm0.Id $dedicatedHost.VirtualMachines[0].Id;
-
-        $dedicatedHostGroup = Get-AzHostGroup -ResourceGroupName $rgname -HostGroupName $hostGroupNam;
-        Assert-AreEqual 1 $dedicatedHostGroup.Hosts.Count;
-        Assert-AreEqual $dedicatedHostId $dedicatedHostGroup.Hosts[0].Id;
-
-        Remove-AzVM -ResourceGroupName $rgname -Name $vmname0 -Force;
-        Remove-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName;
-        Remove-AzHostGroup -ResourceGroupName $rgname -HostGroupName $hostGroupName;
     }
     finally
     {

diff --git a/src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.cs b/src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.cs
@@ -178,5 +178,12 @@ public void TestVirtualMachineScaleSetNewEncryptionAtHost()
         {
             TestRunner.RunTestScript("Test-VirtualMachineScaleSetEncryptionAtHost");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineScaleSetAssignedHost()
+        {
+            TestRunner.RunTestScript("Test-VirtualMachineScaleSetAssignedHost");
+        }
     }
 }
diff --git a/src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1 b/src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1
@@ -2536,3 +2536,68 @@ function Test-VirtualMachineScaleSetEncryptionAtHost
         Clean-ResourceGroup $rgname
     }
 }
+
+<#
+.SYNOPSIS
+    testing encryptionAtHost cmdlet for
+    new-azvmss - create vmss using simple parameter set and hostencryption tag.
+    update-azvmss test boolean parameter 
+    new-azvmssconfig
+#>
+function Test-VirtualMachineScaleSetAssignedHost
+{
+    # Setup
+    $rgname = Get-ComputeTestResourceName
+
+    try
+    {
+        # Common
+        [string]$loc = Get-Location "Microsoft.Resources" "resourceGroups" "East US 2 EUAP";
+        New-AzResourceGroup -Name $rgname -Location $loc -Force;
+
+        #host group
+        $hostGroupName = $rgname + 'hostgroup'
+        New-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -Location $loc -PlatformFaultDomain 1 -Tag @{key1 = "val1"};
+        $hostGroup = Get-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName;
+
+        #host
+        $hostName = $rgname + 'host'
+        New-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName -Location $loc -Sku "ESv3-Type3" -PlatformFaultDomain 0 -Tag @{key1 = "val2"};
+        $dedicatedHost = Get-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName;
+
+        # SRP
+        $stoname = 'sto' + $rgname;
+        $stotype = 'Standard_GRS';
+        New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
+        $stoaccount = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname;
+
+        # NRP
+        $subnet = New-AzVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
+        $vnet = New-AzVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
+        $vnet = Get-AzVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
+        $subnetId = $vnet.Subnets[0].Id;
+
+        # New VMSS Parameters
+        $vmssName = 'vmsswithconfig';
+        $adminUsername = 'Foo12';
+        $adminPassword = $PLACEHOLDER;
+
+        $securePassword = ConvertTo-SecureString $adminPassword -AsPlainText -Force;
+        $cred = New-Object System.Management.Automation.PSCredential ($adminUsername, $securePassword);
+
+
+        $imgRef = Get-DefaultCRPImage -loc $loc;
+        $ipCfg = New-AzVmssIPConfig -Name 'test' -SubnetId $subnetId;
+
+        #creating vmss using New-azvmss simple parameter set
+        $vmssResult2 = New-AzVmss -ResourceGroupName $rgname -VMScaleSetName "newvmss" -Credential $cred -VmSize "Standard_E2s_v3"  -HostGroupId $hostGroup.Id -DomainNameLabel "domainlabel"
+        $vmssResult = Get-AzVmss -InstanceView -ResourceGroupName $rgname -VMScaleSetName "newvmss";
+        $vmssResult2 = Get-AzVmss -ResourceGroupName $rgname -VMScaleSetName "newvmss";
+        Assert-AreEqual $dedicatedHost.Id $vmssResult2.assignedHost;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}