Skip to content

VM OrchestrationMode: PlatformFaultDomainCount in New-AzVmss and VmssId in New-AzVm #12871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mark Cowlishaw (markcowl) merged 13 commits into from
Oct 7, 2020
Merged

VM OrchestrationMode: PlatformFaultDomainCount in New-AzVmss and VmssId in New-AzVm #12871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0bf0924
Update ChangeLog.md
Sandido Sep 4, 2020
0d453a2
vmssID strategy dev work
Sandido Sep 4, 2020
97f9e4c
Update NewAzureVMCommand.cs
Sandido Sep 4, 2020
ca1a829
Update VirtualMachineStrategy.cs
Sandido Sep 4, 2020
351ffd1
Update New-AzVM.md
Sandido Sep 4, 2020
9ceb851
Update VirtualMachineScaleSetTests.cs
Sandido Sep 4, 2020
126acc5
Update VirtualMachineScaleSetTests.ps1
Sandido Sep 4, 2020
0e7d008
Create TestVirtualMachineScaleSetOrchestrationVM.json
Sandido Sep 4, 2020
1413cd5
Update NewAzureRmVmssConfigCommand.cs
Sandido Sep 4, 2020
af421bd
New-AzVmss PlatformFaultDomainCount all work
Sandido Sep 5, 2020
67c03f5
removing the old upgrade policy code. Breaking change.
Sandido Sep 23, 2020
bf2ee5c
Merge branch 'master' into SandidoPFDCandVmssID
msJinLei Sep 23, 2020
746a1d8
removed ? from int?
Sandido Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,13 @@ public void TestVirtualMachineScaleSetNewEncryptionAtHost()
{
TestRunner.RunTestScript("Test-VirtualMachineScaleSetEncryptionAtHost");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualMachineScaleSetOrchestrationVM()
{
TestRunner.RunTestScript("Test-VirtualMachineScaleSetOrchestrationVM");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
Expand Down
69 changes: 68 additions & 1 deletion src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2537,6 +2537,73 @@ function Test-VirtualMachineScaleSetEncryptionAtHost
}
}

<#
.SYNOPSIS
create a VMSS in orchestration mode then add a vm to it
#>
function Test-VirtualMachineScaleSetOrchestrationVM
{
# Setup
$rgname = Get-ComputeTestResourceName

try
{
# Common
$loc = "eastus"
New-AzResourceGroup -Name $rgname -Location $loc -Force;

# New VMSS Parameters
$vmssName = 'vmssOrchestrationMode' + $rgname;
$vmName = 'vm' + $rgname;
$domainName = 'domain' + $rgname;
$adminUsername = 'Foo12';
$adminPassword = $PLACEHOLDER;

$securePassword = ConvertTo-SecureString $adminPassword -AsPlainText -Force;
$cred = New-Object System.Management.Automation.PSCredential ($adminUsername, $securePassword);


$VmssConfigWithoutVmProfile = new-azvmssconfig -location $loc -platformfaultdomain 1
$VmssWithoutVmProfile = new-azvmss -resourcegroupname $rgname -vmscalesetname $vmssName -virtualmachinescaleset $VmssConfigWithoutVmProfile

$vm = new-azvm -resourcegroupname $rgname -location $loc -name $vmname -credential $cred -domainnamelabel $domainName -vmssid $VmssWithoutVmProfile.id

Assert-AreEqual $VmssWithoutVmProfile.id $vm.virtualmachinescaleset.id

@grizzlytheodore Theodore Chang (grizzlytheodore) Oct 1, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a way to view the instance view of vmss to see this vm added to the vmss?

@Sandido Adam Sandor (Sandido) Oct 5, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Theodore Chang (@grizzlytheodore) , No. This functionality does not exist in PS and CLI due to how the feature is setup on the server side.

# Test PlatformFaultDomainCount parameter
$vmssNameSimple = $vmssname + "Simple";
$vmssNameDefault = $vmssname + "Default";
$platformFaultDomainCount = 5;
$platformFaultDomainCountConfig = 3;
$zone = "2";
$domainNameLabel = $rgname + "domainlabel";
$VmSku = "Standard_D2s_v3";


$vmssConfigFaultDomain = New-AzVmssConfig -Location $loc -PlatformFaultDomainCount $platformFaultDomainCountConfig;
Assert-NotNull $vmssConfigFaultDomain;
Assert-AreEqual $vmssConfigFaultDomain.PlatformFaultDomainCount $platformFaultDomainCountConfig;

# PlatformFaultDomainCount in New-AzVmss DefaultParameterSet
$vmssDefault = New-AzVmss -Name $vmssNameDefault -ResourceGroup $rgname -VirtualMachineScaleSet $vmssConfigFaultDomain;
Assert-NotNull $vmssDefault;
Assert-AreEqual $vmssDefault.PlatformFaultDomainCount $platformFaultDomainCountConfig;

# PlatformFaultDomainCount in New-AzVmss SimpleParameterSet
$vmssSimple = New-AzVmss -Name $vmssNameSimple -ResourceGroup $rgname -Credential $cred -Zone $zone -VmSize $VmSku -DomainNameLabel $domainNameLabel -PlatformFaultDomainCount $platformFaultDomainCount;
Assert-NotNull $vmssSimple;
Assert-AreEqual $vmssSimple.PlatformFaultDomainCount $platformFaultDomainCount;



}
finally
{
# Cleanup
Clean-ResourceGroup $rgname
}
}

<#
.SYNOPSIS
testing encryptionAtHost cmdlet for
Expand Down Expand Up @@ -2582,4 +2649,4 @@ function Test-VirtualMachineScaleSetAssignedHost
# Cleanup
Clean-ResourceGroup $rgname
}
}
}
Loading