Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Compute/Compute.Test/Compute.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="30.2.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.0.0" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
</ItemGroup>
Expand Down
124 changes: 112 additions & 12 deletions src/Compute/Compute.Test/ScenarioTests/PPGTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,28 @@
# limitations under the License.
# ----------------------------------------------------------------------------------

function Check-ColocationStatus
{
param ($colocationStatus)

Assert-NotNull $colocationStatus;
Assert-AreEqual "Aligned" $colocationStatus.DisplayStatus;
Assert-AreEqual "ColocationStatus/Aligned" $colocationStatus.Code;
Assert-AreEqual "Info" $colocationStatus.Level;
Assert-AreEqual "All resources in the proximity placement group are aligned." $colocationStatus.Message;
}

function Check-ColocationStatusUnknown
{
param ($colocationStatus)

Assert-NotNull $colocationStatus;
Assert-AreEqual "Unknown" $colocationStatus.DisplayStatus;
Assert-AreEqual "ColocationStatus/Unknown" $colocationStatus.Code;
Assert-AreEqual "Warning" $colocationStatus.Level;
Assert-AreEqual "Colocation status is currently unknown." $colocationStatus.Message;
}

<#
.SYNOPSIS
Test ProximityPlacementGroup
Expand All @@ -27,13 +49,13 @@ function Test-ProximityPlacementGroup
# Common
[string]$loc = Get-ComputeVMLocation;
$loc = $loc.Replace(' ', '');

New-AzResourceGroup -Name $rgname -Location $loc -Force;

# Create a VM first
$ppgname = $rgname + 'ppg'
New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key1 = "val1"};

$ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;

Assert-AreEqual $rgname $ppg.ResourceGroupName;
Expand All @@ -42,6 +64,17 @@ function Test-ProximityPlacementGroup
Assert-AreEqual "Standard" $ppg.ProximityPlacementGroupType;
Assert-True { $ppg.Tags.Keys.Contains("key1") };
Assert-AreEqual "val1" $ppg.Tags["key1"];
Assert-Null $ppg.ColocationStatus;

$ppgStatus = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname -ColocationStatus;
Assert-AreEqual $rgname $ppgStatus.ResourceGroupName;
Assert-AreEqual $ppgname $ppgStatus.Name;
Assert-AreEqual $loc $ppgStatus.Location;
Assert-AreEqual "Standard" $ppgStatus.ProximityPlacementGroupType;
Assert-True { $ppgStatus.Tags.Keys.Contains("key1") };
Assert-AreEqual "val1" $ppgStatus.Tags["key1"];

Check-ColocationStatus $ppgStatus.ColocationStatus;

$ppgs = Get-AzProximityPlacementGroup -ResourceGroupName $rgname;
Assert-AreEqual 1 $ppgs.Count;
Expand Down Expand Up @@ -76,46 +109,85 @@ function Test-ProximityPlacementGroupAvSet
# Common
[string]$loc = Get-ComputeVMLocation;
$loc = $loc.Replace(' ', '');

New-AzResourceGroup -Name $rgname -Location $loc -Force;

# Create a VM first
$ppgname1 = $rgname + 'ppg'
New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1 -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key1 = "val1"};

$ppg1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1;

$ppg1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1;
Assert-AreEqual $rgname $ppg1.ResourceGroupName;
Assert-AreEqual $ppgname1 $ppg1.Name;
Assert-AreEqual $loc $ppg1.Location;
Assert-AreEqual "Standard" $ppg1.ProximityPlacementGroupType;
Assert-True { $ppg1.Tags.Keys.Contains("key1") };
Assert-AreEqual "val1" $ppg1.Tags["key1"];

Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1 -ColocationStatus;

$asetName = $rgname + 'as';
New-AzAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -ProximityPlacementGroupId $ppg.Id -Sku 'Classic';
New-AzAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -ProximityPlacementGroupId $ppg1.Id -Sku 'Classic';
$av = Get-AzAvailabilitySet -ResourceGroupName $rgname -Name $asetName;
Assert-AreEqual $ppg1.Id $av.ProximityPlacementGroup.Id;

$ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1;
Assert-AreEqual $av.Id $ppg.AvailabilitySets[0].Id;
$ppg1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1;
Assert-AreEqual $av.Id $ppg1.AvailabilitySets[0].Id;
Assert-Null $ppg1.ColocationStatus;

$ppgStatus1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1 -ColocationStatus;
Assert-AreEqual $av.Id $ppgStatus1.AvailabilitySets[0].Id;
Check-ColocationStatus $ppgStatus1.ColocationStatus;

# Create another PPG
$ppgname2 = $rgname + 'ppg2'
New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key2 = "val2"};
New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key2 = "val2"};
$ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
Assert-Null $ppg2.AvailabilitySets;
Assert-Null $ppg2.ColocationStatus;

$ppgStatus2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -ColocationStatus;
Assert-Null $ppgStatus2.AvailabilitySets;
Check-ColocationStatus $ppgStatus2.ColocationStatus;

# Update AvSet to another PPG
Update-AzAvailabilitySet -AvailabilitySet $av -ProximityPlacementGroupId $ppg2.Id;

$av = Get-AzAvailabilitySet -ResourceGroupName $rgname -Name $asetName;
Assert-AreEqual $ppg2.Id $av.ProximityPlacementGroup.Id;

$ppg1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1;
Assert-Null $ppg1.AvailabilitySets;
Assert-Null $ppg1.ColocationStatus;

$ppgStatus1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1 -ColocationStatus;
Assert-Null $ppgStatus1.AvailabilitySets;
Check-ColocationStatus $ppgStatus1.ColocationStatus;

$ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
Assert-AreEqual $av.Id $ppg2.AvailabilitySets[0].Id;
Assert-Null $ppg2.ColocationStatus;

$ppgStatus2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -ColocationStatus;
Assert-AreEqual $av.Id $ppgStatus2.AvailabilitySets[0].Id;
Check-ColocationStatus $ppgStatus2.ColocationStatus;

Remove-AzAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Force;
$ppg1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1;
Assert-Null $ppg1.AvailabilitySets;
Assert-Null $ppg1.ColocationStatus;

$ppgStatus1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1 -ColocationStatus;
Assert-Null $ppgStatus1.AvailabilitySets;
Check-ColocationStatus $ppgStatus1.ColocationStatus;

$ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
Assert-Null $ppg2.AvailabilitySets;
Assert-Null $ppg2.ColocationStatus;

$ppgStatus2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -ColocationStatus;
Assert-Null $ppgStatus2.AvailabilitySets;
Check-ColocationStatus $ppgStatus2.ColocationStatus;

Remove-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1 -Force;
Remove-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Force;
Expand All @@ -142,13 +214,13 @@ function Test-ProximityPlacementGroupVM
# Common
[string]$loc = Get-ComputeVMLocation;
$loc = $loc.Replace(' ', '');

New-AzResourceGroup -Name $rgname -Location $loc -Force;

# Create a VM first
$ppgname = $rgname + 'ppg'
New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key1 = "val1"};

$ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;

Assert-AreEqual $rgname $ppg.ResourceGroupName;
Expand All @@ -158,6 +230,8 @@ function Test-ProximityPlacementGroupVM
Assert-True { $ppg.Tags.Keys.Contains("key1") };
Assert-AreEqual "val1" $ppg.Tags["key1"];

Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname -ColocationStatus;

# Create a subnet configuration
$subnet = New-AzVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix 192.168.1.0/24;

Expand Down Expand Up @@ -195,26 +269,52 @@ function Test-ProximityPlacementGroupVM

$ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;
Assert-AreEqual $vm.Id $ppg.VirtualMachines[0].Id;
Assert-Null $ppg.ColocationStatus;

$ppgStatus1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname -ColocationStatus;
Assert-AreEqual $vm.Id $ppgStatus1.VirtualMachines[0].Id;
Check-ColocationStatus $ppgStatus1.ColocationStatus;

Stop-AzVM -ResourceGroupName $rgname -Name $vmName -Force;

$ppgname2 = $rgname + 'ppg2'
New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key2 = "val2"};
New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key2 = "val2"};
$ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
Assert-Null $ppg2.VirtualMachines;
Assert-Null $ppg2.ColocationStatus;

$ppgStatus2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -ColocationStatus;
Assert-Null $ppgStatus2.VirtualMachines;
Check-ColocationStatus $ppgStatus2.ColocationStatus;

Update-AzVM -ResourceGroupName $rgname -VM $vm -ProximityPlacementGroupId $ppg2.Id;
$vm = Get-AzVM -ResourceGroupName $rgname -Name $vmName;
Assert-AreEqual $ppg2.Id $vm.ProximityPlacementGroup.Id;

$ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
Assert-AreEqual $vm.Id $ppg2.VirtualMachines[0].Id;
Assert-Null $ppg2.ColocationStatus;

$ppgStatus2 =Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -ColocationStatus;
Assert-AreEqual $vm.Id $ppgStatus2.VirtualMachines[0].Id;
Check-ColocationStatusUnknown $ppgStatus2.ColocationStatus;

Remove-AzVM -ResourceGroupName $rgname -Name $vmName -Force;
$ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;
Assert-Null $ppg.VirtualMachines;
Assert-Null $ppg.ColocationStatus;

$ppgStatus1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname -ColocationStatus;
Assert-Null $ppgStatus1.VirtualMachines;
Check-ColocationStatus $ppgStatus1.ColocationStatus;

$ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
Assert-Null $ppg2.VirtualMachines;
Assert-Null $ppg2.ColocationStatus;

$ppgStatus2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -ColocationStatus;
Assert-Null $ppgStatus2.VirtualMachines;
Check-ColocationStatus $ppgStatus2.ColocationStatus;

Remove-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname -Force;
Remove-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Force;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2310,7 +2310,7 @@ function Test-VirtualMachineScaleSetAutoRepair
-SubnetId $subnetId;

$vmss = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'Manual' -HealthProbeId $expectedLb.Probes[0].Id `
-EnableAutomaticRepair -AutomaticRepairGracePeriod "PT10S" -AutomaticRepairMaxInstanceRepairsPercent 100 `
-EnableAutomaticRepair -AutomaticRepairGracePeriod "PT10S" `
| Add-AzVmssNetworkInterfaceConfiguration -Name 'test' -Primary $true -IPConfiguration $ipCfg `
| Set-AzVmssOSProfile -ComputerNamePrefix 'test' -AdminUsername $adminUsername -AdminPassword $adminPassword `
| Set-AzVmssStorageProfile -Name 'test' -OsDiskCreateOption 'FromImage' -OsDiskCaching 'None' `
Expand All @@ -2319,22 +2319,19 @@ function Test-VirtualMachineScaleSetAutoRepair

Assert-True { $vmss.AutomaticRepairsPolicy.Enabled };
Assert-AreEqual "PT10S" $vmss.AutomaticRepairsPolicy.GracePeriod;
Assert-AreEqual 100 $vmss.AutomaticRepairsPolicy.MaxInstanceRepairsPercent;
New-AzVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmss;

$vmssResult = Get-AzVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;

Assert-True { $vmssResult.AutomaticRepairsPolicy.Enabled };
Assert-AreEqual "PT10S" $vmssResult.AutomaticRepairsPolicy.GracePeriod;
Assert-AreEqual 100 $vmssResult.AutomaticRepairsPolicy.MaxInstanceRepairsPercent;

Update-AzVmss -ResourceGroupName $rgname -Name $vmssName -EnableAutomaticRepair $false;

$vmssResult = Get-AzVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;

Assert-False { $vmssResult.AutomaticRepairsPolicy.Enabled };
Assert-AreEqual "PT10S" $vmssResult.AutomaticRepairsPolicy.GracePeriod;
Assert-AreEqual 100 $vmssResult.AutomaticRepairsPolicy.MaxInstanceRepairsPercent;
}
finally
{
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/Compute/Compute/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Add ColocationStatus parameter to Get-AzProximityPlacementGroup cmdlet.

## Version 3.3.0
* Fix Set-AzVMCustomScriptExtension cmdlet for a VM with managed OD disk which does not have OS profile.
Expand Down
2 changes: 1 addition & 1 deletion src/Compute/Compute/Compute.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="30.2.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.0.0" />
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.1" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
using System.Management.Automation;
using Microsoft.Azure.Commands.Compute.Common;
using Microsoft.Azure.Commands.Compute.Automation.Models;
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;

namespace Microsoft.Azure.Commands.Compute
{
[Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssDiagnosticsExtension",SupportsShouldProcess = true)]
[CmdletOutputBreakingChangeAttribute(typeof(PSAutomaticRepairsPolicy), "MaxInstanceRepairsPercent property will be removed.")]
[OutputType(typeof(PSVirtualMachineScaleSet))]
public class RemoveAzureRmVmssDiagnosticsExtension : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet
{
Expand Down
12 changes: 10 additions & 2 deletions src/Compute/Compute/Generated/Models/ComputeAutoMapperProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,14 @@ private static void Initialize()
cfg.CreateMap<TO.PSImage, FROM.Image>();
cfg.CreateMap<FROM.LogAnalyticsOperationResult, TO.PSLogAnalyticsOperationResult>();
cfg.CreateMap<TO.PSLogAnalyticsOperationResult, FROM.LogAnalyticsOperationResult>();
cfg.CreateMap<FROM.ProximityPlacementGroup, TO.PSProximityPlacementGroup>();
cfg.CreateMap<TO.PSProximityPlacementGroup, FROM.ProximityPlacementGroup>();
cfg.CreateMap<FROM.ProximityPlacementGroup, TO.PSProximityPlacementGroup>()
.ForMember(c => c.AvailabilitySetsColocationStatus, o => o.MapFrom(r => r.AvailabilitySets))
.ForMember(c => c.VirtualMachinesColocationStatus, o => o.MapFrom(r => r.VirtualMachines))
.ForMember(c => c.VirtualMachineScaleSetsColocationStatus, o => o.MapFrom(r => r.VirtualMachineScaleSets));
cfg.CreateMap<TO.PSProximityPlacementGroup, FROM.ProximityPlacementGroup>()
.ForMember(c => c.AvailabilitySets, o => o.MapFrom(r => r.AvailabilitySetsColocationStatus))
.ForMember(c => c.VirtualMachines, o => o.MapFrom(r => r.VirtualMachinesColocationStatus))
.ForMember(c => c.VirtualMachineScaleSets, o => o.MapFrom(r => r.VirtualMachineScaleSetsColocationStatus));
cfg.CreateMap<FROM.ResourceSku, TO.PSResourceSku>();
cfg.CreateMap<TO.PSResourceSku, FROM.ResourceSku>();
cfg.CreateMap<FROM.Snapshot, TO.PSSnapshot>();
Expand Down Expand Up @@ -180,6 +186,8 @@ private static void Initialize()

cfg.CreateMap<FROM.VirtualMachineScaleSetVMProfile, TO.PSVirtualMachineScaleSetVMProfile>();
cfg.CreateMap<TO.PSVirtualMachineScaleSetVMProfile, FROM.VirtualMachineScaleSetVMProfile>();
cfg.CreateMap<FROM.AutomaticRepairsPolicy, TO.PSAutomaticRepairsPolicy>();
cfg.CreateMap<TO.PSAutomaticRepairsPolicy, FROM.AutomaticRepairsPolicy>();
cfg.CreateMap<FROM.VirtualMachineScaleSetExtensionProfile, TO.PSVirtualMachineScaleSetExtensionProfile>();
cfg.CreateMap<TO.PSVirtualMachineScaleSetExtensionProfile, FROM.VirtualMachineScaleSetExtensionProfile>();
cfg.CreateMap<FROM.VirtualMachineScaleSetExtension, TO.PSVirtualMachineScaleSetExtension>()
Expand Down
1 change: 1 addition & 0 deletions src/Compute/Compute/Generated/Models/PSDiskUpdate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public partial class PSDiskUpdate
public EncryptionSettingsCollection EncryptionSettingsCollection { get; set; }
public long? DiskIOPSReadWrite { get; set; }
public int? DiskMBpsReadWrite { get; set; }
public Encryption Encryption { get; set; }
public IDictionary<string, string> Tags { get; set; }
public DiskSku Sku { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ public string ResourceGroupName
}

public string ProximityPlacementGroupType { get; set; }
public IList<SubResource> VirtualMachines { get; set; }
public IList<SubResource> VirtualMachineScaleSets { get; set; }
public IList<SubResource> AvailabilitySets { get; set; }
public IList<SubResourceWithColocationStatus> VirtualMachinesColocationStatus { get; set; }
public IList<SubResourceWithColocationStatus> VirtualMachineScaleSetsColocationStatus { get; set; }
public IList<SubResourceWithColocationStatus> AvailabilitySetsColocationStatus { get; set; }
public InstanceViewStatus ColocationStatus { get; set; }
public string Id { get; set; }
public string Name { get; set; }
public string Type { get; set; }
Expand Down
1 change: 1 addition & 0 deletions src/Compute/Compute/Generated/Models/PSSnapshotUpdate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public partial class PSSnapshotUpdate
public OperatingSystemTypes? OsType { get; set; }
public int? DiskSizeGB { get; set; }
public EncryptionSettingsCollection EncryptionSettingsCollection { get; set; }
public Encryption Encryption { get; set; }
public IDictionary<string, string> Tags { get; set; }
public SnapshotSku Sku { get; set; }

Expand Down
Loading