Add High Speed Interconnect Placement property to VMSS commands

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

@@ -185,7 +185,7 @@ public void TestVirtualMachineScaleSetNewEncryptionAtHost()
         {
             TestRunner.RunTestScript("Test-VirtualMachineScaleSetEncryptionAtHost");
         }
-        
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineScaleSetOrchestrationVM()
@@ -220,14 +220,14 @@ public void TestVirtualMachineScaleSetFlexibleOModeDefaulting()
         {
             TestRunner.RunTestScript("Test-VirtualMachineScaleSetFlexibleOModeDefaulting");
         }
-        
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAddAzVmssRunCommand()
         {
             TestRunner.RunTestScript("Test-AddAndRemoveAzVmssRunCommand");
         }
-        
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineScaleSetUserdata()
@@ -318,7 +318,7 @@ public void TestVirtualMachineScaleSetOSImageScheduledEvents()
         {
             TestRunner.RunTestScript("Test-VirtualMachineScaleSetOSImageScheduledEvents");
         }
-        
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineScaleSetGetById()
@@ -374,7 +374,7 @@ public void TestVirtualMachineScaleSetSecurityTypeUpdate()
         {
             TestRunner.RunTestScript("Test-VirtualMachineScaleSetSecurityTypeUpdate");
         }
-        
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineScaleSetDefaultToFlexibleOrchestrationMode()
@@ -409,7 +409,7 @@ public void TestVirtualMachineScaleSetSecurityTypeAndFlexDefaults()
         {
             TestRunner.RunTestScript("Test-VirtualMachineScaleSetSecurityTypeAndFlexDefaults");
         }
-        
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineScaleSetSecurityTypeNoVMProfile()
@@ -507,5 +507,12 @@ public void TestVirtualMachineScaleSetAutomaticZonePlacement()
         {
             TestRunner.RunTestScript("Test-VirtualMachineScaleSetAutomaticZonePlacement");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineScaleSetHighSpeedInterconnectPlacement()
+        {
+            TestRunner.RunTestScript("Test-VirtualMachineScaleSetHighSpeedInterconnectPlacement");
+        }
     }
 }

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

@@ -6270,4 +6270,79 @@ function Test-VirtualMachineScaleSetAutomaticZonePlacement
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+<#
+.SYNOPSIS
+Test creating a VMSS with HighSpeedInterconnectPlacement set
+#>
+function Test-VirtualMachineScaleSetHighSpeedInterconnectPlacement  
+{
+    # Setup
+    $rgname = Get-ComputeTestResourceName;
+    $loc = "westus2";
+
+    try
+    {
+        # Common
+        New-AzResourceGroup -Name $rgname -Location $loc -Force;
+
+        $vmssName = 'vmss' + $rgname;
+        $domainNameLabel1 = "d1" + $rgname;
+        $subnetName = 'subnet' + $rgname;
+        $vnetName = 'vnet' + $rgname;
+
+        $adminUsername = Get-ComputeTestResourceName;
+        $password = Get-PasswordForVM;
+        $adminPassword = $password | ConvertTo-SecureString -AsPlainText -Force;
+        $cred = New-Object System.Management.Automation.PSCredential ($adminUsername, $adminPassword);
+        $linuxImage = "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest"
+
+        # Case 1: Create using simple parameter set
+        $vmss = New-AzVmss -ResourceGroupName $rgname -Location $loc -Credential `
+        $cred -VMScaleSetName $vmssName -DomainNameLabel $domainNameLabel1 `
+        -Image $linuxImage `
+        -HighSpeedInterconnectPlacement "None";
+
+        # verify
+        Assert-AreEqual $vmss.HighSpeedInterconnectPlacement "None";
+
+
+        # Create VNet and Subnet
+        $vnetAddressPrefix = "10.0.0.0/16";
+        $subnetAddressPrefix = "10.0.0.0/24";
+        $subnetConfig = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix $subnetAddressPrefix;
+        $vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $loc -AddressPrefix $vnetAddressPrefix -Subnet $subnetConfig;
+
+        # Get subnet object
+        $subnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname | Get-AzVirtualNetworkSubnetConfig -Name $subnetName
+
+        # VMSS Config
+        $vmssConfig = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName "Standard_D4s_v3" -HighSpeedInterconnectPlacement "None";
+
+        # Configure IP and NIC
+        $ipCfg = New-AzVmssIpConfig -Name "ipconfig1" -SubnetId $subnet.Id
+        $vmssConfig = Add-AzVmssNetworkInterfaceConfiguration -VirtualMachineScaleSet $vmssConfig `
+            -Name "nicConfig" -Primary $true -IPConfiguration $ipCfg;
+
+        # Configure OS profile
+        $vmssConfig = Set-AzVmssOSProfile -VirtualMachineScaleSet $vmssConfig `
+           -ComputerNamePrefix "test" `
+            -AdminUsername $adminUsername `
+            -AdminPassword $password
+
+        # Assert the HighSpeedInterconnectPlacement from the vmssConfig
+        Assert-AreEqual $vmssConfig.HighSpeedInterconnectPlacement "None";
+
+        # Create the vmss using the config
+        $vmssResult = New-AzVmss -ResourceGroupName $rgname -VMScaleSetName "newtestVmss" -VirtualMachineScaleSet $vmssConfig;
+
+        # Assert the HighSpeedInterconnectPlacement from the vmssResult
+        Assert-AreEqual $vmssResult.HighSpeedInterconnectPlacement "None";
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname;
+    }
 }

src/Compute/Compute/ChangeLog.md

@@ -20,6 +20,7 @@
 
 -->
 ## Upcoming Release
+* Added `-HighSpeedInterconnectPlacement` parameter to `New-AzVmssConfig`, `New-AzVmss`, and `Update-AzVmss` cmdlets.
 * Added new parameters `ZonePlacementPolicy`, `IncludeZone`, `ExcludeZone`, `MaxZoneCount`, `EnableMaxInstancePercentPerZone` and `MaxInstancePercentPerZoneValue` to `New-AzVmssConfig` cmdlet.
 * Added new parameters `ZonePlacementPolicy`, `IncludeZone` and `ExcludeZone` to `New-AzVmss` cmdlet.
 * Added new parameters `MaxZoneCount`, `EnableMaxInstancePercentPerZone` and `MaxInstancePercentPerZoneValue` to `Update-AzVmss` cmdlet.

src/Compute/Compute/Generated/Models/PSVirtualMachineScaleSet.cs

@@ -75,9 +75,8 @@ public string ResourceGroupName
         //     api-version: 2022-03-01.
         public DateTime? TimeCreated { get; private set; }
         public string Etag { get; private set; }
-
         public ResiliencyPolicy ResiliencyPolicy { get; set; }
-
         public Placement Placement { get; set; }
+        public string HighSpeedInterconnectPlacement { get; set; }
     }
 }

src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs

@@ -443,6 +443,13 @@ public partial class NewAzureRmVmssConfigCommand : Microsoft.Azure.Commands.Reso
         [ValidateNotNullOrEmpty]
         public string[] ExcludeZone { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Specifies the high speed interconnect placement for the virtual machine scale set.")]
+        [PSArgumentCompleter("None", "Trunk")]
+        public string HighSpeedInterconnectPlacement { get; set; }
+
         protected override void ProcessRecord()
         {
             if (ShouldProcess("VirtualMachineScaleSet", "New"))
@@ -1248,7 +1255,8 @@ private void Run()
                 PriorityMixPolicy = vPriorityMixPolicy,
                 SkuProfile = vSkuProfile,
                 ResiliencyPolicy = vResiliencyPolicy,
-                Placement = vPlacement
+                Placement = vPlacement,
+                HighSpeedInterconnectPlacement = this.IsParameterBound(c => c.HighSpeedInterconnectPlacement) ? this.HighSpeedInterconnectPlacement : null
             };
 
             WriteObject(vVirtualMachineScaleSet);

src/Compute/Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs

@@ -321,6 +321,13 @@ public partial class NewAzureRmVmss : ComputeAutomationBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string[] ExcludeZone { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Specifies the high speed interconnect placement for the virtual machine scale set.")]
+        [PSArgumentCompleter("None", "Trunk")]
+        public string HighSpeedInterconnectPlacement { get; set; }
+
         private void ConfigureSecuritySettings()
         {
             if (SecurityType?.ToLower() == SecurityTypes.TrustedLaunch ||
@@ -585,7 +592,8 @@ private async Task<ResourceConfig<VirtualMachineScaleSet>> SimpleParameterSetNor
                     addProxyAgentExtension: _cmdlet.AddProxyAgentExtension.IsPresent ? true : (bool?)null,
                     zonePlacementPolicy: _cmdlet.ZonePlacementPolicy,
                     includeZone: _cmdlet.IncludeZone,
-                    excludeZone: _cmdlet.ExcludeZone
+                    excludeZone: _cmdlet.ExcludeZone,
+                    highSpeedInterconnectPlacement: _cmdlet.IsParameterBound(c => c.HighSpeedInterconnectPlacement) ? _cmdlet.HighSpeedInterconnectPlacement : null
                     );
             }
 
@@ -729,7 +737,8 @@ private async Task<ResourceConfig<VirtualMachineScaleSet>> SimpleParameterSetOrc
                     addProxyAgentExtension: _cmdlet.AddProxyAgentExtension.IsPresent ? true : (bool?)null,
                     zonePlacementPolicy: _cmdlet.ZonePlacementPolicy,
                     includeZone: _cmdlet.IncludeZone,
-                    excludeZone: _cmdlet.ExcludeZone
+                    excludeZone: _cmdlet.ExcludeZone,
+                    highSpeedInterconnectPlacement: _cmdlet.IsParameterBound(c => c.HighSpeedInterconnectPlacement) ? _cmdlet.HighSpeedInterconnectPlacement : null
                 );
             }
         }

src/Compute/Compute/Strategies/ComputeRp/VirtualMachineScaleSetStrategy.cs

@@ -87,7 +87,8 @@ internal static ResourceConfig<VirtualMachineScaleSet> CreateVirtualMachineScale
             bool? addProxyAgentExtension = null,
             string zonePlacementPolicy = null,
             string[] includeZone = null,
-            string[] excludeZone = null
+            string[] excludeZone = null,
+            string highSpeedInterconnectPlacement = null
             )
             => Strategy.CreateResourceConfig(
                 resourceGroup: resourceGroup,
@@ -210,7 +211,8 @@ internal static ResourceConfig<VirtualMachineScaleSet> CreateVirtualMachineScale
                             ZonePlacementPolicy = zonePlacementPolicy,
                             IncludeZones = includeZone,
                             ExcludeZones = excludeZone
-                        } : null
+                        } : null,
+                        HighSpeedInterconnectPlacement = highSpeedInterconnectPlacement
                     };
                     if (auxAuthHeader != null)
                     {
@@ -266,7 +268,8 @@ internal static ResourceConfig<VirtualMachineScaleSet> CreateVirtualMachineScale
             bool? addProxyAgentExtension = null,
             string zonePlacementPolicy = null,
             string[] includeZone = null,
-            string[] excludeZone = null
+            string[] excludeZone = null,
+            string highSpeedInterconnectPlacement = null
             )
             => Strategy.CreateResourceConfig(
                 resourceGroup: resourceGroup,
@@ -371,7 +374,8 @@ internal static ResourceConfig<VirtualMachineScaleSet> CreateVirtualMachineScale
                             ZonePlacementPolicy = zonePlacementPolicy,
                             IncludeZones = includeZone,
                             ExcludeZones = excludeZone
-                        } : null
+                        } : null,
+                        HighSpeedInterconnectPlacement = highSpeedInterconnectPlacement
                     };
                     if (auxAuthHeader != null)
                     {

src/Compute/Compute/help/New-AzVmss.md

@@ -17,8 +17,8 @@ Creates a virtual machine scale set.
 ```
 New-AzVmss [-ResourceGroupName] <String> [-VMScaleSetName] <String>
  [-VirtualMachineScaleSet] <PSVirtualMachineScaleSet> [-AsJob] [-IfMatch <String>] [-IfNoneMatch <String>]
- [-EdgeZone <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+ [-EdgeZone <String>] [-HighSpeedInterconnectPlacement <String>] [-DefaultProfile <IAzureContextContainer>]
+ [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### SimpleParameterSet
@@ -41,8 +41,8 @@ New-AzVmss [[-ResourceGroupName] <String>] [-VMScaleSetName] <String> [-AsJob] [
  [-SecurityPostureExcludeExtension <String[]>] [-SkuProfileVmSize <String[]>]
  [-SkuProfileAllocationStrategy <String>] [-EnableProxyAgent] [-AddProxyAgentExtension]
  [-ZonePlacementPolicy <String>] [-IncludeZone <String[]>] [-ExcludeZone <String[]>]
- [-DefaultProfile <IAzureContextContainer>] [-SinglePlacementGroup] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+ [-HighSpeedInterconnectPlacement <String>] [-DefaultProfile <IAzureContextContainer>]
+ [-SinglePlacementGroup] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -619,6 +619,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -HighSpeedInterconnectPlacement
+Specifies the high speed interconnect placement for the virtual machine scale set.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+Accepted values: None, Trunk
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -HostGroupId
 Specifies the dedicated host group the virtual machine scale set will reside in.
 

src/Compute/Compute/help/New-AzVmssConfig.md

@@ -37,8 +37,8 @@ New-AzVmssConfig [[-Overprovision] <Boolean>] [[-Location] <String>] [-EdgeZone
  [-EnableResilientVMDelete] [-EnableAutomaticZoneRebalance] [-AutomaticZoneRebalanceStrategy <String>]
  [-AutomaticZoneRebalanceBehavior <String>] [-ZonePlacementPolicy <String>] [-MaxZoneCount <Int32>]
  [-EnableMaxInstancePercentPerZone] [-MaxInstancePercentPerZoneValue <Int32>] [-IncludeZone <String[]>]
- [-ExcludeZone <String[]>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] 
- [<CommonParameters>]
+ [-ExcludeZone <String[]>] [-HighSpeedInterconnectPlacement <String>] [-DefaultProfile <IAzureContextContainer>] 
+ [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ExplicitIdentityParameterSet
@@ -66,8 +66,8 @@ New-AzVmssConfig [[-Overprovision] <Boolean>] [[-Location] <String>] [-EdgeZone
  [-EnableResilientVMDelete] [-EnableAutomaticZoneRebalance] [-AutomaticZoneRebalanceStrategy <String>]
  [-AutomaticZoneRebalanceBehavior <String>] [-ZonePlacementPolicy <String>] [-MaxZoneCount <Int32>]
  [-EnableMaxInstancePercentPerZone] [-MaxInstancePercentPerZoneValue <Int32>] [-IncludeZone <String[]>]
- [-ExcludeZone <String[]>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] 
- [<CommonParameters>]
+ [-ExcludeZone <String[]>] [-HighSpeedInterconnectPlacement <String>] [-DefaultProfile <IAzureContextContainer>] 
+ [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -621,6 +621,22 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -HighSpeedInterconnectPlacement
+Specifies the high speed interconnect placement for the virtual machine scale set.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+Accepted values: None, Trunk
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -IdentityId
 Specifies the list of user identities associated with the virtual machine scale set.
 The user identity references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'

src/Compute/Compute/help/Update-AzVmss.md

@@ -40,7 +40,7 @@ Update-AzVmss [-ResourceGroupName] <String> [-VMScaleSetName] <String>
  [-EnableResilientVMDelete <Boolean>] [-EnableAutomaticZoneRebalance <Boolean>]
  [-AutomaticZoneRebalanceStrategy <String>] [-AutomaticZoneRebalanceBehavior <String>]
  [-MaxZoneCount <Int32>] [-EnableMaxInstancePercentPerZone <Boolean>]
- [-MaxInstancePercentPerZoneValue <Int32>]
+ [-MaxInstancePercentPerZoneValue <Int32>] [-HighSpeedInterconnectPlacement <String>]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -72,7 +72,7 @@ Update-AzVmss [-ResourceGroupName] <String> [-VMScaleSetName] <String>
  [-EnableResilientVMDelete <Boolean>] [-EnableAutomaticZoneRebalance <Boolean>]
  [-AutomaticZoneRebalanceStrategy <String>] [-AutomaticZoneRebalanceBehavior <String>]
  [-MaxZoneCount <Int32>] [-EnableMaxInstancePercentPerZone <Boolean>]
- [-MaxInstancePercentPerZoneValue <Int32>]
+ [-MaxInstancePercentPerZoneValue <Int32>] [-HighSpeedInterconnectPlacement <String>]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -450,6 +450,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -HighSpeedInterconnectPlacement
+Specifies the high speed interconnect placement for the virtual machine scale set.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+Accepted values: None, Trunk
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -IdentityId
 Specifies the list of user identities associated with the virtual machine scale set.
 The user identity references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'