New-AzVmss fix edgeZone issue (#23602)

* fix EdgeZone issue by creating LB in the edge zone as well

* add test

* changelog

---------

Co-authored-by: Theodore Chang <[email protected]>

Author: grizzlytheodore

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

@@ -33,9 +33,9 @@ public void TestVirtualMachineScaleSet()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestVirtualMachineScaleSetInEdgeZone()
+        public void TestVirtualMachineScaleSetEdgeZone()
         {
-            TestRunner.RunTestScript("Test-VirtualMachineScaleSetInEdgeZone");
+            TestRunner.RunTestScript("Test-VirtualMachineScaleSetEdgeZone");
         }
 
         [Fact]

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

@@ -375,42 +375,30 @@ function Test-VirtualMachineScaleSet-Common($IsManaged)
     }
 }
 
-function Test-VirtualMachineScaleSetInEdgeZone
+<#
+.SYNOPSIS
+Test Virtual Machine Scale Set created in Edge Zone
+#>
+function Test-VirtualMachineScaleSetEdgeZone
 {
-    $ResourceGroupName = Get-ComputeTestResourceName;
-    $Location = "westus";
-    $EdgeZone = "microsoftlosangeles1";
-    $ScaleSetName = "scalesetinedgezone";
-    $stnd = "Standard";
+    $rgname = Get-ComputeTestResourceName;
+    $loc = "EastUs2Euap";
+    $EdgeZone = "microsoftrrdclab3";
+    $vmssName = "scaleSetInEdgeZone";
+
     try
     {
-        $config = New-AzVmssConfig -Location $Location -EdgeZone $EdgeZone;
-        Assert-AreEqual $config.ExtendedLocation.Name $EdgeZone
-
-        New-AzResourceGroup -ResourceGroupName $ResourceGroupName -Location $Location;
-
-        $VMLocalAdminUser = "LocalAdminUser";
-        $VMLocalAdminSecurePassword = ConvertTo-SecureString $PLACEHOLDER -AsPlainText -Force;
+        New-AzResourceGroup -Name $rgname -Location $loc -Force;
 
-        $Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdminUser, $VMLocalAdminSecurePassword);
+        $adminUsername = Get-ComputeTestResourceName;
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force;
+        $vmCred = New-Object System.Management.Automation.PSCredential ($adminUsername, $password);
 
-        New-AzVmss `
-          -SecurityType $stnd `
-          -ResourceGroupName $ResourceGroupName `
-          -Location $Location `
-          -EdgeZone $EdgeZone `
-          -VMScaleSetName $ScaleSetName `
-          -VirtualNetworkName "myVnet" `
-          -SubnetName "mySubnet" `
-          -PublicIpAddressName "myPublicIPAddress" `
-          -LoadBalancerName "myLoadBalancer" `
-          -UpgradePolicyMode "Automatic" `
-          -Credential $Credential `
-          -DomainNameLabel "scalesetinedgezone-70f698"
-
-        $vmss = Get-AzVmss -ResourceGroupName $ResourceGroupName -VMScaleSetName $ScaleSetName
-
-        Assert-AreEqual $vmss.ExtendedLocation.Name $EdgeZone
+        # Create  Vmss
+        $result = New-AzVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -Location $loc -EdgeZone $EdgeZone -Credential $vmCred -DomainNameLabel ('pubip' + $rgname);
+        $vmssGet = Get-AzVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
+        
+        Assert-AreEqual $vmssGet.ExtendedLocation.Name $EdgeZone
     }
     finally
     {

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineScaleSetTests/TestVirtualMachineScaleSetEdgeZone.json

@@ -28,6 +28,7 @@
 * Fixed the `New-AzVM` bug to avoid accessing the `EncryptionAtHost` property for subscriptions who cannot access it since it is behind a feature flag.
 * Updated `Get-AzVmExtension` to return instanceView when used with `-Status`.
 * Reverted SSH Private Key File permission changes in `New-AzVm`.
+* Fixed `New-AzVmss` to correctly work when using `-EdgeZone` by creating the Load Balancer in the correct edge zone. 
 
 ## Version 7.0.0
 * Added update functionality in `Update-AzVmss` for parameters `SecurityType`, `EnableSecureBoot`, and `EnableVtpm` for the parameter set with the Put operation.

src/Compute/Compute/ChangeLog.md

@@ -332,7 +332,8 @@ private async Task<ResourceConfig<VirtualMachineScaleSet>> SimpleParameterSetNor
                     //sku.Basic is not compatible with multiple placement groups
                     sku: (noZones && _cmdlet.SinglePlacementGroup.IsPresent)
                         ? LoadBalancerStrategy.Sku.Basic
-                        : LoadBalancerStrategy.Sku.Standard);
+                        : LoadBalancerStrategy.Sku.Standard,
+                    edgeZone : _cmdlet.EdgeZone);
 
                 var frontendIpConfiguration = loadBalancer.CreateFrontendIPConfiguration(
                     name: _cmdlet.FrontendPoolName,
@@ -508,7 +509,8 @@ private async Task<ResourceConfig<VirtualMachineScaleSet>> SimpleParameterSetOrc
                     //sku.Basic is not compatible with multiple placement groups
                     sku: (noZones && _cmdlet.SinglePlacementGroup.IsPresent)
                         ? LoadBalancerStrategy.Sku.Basic
-                        : LoadBalancerStrategy.Sku.Standard);
+                        : LoadBalancerStrategy.Sku.Standard,
+                    edgeZone: _cmdlet.EdgeZone);
 
                 var frontendIpConfiguration = loadBalancer.CreateFrontendIPConfiguration(
                     name: _cmdlet.FrontendPoolName,

src/Compute/Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs

@@ -61,7 +61,8 @@ static bool EvaluatePreExistingConfig(LoadBalancer configToCompare)
         public static ResourceConfig<LoadBalancer> CreateLoadBalancerConfig(
             this ResourceConfig<ResourceGroup> resourceGroup,
             string name,
-            Sku sku)
+            Sku sku,
+            string edgeZone)
             => Strategy.CreateResourceConfig(
                 resourceGroup: resourceGroup,
                 name: name,
@@ -70,7 +71,10 @@ public static ResourceConfig<LoadBalancer> CreateLoadBalancerConfig(
                     Sku = new LoadBalancerSku
                     {
                         Name = sku.ToString()
-                    }
+                    },
+                    ExtendedLocation = edgeZone == null
+                        ? null
+                        : new ExtendedLocation { Name = edgeZone }
                 });
     }
 }