Merge pull request #11033 from hyonholee/february

[Compute] Allow empty value for ProximityPlacementGroupId during update
Azure · Feb 6, 2020 · 821b03f · 821b03f
2 parents 68a75f2 + 3e9e95b
commit 821b03f
Show file tree

Hide file tree

Showing 16 changed files with 4,190 additions and 3,243 deletions.
diff --git a/src/Compute/Compute.Test/Compute.Test.csproj b/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="31.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
   </ItemGroup>

diff --git a/src/Compute/Compute.Test/ScenarioTests/DedicatedHostTests.ps1 b/src/Compute/Compute.Test/ScenarioTests/DedicatedHostTests.ps1
@@ -190,6 +190,21 @@ function Test-DedicatedHostVirtualMachine
         Assert-AreEqual 1 $dedicatedHostGroup.Hosts.Count;
         Assert-AreEqual $dedicatedHostId $dedicatedHostGroup.Hosts[0].Id;
 
+        # Remove Host from VM
+        Stop-AzVM -ResourceGroupName $rgname -Name $vmName1 -Force;
+        $vm1.Host.Id = $null;
+        Update-AzVM -ResourceGroupName $rgname -VM $vm1;
+
+        $vm1 = Get-AzVM -ResourceGroupName $rgname -Name $vmname1;
+        Assert-Null $vm1.Host;
+        $dedicatedHost = Get-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName;
+        Assert-AreEqual 1 $dedicatedHost.VirtualMachines.Count;
+        Assert-AreEqual $vm0.Id $dedicatedHost.VirtualMachines[0].Id;
+
+        $dedicatedHostGroup = Get-AzHostGroup -ResourceGroupName $rgname -HostGroupName $hostGroupNam;
+        Assert-AreEqual 1 $dedicatedHostGroup.Hosts.Count;
+        Assert-AreEqual $dedicatedHostId $dedicatedHostGroup.Hosts[0].Id;
+
         Remove-AzVM -ResourceGroupName $rgname -Name $vmname1 -Force;
 
         $dedicatedHost = Get-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName;

diff --git a/src/Compute/Compute.Test/ScenarioTests/PPGTests.ps1 b/src/Compute/Compute.Test/ScenarioTests/PPGTests.ps1
@@ -299,6 +299,18 @@ function Test-ProximityPlacementGroupVM
         Assert-AreEqual $vm.Id $ppgStatus2.VirtualMachines[0].Id;
         Check-ColocationStatusUnknown $ppgStatus2.ColocationStatus;
 
+        Update-AzVM -ResourceGroupName $rgname -VM $vm -ProximityPlacementGroupId "";
+        $vm = Get-AzVM -ResourceGroupName $rgname -Name $vmName;
+        Assert-Null $vm.ProximityPlacementGroup.Id;
+
+        $ppg2 = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2;
+        Assert-AreEqual 0 $ppg2.VirtualMachines.Count;
+        Assert-Null $ppg2.ColocationStatus;
+
+        $ppgStatus2 =Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname2 -ColocationStatus;
+        Assert-AreEqual 0 $ppgStatus2.VirtualMachines.Count;
+        Check-ColocationStatus $ppgStatus2.ColocationStatus;
+
         Remove-AzVM -ResourceGroupName $rgname -Name $vmName -Force;
         $ppg = Get-AzProximityPlacementGroup -ResourceGroupName $rgname -Name $ppgname;
         Assert-Null $ppg.VirtualMachines;

diff --git a/...mmands.Compute.Test.ScenarioTests.DedicatedHostTests/TestDedicatedHostVirtualMachine.json b/...mmands.Compute.Test.ScenarioTests.DedicatedHostTests/TestDedicatedHostVirtualMachine.json
diff --git a/...essionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.PPGTests/TestPPGVM.json b/...essionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.PPGTests/TestPPGVM.json
diff --git a/src/Compute/Compute/AvailabilitySets/UpdateAzureAvailabilitySetCommand.cs b/src/Compute/Compute/AvailabilitySets/UpdateAzureAvailabilitySetCommand.cs
@@ -47,7 +47,7 @@ public class UpdateAzureAvailabilitySetCommand : AvailabilitySetBaseCmdlet
 
         [Parameter(
             Mandatory = false)]
-        [ValidateNotNullOrEmpty]
+        [AllowEmptyString]
         public string ProximityPlacementGroupId { get; set; }
 
         [Parameter(
@@ -79,6 +79,11 @@ public override void ExecuteCmdlet()
                                                 : this.AvailabilitySet.ProximityPlacementGroup
                     };
 
+                    if (avSetParams.ProximityPlacementGroup != null && string.IsNullOrEmpty(avSetParams.ProximityPlacementGroup.Id))
+                    {
+                        avSetParams.ProximityPlacementGroup.Id = null;
+                    }
+
                     var result = this.AvailabilitySetClient.CreateOrUpdateWithHttpMessagesAsync(
                         this.AvailabilitySet.ResourceGroupName,
                         this.AvailabilitySet.Name,

diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md
@@ -19,6 +19,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Allow empty value for ProximityPlacementGroupId during update
 
 ## Version 3.4.0
 * Limit the number of VM status to 100 to avoid throttling when Get-AzVM -Status is performed without VM name.

diff --git a/src/Compute/Compute/Compute.csproj b/src/Compute/Compute/Compute.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.1.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" />

diff --git a/src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs b/src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs
@@ -251,7 +251,7 @@ public override void ExecuteCmdlet()
 
         [Parameter(
             Mandatory = false)]
-        [ValidateNotNullOrEmpty]
+        [AllowEmptyString]
         public string ProximityPlacementGroupId { get; set; }
 
         [Parameter(
@@ -1096,6 +1096,13 @@ private void BuildPatchObject()
                 this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile.OsDisk.VhdContainers = this.VhdContainer;
             }
 
+            if (this.VirtualMachineScaleSetUpdate != null
+                && this.VirtualMachineScaleSetUpdate.ProximityPlacementGroup != null
+                && string.IsNullOrEmpty(this.VirtualMachineScaleSetUpdate.ProximityPlacementGroup.Id))
+            {
+                this.VirtualMachineScaleSetUpdate.ProximityPlacementGroup.Id = null;
+            }
+
             if (this.VirtualMachineScaleSetUpdate != null
                 && this.VirtualMachineScaleSetUpdate.VirtualMachineProfile != null
                 && this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.OsProfile != null
@@ -1699,6 +1706,13 @@ private void BuildPutObject()
                 this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.OsDisk.VhdContainers = this.VhdContainer;
             }
 
+            if (this.VirtualMachineScaleSet != null
+                && this.VirtualMachineScaleSet.ProximityPlacementGroup != null
+                && string.IsNullOrEmpty(this.VirtualMachineScaleSet.ProximityPlacementGroup.Id))
+            {
+                this.VirtualMachineScaleSet.ProximityPlacementGroup.Id = null;
+            }
+
             if (this.VirtualMachineScaleSet != null
                 && this.VirtualMachineScaleSet.VirtualMachineProfile != null
                 && this.VirtualMachineScaleSet.VirtualMachineProfile.OsProfile != null

diff --git a/src/Compute/Compute/VirtualMachine/Operation/UpdateAzureVMCommand.cs b/src/Compute/Compute/VirtualMachine/Operation/UpdateAzureVMCommand.cs
@@ -109,7 +109,7 @@ public class UpdateAzureVMCommand : VirtualMachineBaseCmdlet
 
         [Parameter(
             Mandatory = false)]
-        [ValidateNotNullOrEmpty]
+        [AllowEmptyString]
         public string ProximityPlacementGroupId { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
@@ -158,6 +158,16 @@ public override void ExecuteCmdlet()
                         Priority = this.VM.Priority
                     };
 
+                    if (parameters.Host != null && string.IsNullOrWhiteSpace(parameters.Host.Id))
+                    {
+                        parameters.Host.Id = null;
+                    }
+
+                    if (parameters.ProximityPlacementGroup != null && string.IsNullOrWhiteSpace(parameters.ProximityPlacementGroup.Id))
+                    {
+                        parameters.ProximityPlacementGroup.Id = null;
+                    }
+
                     if (this.IsParameterBound(c => c.IdentityType))
                     {
                         parameters.Identity = new VirtualMachineIdentity(null, null, this.IdentityType, null);

diff --git a/src/Compute/Compute/help/New-AzDiskEncryptionSet.md b/src/Compute/Compute/help/New-AzDiskEncryptionSet.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # New-AzDiskEncryptionSet
 
 ## SYNOPSIS
-Creates a disk encryption key.
+Creates a disk encryption set.
 
 ## SYNTAX
 
@@ -18,7 +18,7 @@ New-AzDiskEncryptionSet [-ResourceGroupName] <String> [-Name] <String> [-InputOb
 ```
 
 ## DESCRIPTION
-Creates a disk encryption key.
+Creates a disk encryption set.
 
 ## EXAMPLES
 

diff --git a/src/Compute/Compute/help/Update-AzDiskEncryptionSet.md b/src/Compute/Compute/help/Update-AzDiskEncryptionSet.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzDiskEncryptionSet
 
 ## SYNOPSIS
-Updates a disk encryption key.
+Updates a disk encryption set.
 
 ## SYNTAX
 
@@ -34,7 +34,7 @@ Update-AzDiskEncryptionSet [-InputObject] <PSDiskEncryptionSet> [-KeyUrl <String
 ```
 
 ## DESCRIPTION
-Updates a disk encryption key.
+Updates a disk encryption set.
 
 ## EXAMPLES
 

diff --git a/src/Network/Network.Test/Network.Test.csproj b/src/Network/Network.Test/Network.Test.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Redis" Version="4.4.1" />
     <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.19.0-preview" />

diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj b/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.1-preview" />

diff --git a/...veryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj b/...veryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.3.0" />

diff --git a/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj b/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.0.0-preview" />