[Compute] ProximityPlacementGroupId Update feature

src/Compute/Compute.Test/Compute.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="30.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="30.2.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
   </ItemGroup>

src/Compute/Compute.Test/ScenarioTests/PPGTests.ps1

@@ -80,31 +80,45 @@ function Test-ProximityPlacementGroupAvSet
         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"};
+        $ppgname1 = $rgname + 'ppg'
+        New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1 -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key1 = "val1"};
 
-        $ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;
+        $ppg1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1;
 
-        Assert-AreEqual $rgname $ppg.ResourceGroupName;
-        Assert-AreEqual $ppgname $ppg.Name;
-        Assert-AreEqual $loc $ppg.Location;
-        Assert-AreEqual "Standard" $ppg.ProximityPlacementGroupType;
-        Assert-True { $ppg.Tags.Keys.Contains("key1") };
-        Assert-AreEqual "val1" $ppg.Tags["key1"];
+        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"];
 
         $asetName = $rgname + 'as';
         New-AzAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -ProximityPlacementGroupId $ppg.Id -Sku 'Classic';
         $av = Get-AzAvailabilitySet -ResourceGroupName $rgname -Name $asetName;
-        Assert-AreEqual $ppg.Id $av.ProximityPlacementGroup.Id;
+        Assert-AreEqual $ppg1.Id $av.ProximityPlacementGroup.Id;
 
-        $ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;
+        $ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1;
         Assert-AreEqual $av.Id $ppg.AvailabilitySets[0].Id;
 
+        # Create another PPG
+        $ppgname2 = $rgname + 'ppg2'
+        New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key2 = "val2"};        
+        $ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
+
+        # 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;
+
         Remove-AzAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Force;
-        $ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;
-        Assert-Null $ppg.AvailabilitySets;
+        $ppg1 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1;
+        Assert-Null $ppg1.AvailabilitySets;
+        $ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
+        Assert-Null $ppg2.AvailabilitySets;
 
-        Remove-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname -Force;
+        Remove-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname1 -Force;
+        Remove-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Force;
     }
     finally
     {
@@ -182,11 +196,28 @@ function Test-ProximityPlacementGroupVM
         $ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;
         Assert-AreEqual $vm.Id $ppg.VirtualMachines[0].Id;
 
+        Stop-AzVM -ResourceGroupName $rgname -Name $vmName -Force;
+
+        $ppgname2 = $rgname + 'ppg2'
+        New-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Location $loc -ProximityPlacementGroupType "Standard" -Tag @{key2 = "val2"};        
+        $ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
+
+        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;
+
         Remove-AzVM -ResourceGroupName $rgname -Name $vmName -Force;
         $ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;
         Assert-Null $ppg.VirtualMachines;
 
+        $ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
+        Assert-Null $ppg2.VirtualMachines;
+
         Remove-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname -Force;
+        Remove-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -Force;
     }
     finally
     {

src/Compute/Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.ps1

@@ -558,7 +558,7 @@ function Test-SimpleNewVmPpgId
             -ResourceGroupName $rgname `
             -Name $ppgname `
             -Location "eastus"
-        $vm = New-AzVM -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -ProximityPlacementGroup $ppg.Id
+        $vm = New-AzVM -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -ProximityPlacementGroupId $ppg.Id
 
         Assert-AreEqual $vm.ProximityPlacementGroup.Id $ppg.Id
     }

src/Compute/Compute.Test/ScenarioTests/StrategiesVmssTests.ps1

@@ -394,7 +394,7 @@ function Test-SimpleNewVmssPpg
             -ResourceGroupName $rgname `
             -Name $ppgname `
             -Location "eastus"
-        $vmss = New-AzVmss -Name $vmssname -ResourceGroup $rgname -Credential $cred -DomainNameLabel $domainNameLabel -LoadBalancerName $lbName -ProximityPlacementGroup $ppgname
+        $vmss = New-AzVmss -Name $vmssname -ResourceGroup $rgname -Credential $cred -DomainNameLabel $domainNameLabel -LoadBalancerName $lbName -ProximityPlacementGroupId $ppgname
 
         Assert-AreEqual $vmss.ProximityPlacementGroup.Id $ppg.Id
     }

src/Compute/Compute/AvailabilitySets/UpdateAzureAvailabilitySetCommand.cs

@@ -18,6 +18,7 @@
 using Microsoft.Azure.Commands.Compute.Common;
 using Microsoft.Azure.Commands.Compute.Models;
 using Microsoft.Azure.Management.Compute.Models;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Compute
 {
@@ -37,13 +38,18 @@ public class UpdateAzureAvailabilitySetCommand : AvailabilitySetBaseCmdlet
         public PSAvailabilitySet AvailabilitySet { get; set; }
 
         [Parameter(
-            Mandatory = true,
+            Mandatory = false,
             Position = 1,
             ParameterSetName = SkuParameterSetName,
             ValueFromPipelineByPropertyName = false,
             HelpMessage = "The Name of Sku")]
         public string Sku { get; set; }
 
+        [Parameter(
+            Mandatory = false)]
+        [ValidateNotNullOrEmpty]
+        public string ProximityPlacementGroupId { get; set; }
+
         [Parameter(
             Mandatory = false,
             HelpMessage = "Key-value pairs in the form of a hash table."
@@ -67,7 +73,10 @@ public override void ExecuteCmdlet()
                         PlatformUpdateDomainCount = this.AvailabilitySet.PlatformUpdateDomainCount,
                         PlatformFaultDomainCount = this.AvailabilitySet.PlatformFaultDomainCount,
                         Tags = Tag == null ? null : Tag.Cast<DictionaryEntry>().ToDictionary(d => (string)d.Key, d => (string)d.Value),
-                        Sku = new Sku(this.Sku, null, null)
+                        Sku = new Sku(this.IsParameterBound(c => c.Sku) ? this.Sku : this.AvailabilitySet.Sku, null, null),
+                        ProximityPlacementGroup = this.IsParameterBound(c => c.ProximityPlacementGroupId) 
+                                                ? new SubResource(this.ProximityPlacementGroupId)
+                                                : this.AvailabilitySet.ProximityPlacementGroup
                     };
 
                     var result = this.AvailabilitySetClient.CreateOrUpdateWithHttpMessagesAsync(

src/Compute/Compute/ChangeLog.md

@@ -19,6 +19,11 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Add ProximityPlacementGroupId parameter to the following cmdlets:
+    - Update-AzAvailabilitySet, Update-AzVM, Update-AzVmss
+* Change ProximityPlacementGroup parameter to ProximityPlacementGroupId parameter in New-AzVM and New-AzVmss.
+  (ProximityPlacementGroup parameter is still supported as an alias)
+* Update help message for VM and VMSS priority.
 * Update references in .psd1 to use relative path
 
 ## Version 3.1.0

src/Compute/Compute/Common/DiagnosticsHelper.cs

@@ -12,7 +12,18 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Management.Automation;
+using System.Text;
+using System.Xml;
+using System.Xml.Linq;
+using System.Xml.Serialization;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using Microsoft.Azure.Commands.Compute.Automation.Models;
 using Microsoft.Azure.Commands.Management.Storage.Models;
 using Microsoft.Azure.Management.Compute.Models;
 using Microsoft.Azure.Management.Storage.Version2017_10_01;
@@ -24,16 +35,6 @@
 using Microsoft.WindowsAzure.Storage.Auth;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Management.Automation;
-using System.Text;
-using System.Xml;
-using System.Xml.Linq;
-using System.Xml.Serialization;
 
 namespace Microsoft.Azure.Commands.Compute.Common
 {
@@ -740,6 +741,17 @@ public static Tuple<Hashtable, Hashtable> GetConfigurationsFromFiles(string publ
         /// <param name="extension">VMSS extension</param>
         /// <returns>Whether the VMSS extension is diagnostics extension</returns>
         public static bool IsDiagnosticsExtension(VirtualMachineScaleSetExtension extension)
+        {
+            return extension.Publisher.Equals(DiagnosticsExtensionConstants.ExtensionPublisher, StringComparison.InvariantCultureIgnoreCase) &&
+                extension.Type1.Equals(DiagnosticsExtensionConstants.ExtensionType, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// Check if a VMSS extension is diagnostics extension.
+        /// </summary>
+        /// <param name="extension">VMSS extension</param>
+        /// <returns>Whether the VMSS extension is diagnostics extension</returns>
+        public static bool IsDiagnosticsExtension(PSVirtualMachineScaleSetExtension extension)
         {
             return extension.Publisher.Equals(DiagnosticsExtensionConstants.ExtensionPublisher, StringComparison.InvariantCultureIgnoreCase) &&
                 extension.Type.Equals(DiagnosticsExtensionConstants.ExtensionType, StringComparison.InvariantCultureIgnoreCase);

src/Compute/Compute/Compute.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="30.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="30.2.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" />

src/Compute/Compute/Extension/Diagnostics/AddAzureRmVmssDiagnosticsExtension.cs

@@ -120,19 +120,19 @@ protected override void ProcessRecord()
                 // VirtualMachineProfile
                 if (this.VirtualMachineScaleSet.VirtualMachineProfile == null)
                 {
-                    this.VirtualMachineScaleSet.VirtualMachineProfile = new VirtualMachineScaleSetVMProfile();
+                    this.VirtualMachineScaleSet.VirtualMachineProfile = new PSVirtualMachineScaleSetVMProfile();
                 }
 
                 // ExtensionProfile
                 if (this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile == null)
                 {
-                    this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile = new VirtualMachineScaleSetExtensionProfile();
+                    this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile = new PSVirtualMachineScaleSetExtensionProfile();
                 }
 
                 // Extensions
                 if (this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions == null)
                 {
-                    this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions = new List<VirtualMachineScaleSetExtension>();
+                    this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions = new List<PSVirtualMachineScaleSetExtension>();
                 }
 
                 bool shouldContinue = true;
@@ -162,7 +162,7 @@ protected override void ProcessRecord()
                     // Parse configs, and auto fill incomplete parts
                     Tuple<Hashtable, Hashtable> settings = DiagnosticsHelper.GetConfigurationsFromFiles(this.SettingFilePath, this.ProtectedSettingFilePath, this.VirtualMachineScaleSet.Id, this, storageClient);
 
-                    var newDiagnosticsExtension = new VirtualMachineScaleSetExtension();
+                    var newDiagnosticsExtension = new PSVirtualMachineScaleSetExtension();
 
                     newDiagnosticsExtension.Name = this.Name;
                     newDiagnosticsExtension.Publisher = DiagnosticsExtensionConstants.ExtensionPublisher;

src/Compute/Compute/Extension/VmssDiskEncryption/DisableAzureVmssDiskEncryption.cs

@@ -127,7 +127,7 @@ public override void ExecuteCmdlet()
                     bool extensionFound = false;
                     foreach (var ext in vmss.VirtualMachineProfile.ExtensionProfile.Extensions)
                     {
-                        if (ext.Type.Equals(this.ExtensionName))
+                        if (ext.Type1.Equals(this.ExtensionName))
                         {
                             ext.Settings = GetDisalbeEncryptionSetting();
                             ext.ProtectedSettings = null;

src/Compute/Compute/Extension/VmssDiskEncryption/GetAzureVmssDiskEncryptionStatus.cs

@@ -148,7 +148,7 @@ private PSVmssDiskEncryptionStatusContext GetVmssDiskStatus(string rgName, strin
                 }
 
                 ext = vmssResult.VirtualMachineProfile.ExtensionProfile.Extensions.First(
-                         e => e.Type.Equals(this.ExtensionName));
+                         e => e.Type1.Equals(this.ExtensionName));
             }
             catch (InvalidOperationException)
             {

src/Compute/Compute/Extension/VmssDiskEncryption/SetAzureVmssDiskEncryptionExtension.cs

@@ -190,7 +190,7 @@ private VirtualMachineScaleSetExtension GetVmssExtensionParameters()
                 {
                     Name = this.ExtensionName,
                     Publisher = AzureVmssDiskEncryptionExtensionContext.ExtensionDefaultPublisher,
-                    Type = AzureVmssDiskEncryptionExtensionContext.ExtensionDefaultName,
+                    Type1 = AzureVmssDiskEncryptionExtensionContext.ExtensionDefaultName,
                     TypeHandlerVersion = (this.TypeHandlerVersion) ?? AzureVmssDiskEncryptionExtensionContext.ExtensionDefaultVersion,
                     Settings = SettingString,
                     AutoUpgradeMinorVersion = !DisableAutoUpgradeMinorVersion.IsPresent,
@@ -205,7 +205,7 @@ private VirtualMachineScaleSetExtension GetVmssExtensionParameters()
                 {
                     Name = this.ExtensionName,
                     Publisher = AzureVmssDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher,
-                    Type = AzureVmssDiskEncryptionExtensionContext.LinuxExtensionDefaultName,
+                    Type1 = AzureVmssDiskEncryptionExtensionContext.LinuxExtensionDefaultName,
                     TypeHandlerVersion = (this.TypeHandlerVersion) ?? AzureVmssDiskEncryptionExtensionContext.LinuxExtensionDefaultVersion,
                     Settings = SettingString,
                     AutoUpgradeMinorVersion = !DisableAutoUpgradeMinorVersion.IsPresent,

src/Compute/Compute/Generated/Models/ComputeAutoMapperProfile.cs

@@ -178,6 +178,15 @@ private static void Initialize()
                 cfg.CreateMap<FROM.VirtualMachineSize, TO.PSVirtualMachineSize>();
                 cfg.CreateMap<TO.PSVirtualMachineSize, FROM.VirtualMachineSize>();
 
+                cfg.CreateMap<FROM.VirtualMachineScaleSetVMProfile, TO.PSVirtualMachineScaleSetVMProfile>();
+                cfg.CreateMap<TO.PSVirtualMachineScaleSetVMProfile, FROM.VirtualMachineScaleSetVMProfile>();
+                cfg.CreateMap<FROM.VirtualMachineScaleSetExtensionProfile, TO.PSVirtualMachineScaleSetExtensionProfile>();
+                cfg.CreateMap<TO.PSVirtualMachineScaleSetExtensionProfile, FROM.VirtualMachineScaleSetExtensionProfile>();
+                cfg.CreateMap<FROM.VirtualMachineScaleSetExtension, TO.PSVirtualMachineScaleSetExtension>()
+                    .ForMember(c => c.Type, o => o.MapFrom(r => r.Type1));
+                cfg.CreateMap<TO.PSVirtualMachineScaleSetExtension, FROM.VirtualMachineScaleSetExtension>()
+                    .ForMember(c => c.Type1, o => o.MapFrom(r => r.Type));
+
             });
             _mapper = config.CreateMapper();
         }

src/Compute/Compute/Generated/Models/PSVirtualMachineScaleSet.cs

@@ -44,7 +44,6 @@ public string ResourceGroupName
         public Plan Plan { get; set; }
         public UpgradePolicy UpgradePolicy { get; set; }
         public AutomaticRepairsPolicy AutomaticRepairsPolicy { get; set; }
-        public VirtualMachineScaleSetVMProfile VirtualMachineProfile { get; set; }
         public string ProvisioningState { get; set; }
         public bool? Overprovision { get; set; }
         public bool? DoNotRunExtensionsOnOverprovisionedVMs { get; set; }

src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssAdditionalUnattendContentCommand.cs

@@ -78,7 +78,7 @@ private void Run()
             // VirtualMachineProfile
             if (this.VirtualMachineScaleSet.VirtualMachineProfile == null)
             {
-                this.VirtualMachineScaleSet.VirtualMachineProfile = new VirtualMachineScaleSetVMProfile();
+                this.VirtualMachineScaleSet.VirtualMachineProfile = new PSVirtualMachineScaleSetVMProfile();
             }
 
             // OsProfile

src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssDataDiskCommand.cs

@@ -108,7 +108,7 @@ private void Run()
             // VirtualMachineProfile
             if (this.VirtualMachineScaleSet.VirtualMachineProfile == null)
             {
-                this.VirtualMachineScaleSet.VirtualMachineProfile = new VirtualMachineScaleSetVMProfile();
+                this.VirtualMachineScaleSet.VirtualMachineProfile = new PSVirtualMachineScaleSetVMProfile();
             }
 
             // StorageProfile