Skip to content

Commit 14dc07e

Browse files
authored
VMSS Instance Mix Flex Update Bug Fix (#26290)
* overwrite update * redact secrets
1 parent 6a3f868 commit 14dc07e

File tree

3 files changed

+2427
-2749
lines changed

3 files changed

+2427
-2749
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5322,7 +5322,7 @@ function Test-VirtualMachineScaleSetSkuProfile
53225322
{
53235323
# Setup
53245324
$rgname = Get-ComputeTestResourceName
5325-
$loc = Get-ComputeVMLocation;
5325+
$loc = "eastus2";
53265326

53275327
# Basic case
53285328
try
@@ -5434,7 +5434,7 @@ function Test-VirtualMachineScaleSetSkuProfile
54345434
$imgRef = Get-DefaultCRPImage -loc $loc -New $True;
54355435
$ipCfg = New-AzVmssIPConfig -Name 'test' -SubnetId $subnetId -PublicIPAddressConfigurationName $ipName -PublicIPAddressConfigurationIdleTimeoutInMinutes 10 -DnsSetting "testvmssdnscom" -PublicIPAddressVersion "IPv4";
54365436

5437-
$vmss = New-AzVmssConfig -Location $loc -SkuCapacity 2 -UpgradePolicyMode 'Manual' -EncryptionAtHost -SecurityType $stnd -SkuProfileVmSize @("Standard_D4s_v3", "Standard_D4s_v4") -SkuProfileAllocationStrategy "CapacityOptimized"`
5437+
$vmss = New-AzVmssConfig -Location $loc -SkuCapacity 2 -UpgradePolicyMode 'Manual' -EncryptionAtHost -SecurityType $stnd -SkuProfileVmSize @("Standard_D4s_v3") `
54385438
| Add-AzVmssNetworkInterfaceConfiguration -Name 'test' -Primary $true -IPConfiguration $ipCfg `
54395439
| Set-AzVmssOSProfile -ComputerNamePrefix 'test' -AdminUsername $adminUsername -AdminPassword $adminPassword `
54405440
| Set-AzVmssStorageProfile -OsDiskCreateOption 'FromImage' -OsDiskCaching 'None' `
@@ -5445,12 +5445,11 @@ function Test-VirtualMachineScaleSetSkuProfile
54455445
$vmssResult = New-AzVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmss
54465446

54475447
Assert-AreEqual $vmssResult.Sku.Name "Mix";
5448-
Assert-AreEqual $vmssResult.SkuProfile.AllocationStrategy "CapacityOptimized";
5448+
Assert-AreEqual $vmssResult.SkuProfile.AllocationStrategy "LowestPrice";
54495449
Assert-AreEqual $vmssResult.SkuProfile.VMSizes[0].Name "Standard_D4s_v3";
5450-
Assert-AreEqual $vmssResult.SkuProfile.VMSizes[1].Name "Standard_D4s_v4";
54515450

54525451
# update vmss
5453-
$vmssUpdate = Update-AzVmss -ResourceGroupName $rgname -Name $vmssName -SkuCapacity 3 -SkuProfileVmSize @($vmSize1, $vmSize2) -SkuProfileAllocationStrategy "CapacityOptimized";
5452+
$vmssUpdate = $vmssResult | Update-AzVmss -SkuProfileVmSize @("Standard_D4s_v3", "Standard_D4s_v4") -SkuProfileAllocationStrategy "CapacityOptimized";
54545453

54555454
$vmssGet = Get-AzVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
54565455

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

Lines changed: 2422 additions & 2743 deletions
Large diffs are not rendered by default.

src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2163,8 +2163,8 @@ private void BuildPutObject()
21632163
if (this.VirtualMachineScaleSet.SkuProfile == null)
21642164
{
21652165
this.VirtualMachineScaleSet.SkuProfile = new SkuProfile();
2166-
this.VirtualMachineScaleSet.SkuProfile.VmSizes = new List<SkuProfileVMSize>();
21672166
}
2167+
this.VirtualMachineScaleSet.SkuProfile.VmSizes = new List<SkuProfileVMSize>();
21682168
foreach (string vmSize in this.SkuProfileVmSize)
21692169
{
21702170
this.VirtualMachineScaleSet.SkuProfile.VmSizes.Add(new SkuProfileVMSize()

0 commit comments

Comments
 (0)