Skip to content

Commit d56471f

Browse files
SandidomsJinLei
andauthored
VM OrchestrationMode: PlatformFaultDomainCount in New-AzVmss and VmssId in New-AzVm (#12871)
* Update ChangeLog.md * vmssID strategy dev work * Update NewAzureVMCommand.cs * Update VirtualMachineStrategy.cs * Update New-AzVM.md * Update VirtualMachineScaleSetTests.cs * Update VirtualMachineScaleSetTests.ps1 * Create TestVirtualMachineScaleSetOrchestrationVM.json * Update NewAzureRmVmssConfigCommand.cs * New-AzVmss PlatformFaultDomainCount all work * removing the old upgrade policy code. Breaking change. * removed ? from int? Co-authored-by: Jin Lei <[email protected]>
1 parent 63193bf commit d56471f

File tree

11 files changed

+5107
-17
lines changed

11 files changed

+5107
-17
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,13 @@ public void TestVirtualMachineScaleSetNewEncryptionAtHost()
178178
{
179179
TestRunner.RunTestScript("Test-VirtualMachineScaleSetEncryptionAtHost");
180180
}
181+
182+
[Fact]
183+
[Trait(Category.AcceptanceType, Category.CheckIn)]
184+
public void TestVirtualMachineScaleSetOrchestrationVM()
185+
{
186+
TestRunner.RunTestScript("Test-VirtualMachineScaleSetOrchestrationVM");
187+
}
181188

182189
[Fact]
183190
[Trait(Category.AcceptanceType, Category.CheckIn)]

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

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2537,6 +2537,73 @@ function Test-VirtualMachineScaleSetEncryptionAtHost
25372537
}
25382538
}
25392539

2540+
<#
2541+
.SYNOPSIS
2542+
create a VMSS in orchestration mode then add a vm to it
2543+
#>
2544+
function Test-VirtualMachineScaleSetOrchestrationVM
2545+
{
2546+
# Setup
2547+
$rgname = Get-ComputeTestResourceName
2548+
2549+
try
2550+
{
2551+
# Common
2552+
$loc = "eastus"
2553+
New-AzResourceGroup -Name $rgname -Location $loc -Force;
2554+
2555+
# New VMSS Parameters
2556+
$vmssName = 'vmssOrchestrationMode' + $rgname;
2557+
$vmName = 'vm' + $rgname;
2558+
$domainName = 'domain' + $rgname;
2559+
$adminUsername = 'Foo12';
2560+
$adminPassword = $PLACEHOLDER;
2561+
2562+
$securePassword = ConvertTo-SecureString $adminPassword -AsPlainText -Force;
2563+
$cred = New-Object System.Management.Automation.PSCredential ($adminUsername, $securePassword);
2564+
2565+
2566+
$VmssConfigWithoutVmProfile = new-azvmssconfig -location $loc -platformfaultdomain 1
2567+
$VmssWithoutVmProfile = new-azvmss -resourcegroupname $rgname -vmscalesetname $vmssName -virtualmachinescaleset $VmssConfigWithoutVmProfile
2568+
2569+
$vm = new-azvm -resourcegroupname $rgname -location $loc -name $vmname -credential $cred -domainnamelabel $domainName -vmssid $VmssWithoutVmProfile.id
2570+
2571+
Assert-AreEqual $VmssWithoutVmProfile.id $vm.virtualmachinescaleset.id
2572+
2573+
# Test PlatformFaultDomainCount parameter
2574+
$vmssNameSimple = $vmssname + "Simple";
2575+
$vmssNameDefault = $vmssname + "Default";
2576+
$platformFaultDomainCount = 5;
2577+
$platformFaultDomainCountConfig = 3;
2578+
$zone = "2";
2579+
$domainNameLabel = $rgname + "domainlabel";
2580+
$VmSku = "Standard_D2s_v3";
2581+
2582+
2583+
$vmssConfigFaultDomain = New-AzVmssConfig -Location $loc -PlatformFaultDomainCount $platformFaultDomainCountConfig;
2584+
Assert-NotNull $vmssConfigFaultDomain;
2585+
Assert-AreEqual $vmssConfigFaultDomain.PlatformFaultDomainCount $platformFaultDomainCountConfig;
2586+
2587+
# PlatformFaultDomainCount in New-AzVmss DefaultParameterSet
2588+
$vmssDefault = New-AzVmss -Name $vmssNameDefault -ResourceGroup $rgname -VirtualMachineScaleSet $vmssConfigFaultDomain;
2589+
Assert-NotNull $vmssDefault;
2590+
Assert-AreEqual $vmssDefault.PlatformFaultDomainCount $platformFaultDomainCountConfig;
2591+
2592+
# PlatformFaultDomainCount in New-AzVmss SimpleParameterSet
2593+
$vmssSimple = New-AzVmss -Name $vmssNameSimple -ResourceGroup $rgname -Credential $cred -Zone $zone -VmSize $VmSku -DomainNameLabel $domainNameLabel -PlatformFaultDomainCount $platformFaultDomainCount;
2594+
Assert-NotNull $vmssSimple;
2595+
Assert-AreEqual $vmssSimple.PlatformFaultDomainCount $platformFaultDomainCount;
2596+
2597+
2598+
2599+
}
2600+
finally
2601+
{
2602+
# Cleanup
2603+
Clean-ResourceGroup $rgname
2604+
}
2605+
}
2606+
25402607
<#
25412608
.SYNOPSIS
25422609
testing encryptionAtHost cmdlet for
@@ -2582,4 +2649,4 @@ function Test-VirtualMachineScaleSetAssignedHost
25822649
# Cleanup
25832650
Clean-ResourceGroup $rgname
25842651
}
2585-
}
2652+
}

0 commit comments

Comments
 (0)