Skip to content

Commit 5f182eb

Browse files
isra-felisra-fel
committed
Merge branch 'main' of https://github.com/Azure/azure-powershell into identity-1210
2 parents dabd555 + 6a1b74b commit 5f182eb

348 files changed

Lines changed: 23921 additions & 14266 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,5 +514,19 @@ public void TestVirtualMachineScaleSetHighSpeedInterconnectPlacement()
514514
{
515515
TestRunner.RunTestScript("Test-VirtualMachineScaleSetHighSpeedInterconnectPlacement");
516516
}
517+
518+
[Fact]
519+
[Trait(Category.AcceptanceType, Category.CheckIn)]
520+
public void TestVirtualMachineScaleSetZonalPlatformFaultDomainAlignMode()
521+
{
522+
TestRunner.RunTestScript("Test-VirtualMachineScaleSetZonalPlatformFaultDomainAlignMode");
523+
}
524+
525+
[Fact]
526+
[Trait(Category.AcceptanceType, Category.CheckIn)]
527+
public void TestVirtualMachineScaleSetConfigStorageFaultDomainAlignment()
528+
{
529+
TestRunner.RunTestScript("Test-VirtualMachineScaleSetConfigStorageFaultDomainAlignment");
530+
}
517531
}
518532
}

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

Lines changed: 124 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6345,4 +6345,127 @@ function Test-VirtualMachineScaleSetHighSpeedInterconnectPlacement
63456345
# Cleanup
63466346
Clean-ResourceGroup $rgname;
63476347
}
6348-
}
6348+
}
6349+
<#
6350+
.SYNOPSIS
6351+
Test Virtual Machine Scale Set with ZonalPlatformFaultDomainAlignMode (BestEffortAligned storage FD alignment)
6352+
#>
6353+
function Test-VirtualMachineScaleSetZonalPlatformFaultDomainAlignMode
6354+
{
6355+
# Setup
6356+
$rgname = Get-ComputeTestResourceName
6357+
$loc = "eastus2euap";
6358+
6359+
try
6360+
{
6361+
# Common
6362+
New-AzResourceGroup -Name $rgname -Location $loc -Force;
6363+
6364+
$vmssName = 'vmss' + $rgname;
6365+
$domainNameLabel1 = "d1" + $rgname;
6366+
$adminUsername = Get-ComputeTestResourceName;
6367+
$password = Get-PasswordForVM;
6368+
$adminPassword = $password | ConvertTo-SecureString -AsPlainText -Force;
6369+
$cred = New-Object System.Management.Automation.PSCredential ($adminUsername, $adminPassword);
6370+
6371+
# Create VMSS with Aligned ZonalPlatformFaultDomainAlignMode using SimpleParameterSet
6372+
$vmss = New-AzVmss -ResourceGroupName $rgname -Credential $cred -VMScaleSetName $vmssName `
6373+
-DomainNameLabel $domainNameLabel1 -ZonalPlatformFaultDomainAlignMode "Aligned" `
6374+
-OrchestrationMode "Flexible" -Zone "1","2","3" -PlatformFaultDomainCount 2;
6375+
6376+
Assert-AreEqual $vmss.ZonalPlatformFaultDomainAlignMode "Aligned";
6377+
6378+
# Update the VMSS ZonalPlatformFaultDomainAlignMode
6379+
$updatedVmss = Update-AzVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName `
6380+
-ZonalPlatformFaultDomainAlignMode "BestEffortAligned";
6381+
6382+
Assert-AreEqual $updatedVmss.ZonalPlatformFaultDomainAlignMode "BestEffortAligned";
6383+
}
6384+
finally
6385+
{
6386+
# Cleanup
6387+
Clean-ResourceGroup $rgname;
6388+
}
6389+
}
6390+
6391+
<#
6392+
.SYNOPSIS
6393+
Test New-AzVmssConfig with ZonalPlatformFaultDomainAlignMode and per-disk StorageFaultDomainAlignment, then create the VMSS
6394+
#>
6395+
function Test-VirtualMachineScaleSetConfigStorageFaultDomainAlignment
6396+
{
6397+
# Setup
6398+
$rgname = Get-ComputeTestResourceName
6399+
$loc = "eastus2euap";
6400+
6401+
try
6402+
{
6403+
# Common
6404+
New-AzResourceGroup -Name $rgname -Location $loc -Force;
6405+
6406+
$vmssName = 'vmss' + $rgname;
6407+
$subnetName = 'subnet' + $rgname;
6408+
$vnetName = 'vnet' + $rgname;
6409+
$adminUsername = Get-ComputeTestResourceName;
6410+
$password = Get-PasswordForVM;
6411+
$adminPassword = $password | ConvertTo-SecureString -AsPlainText -Force;
6412+
6413+
# Create a VMSS config with BestEffortAligned VMSS-level alignment (zones + FD count required)
6414+
$vmssConfig = New-AzVmssConfig -Location $loc -SkuCapacity 0 -SkuName "Standard_D4s_v3" `
6415+
-OrchestrationMode "Flexible" -ZonalPlatformFaultDomainAlignMode "BestEffortAligned" `
6416+
-Zone "1","2","3" -PlatformFaultDomainCount 2 -SecurityType "Standard";
6417+
6418+
Assert-AreEqual $vmssConfig.ZonalPlatformFaultDomainAlignMode "BestEffortAligned";
6419+
6420+
# Create VNet and Subnet
6421+
$vnetAddressPrefix = "10.0.0.0/16";
6422+
$subnetAddressPrefix = "10.0.0.0/24";
6423+
$subnetConfig = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix $subnetAddressPrefix;
6424+
$vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $loc -AddressPrefix $vnetAddressPrefix -Subnet $subnetConfig;
6425+
6426+
# Get subnet object
6427+
$subnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname | Get-AzVirtualNetworkSubnetConfig -Name $subnetName;
6428+
6429+
# Configure IP and NIC
6430+
$ipCfg = New-AzVmssIpConfig -Name "ipconfig1" -SubnetId $subnet.Id;
6431+
$vmssConfig = Add-AzVmssNetworkInterfaceConfiguration -VirtualMachineScaleSet $vmssConfig `
6432+
-Name "nicConfig" -Primary $true -IPConfiguration $ipCfg;
6433+
6434+
# Configure OS profile
6435+
$vmssConfig = Set-AzVmssOSProfile -VirtualMachineScaleSet $vmssConfig `
6436+
-ComputerNamePrefix "vm" `
6437+
-AdminUsername $adminUsername `
6438+
-AdminPassword $password;
6439+
6440+
# Set OS disk with BestEffortAligned per-disk alignment
6441+
Set-AzVmssStorageProfile -VirtualMachineScaleSet $vmssConfig `
6442+
-OsDiskCreateOption "FromImage" -OsDiskStorageFaultDomainAlignment "BestEffortAligned" `
6443+
-ImageReferencePublisher "MicrosoftWindowsServer" -ImageReferenceOffer "WindowsServer" `
6444+
-ImageReferenceSku "2022-Datacenter" -ImageReferenceVersion "latest" `
6445+
-ManagedDisk "Premium_LRS";
6446+
6447+
Assert-AreEqual $vmssConfig.VirtualMachineProfile.StorageProfile.OsDisk.StorageFaultDomainAlignment "BestEffortAligned";
6448+
6449+
# Add data disk with BestEffortAligned per-disk alignment (must match VMSS-level mode)
6450+
Add-AzVmssDataDisk -VirtualMachineScaleSet $vmssConfig -Lun 0 -CreateOption "Empty" `
6451+
-DiskSizeGB 128 -StorageAccountType "Premium_LRS" -StorageFaultDomainAlignment "BestEffortAligned";
6452+
6453+
Assert-AreEqual $vmssConfig.VirtualMachineProfile.StorageProfile.DataDisks[0].StorageFaultDomainAlignment "BestEffortAligned";
6454+
6455+
# Create the VMSS using the config
6456+
$vmssResult = New-AzVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -VirtualMachineScaleSet $vmssConfig;
6457+
6458+
# Verify the created VMSS has the correct VMSS-level property
6459+
Assert-AreEqual $vmssResult.ZonalPlatformFaultDomainAlignMode "BestEffortAligned";
6460+
6461+
# Get the VMSS and verify VMSS-level property persisted
6462+
$vmssGet = Get-AzVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
6463+
6464+
Assert-AreEqual $vmssGet.ZonalPlatformFaultDomainAlignMode "BestEffortAligned";
6465+
}
6466+
finally
6467+
{
6468+
# Cleanup
6469+
Clean-ResourceGroup $rgname;
6470+
}
6471+
}

‎src/Compute/Compute.Test/ScenarioTests/VirtualMachineTests.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,5 +710,12 @@ public void TestVMDataDiskIOPSMBPS()
710710
{
711711
TestRunner.RunTestScript("Test-VMDataDiskIOPSMBPS");
712712
}
713+
714+
[Fact]
715+
[Trait(Category.AcceptanceType, Category.CheckIn)]
716+
public void TestVMStorageFaultDomainAlignment()
717+
{
718+
TestRunner.RunTestScript("Test-VMStorageFaultDomainAlignment");
719+
}
713720
}
714721
}

‎src/Compute/Compute.Test/ScenarioTests/VirtualMachineTests.ps1‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8170,3 +8170,119 @@ function Test-VMDataDiskIOPSMBPS
81708170
Clean-ResourceGroup $rgname
81718171
}
81728172
}
8173+
8174+
<#
8175+
.SYNOPSIS
8176+
Test Set-AzVMOSDisk and Add-AzVMDataDisk with StorageFaultDomainAlignment parameter
8177+
#>
8178+
function Test-VMStorageFaultDomainAlignment
8179+
{
8180+
# Setup
8181+
$rgname = Get-ComputeTestResourceName
8182+
8183+
try
8184+
{
8185+
# Common
8186+
$loc = "eastus2euap";
8187+
New-AzResourceGroup -Name $rgname -Location $loc -Force;
8188+
8189+
# VM Profile & Hardware
8190+
$vmsize = 'Standard_D4s_v3';
8191+
$vmname = 'vm' + $rgname;
8192+
$stnd = "Standard";
8193+
8194+
# Create VMSS Flex (required for StorageFaultDomainAlignment - CRP rejects it on standalone VMs)
8195+
$vmssName = "vmss" + $rgname;
8196+
8197+
# NRP (needed for both VMSS and VM)
8198+
$vnetname = "vnet" + $rgname;
8199+
$subnetname = "subnet" + $rgname;
8200+
$NICName = "nic" + $rgname;
8201+
$NSGName = "nsg" + $rgname;
8202+
$subnetAddress = "10.0.2.0/24";
8203+
$vnetAddress = "10.0.0.0/16";
8204+
8205+
$frontendSubnet = New-AzVirtualNetworkSubnetConfig -Name $subnetname -AddressPrefix $subnetAddress;
8206+
$vnet = New-AzVirtualNetwork -Name $vnetname -ResourceGroupName $rgname -Location $loc -AddressPrefix $vnetAddress -Subnet $frontendSubnet;
8207+
$nsgRuleRDP = New-AzNetworkSecurityRuleConfig -Name RDP -Protocol Tcp -Direction Inbound -Priority 1001 -SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * -DestinationPortRange 3389 -Access Allow;
8208+
$nsg = New-AzNetworkSecurityGroup -ResourceGroupName $rgname -Location $loc -Name $NSGName -SecurityRules $nsgRuleRDP;
8209+
8210+
# Credentials
8211+
$password = Get-PasswordForVM;
8212+
$securePassword = $password | ConvertTo-SecureString -AsPlainText -Force;
8213+
$user = "admin01";
8214+
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
8215+
8216+
# VMSS Flex config with full VM profile (storage + OS + network required for Flex)
8217+
$subnetId = $vnet.Subnets[0].Id;
8218+
$ipConfig = New-AzVmssIpConfig -Name 'ipconfig1' -SubnetId $subnetId;
8219+
$vmssConfig = New-AzVmssConfig -Location $loc -SkuCapacity 0 -SkuName $vmsize -OrchestrationMode 'Flexible' -SecurityType $stnd -Zone "1","2","3" -PlatformFaultDomainCount 2 -ZonalPlatformFaultDomainAlignMode "BestEffortAligned";
8220+
Set-AzVmssStorageProfile $vmssConfig -OsDiskCreateOption "FromImage" -ManagedDisk "Premium_LRS" -ImageReferencePublisher "MicrosoftWindowsServer" -ImageReferenceOffer "WindowsServer" -ImageReferenceSku "2022-Datacenter" -ImageReferenceVersion "latest";
8221+
Set-AzVmssOsProfile $vmssConfig -AdminUsername $cred.UserName -AdminPassword $cred.Password -ComputerNamePrefix "vm";
8222+
Add-AzVmssNetworkInterfaceConfiguration -VirtualMachineScaleSet $vmssConfig -Name 'nicconfig1' -Primary $true -IPConfiguration $ipConfig -NetworkApiVersion "2020-11-01";
8223+
8224+
$VMSS = New-AzVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmssConfig;
8225+
8226+
# Create a separate NIC for the individual VM
8227+
$nic = New-AzNetworkInterface -Name $NICName -ResourceGroupName $rgname -Location $loc -SubnetId $vnet.Subnets[0].Id -NetworkSecurityGroupId $nsg.Id -EnableAcceleratedNetworking;
8228+
8229+
# VM Config within VMSS Flex
8230+
$OSDiskName = $vmname + "-osdisk";
8231+
$vmConfig = New-AzVMConfig -VMName $vmname -VMSize $vmsize -VmssId $VMSS.Id -SecurityType $stnd;
8232+
Set-AzVMOperatingSystem -VM $vmConfig -Windows -ComputerName $vmname -Credential $cred;
8233+
Set-AzVMSourceImage -VM $vmConfig -PublisherName "MicrosoftWindowsServer" -Offer "WindowsServer" -Skus "2022-Datacenter" -Version latest;
8234+
Add-AzVMNetworkInterface -VM $vmConfig -Id $nic.Id;
8235+
8236+
# Set OS disk with StorageFaultDomainAlignment
8237+
Set-AzVMOSDisk -VM $vmConfig -Name $OSDiskName -StorageAccountType "Premium_LRS" -Caching ReadWrite -CreateOption FromImage -StorageFaultDomainAlignment 'BestEffortAligned';
8238+
Assert-AreEqual $vmConfig.StorageProfile.OsDisk.StorageFaultDomainAlignment 'BestEffortAligned';
8239+
8240+
# Add data disk with BestEffortAligned StorageFaultDomainAlignment
8241+
Add-AzVMDataDisk -VM $vmConfig -Name 'datadisk0' -Lun 0 -CreateOption 'Empty' -DiskSizeInGB 128 -StorageAccountType 'Premium_LRS' -Caching 'ReadOnly' -StorageFaultDomainAlignment 'BestEffortAligned';
8242+
Assert-AreEqual $vmConfig.StorageProfile.DataDisks[0].StorageFaultDomainAlignment 'BestEffortAligned';
8243+
8244+
# Add data disk with BestEffortAligned StorageFaultDomainAlignment
8245+
Add-AzVMDataDisk -VM $vmConfig -Name 'datadisk1' -Lun 1 -CreateOption 'Empty' -DiskSizeInGB 64 -StorageAccountType 'Premium_LRS' -Caching 'None' -StorageFaultDomainAlignment 'BestEffortAligned';
8246+
Assert-AreEqual $vmConfig.StorageProfile.DataDisks[1].StorageFaultDomainAlignment 'BestEffortAligned';
8247+
8248+
# Add data disk without StorageFaultDomainAlignment
8249+
Add-AzVMDataDisk -VM $vmConfig -Name 'datadisk2' -Lun 2 -CreateOption 'Empty' -DiskSizeInGB 32 -StorageAccountType 'Premium_LRS' -Caching 'None';
8250+
Assert-Null $vmConfig.StorageProfile.DataDisks[2].StorageFaultDomainAlignment;
8251+
8252+
# Create the VM within the VMSS Flex
8253+
New-AzVM -ResourceGroupName $rgname -Location $loc -VM $vmConfig;
8254+
8255+
# Get the VM instance view and verify StorageAlignmentStatus on disk instance views
8256+
$vmStatus = Get-AzVM -ResourceGroupName $rgname -Name $vmname -Status;
8257+
8258+
$validAlignmentStatuses = @('Aligned', 'Unaligned');
8259+
8260+
# OS disk alignment status from instance view
8261+
Assert-NotNull $vmStatus.Disks;
8262+
$osDisk = $vmStatus.Disks | Where-Object { $_.Name -eq $OSDiskName };
8263+
Assert-NotNull $osDisk;
8264+
Assert-NotNull $osDisk.StorageAlignmentStatus;
8265+
Assert-True { $validAlignmentStatuses -contains $osDisk.StorageAlignmentStatus };
8266+
8267+
# Data disk alignment statuses from instance view
8268+
$dataDisk0 = $vmStatus.Disks | Where-Object { $_.Name -eq 'datadisk0' };
8269+
Assert-NotNull $dataDisk0;
8270+
Assert-NotNull $dataDisk0.StorageAlignmentStatus;
8271+
Assert-True { $validAlignmentStatuses -contains $dataDisk0.StorageAlignmentStatus };
8272+
8273+
$dataDisk1 = $vmStatus.Disks | Where-Object { $_.Name -eq 'datadisk1' };
8274+
Assert-NotNull $dataDisk1;
8275+
Assert-NotNull $dataDisk1.StorageAlignmentStatus;
8276+
Assert-True { $validAlignmentStatuses -contains $dataDisk1.StorageAlignmentStatus };
8277+
8278+
$dataDisk2 = $vmStatus.Disks | Where-Object { $_.Name -eq 'datadisk2' };
8279+
Assert-NotNull $dataDisk2;
8280+
Assert-NotNull $dataDisk2.StorageAlignmentStatus;
8281+
Assert-True { $validAlignmentStatuses -contains $dataDisk2.StorageAlignmentStatus };
8282+
}
8283+
finally
8284+
{
8285+
# Cleanup
8286+
Clean-ResourceGroup $rgname
8287+
}
8288+
}

0 commit comments

Comments
 (0)