Merge pull request #11350 from hyonholee/march

isra-fel · web-flow · commit 6d3ec9725bc9 · 2020-03-20T15:23:22.000+08:00
[Compute] Fix AutomaticRepairsPolicy issue
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.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="33.0.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/VirtualMachineScaleSetProfileTests.ps1 b/src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetProfileTests.ps1
@@ -128,6 +128,9 @@ function Test-VirtualMachineScaleSetProfile
     # AdditionalCapabilities
     Assert-Null $vmss.VirtualMachineProfile.AdditionalCapabilities;
 
+    # AutomaticRepairsPolicy
+    Assert-Null $vmss.AutomaticRepairsPolicy;
+
     $extname2 = 'catextension';
     $publisher2 = 'Microsoft.AzureCAT.AzureEnhancedMonitoring';
     $exttype2 = 'AzureCATExtensionHandler';
@@ -150,12 +153,16 @@ function Test-VirtualMachineScaleSetProfile
     Assert-AreEqual $extname $vmss2.VirtualMachineProfile.ExtensionProfile.Extensions[1].ProvisionAfterExtensions[0];
 
     $vmss3 = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'Automatic' -DisableAutoRollback $true -EnableUltraSSD `
-                              -TerminateScheduledEvents -TerminateScheduledEventNotBeforeTimeoutInMinutes 15;
+                              -TerminateScheduledEvents -TerminateScheduledEventNotBeforeTimeoutInMinutes 15 `
+                              -EnableAutomaticRepair;
     Assert-True { $vmss3.UpgradePolicy.AutomaticOSUpgradePolicy.DisableAutomaticRollback };
     Assert-True { $vmss3.AdditionalCapabilities.UltraSSDEnabled };
     Assert-True { $vmss3.VirtualMachineProfile.ScheduledEventsProfile.TerminateNotificationProfile.Enable };
     Assert-AreEqual "PT15M" $vmss3.VirtualMachineProfile.ScheduledEventsProfile.TerminateNotificationProfile.NotBeforeTimeout;
 
+    # AutomaticRepairsPolicy
+    Assert-True { $vmss3.AutomaticRepairsPolicy.Enabled };
+
     $ppgid = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgname/providers/Microsoft.Compute/proximityPlacementGroups/ppgname"
     $vmss4 = New-AzVmssConfig -Location $loc -SkuCapacity $skuCapacity -SkuName $skuName -UpgradePolicyMode $upgradePolicy -ProximityPlacementGroupId $ppgid;
     Assert-Null $vmss4.Identity;
diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md
@@ -22,6 +22,7 @@
 * Set-AzVMAEMExtension, Get-AzVMAEMExtension, Remove-AzVMAEMExtension, Update-AzVMAEMExtension: Add support for new SAP Extension
 * Fix errors in examples of help document
 * Show the exact string value for VM PowerState in the table format.
+* New-AzVmssConfig does not create AutomaticRepairs property when it is disabled.
 
 ## Version 3.5.0
 * Allowed empty value for ProximityPlacementGroupId during update
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.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="33.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" />
diff --git a/src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs b/src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs
@@ -376,11 +376,14 @@ private void Run()
             }
             vUpgradePolicy.AutomaticOSUpgradePolicy.EnableAutomaticOSUpgrade = this.AutoOSUpgrade.IsPresent;
 
-            if (vAutomaticRepairsPolicy == null)
+            if (this.EnableAutomaticRepair.IsPresent)
             {
-                vAutomaticRepairsPolicy = new PSAutomaticRepairsPolicy();
+                if (vAutomaticRepairsPolicy == null)
+                {
+                    vAutomaticRepairsPolicy = new PSAutomaticRepairsPolicy();
+                }
+                vAutomaticRepairsPolicy.Enabled = this.EnableAutomaticRepair.IsPresent;
             }
-            vAutomaticRepairsPolicy.Enabled = this.EnableAutomaticRepair.IsPresent;
 
             if (this.IsParameterBound(c => c.AutomaticRepairGracePeriod))
             {
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.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="33.0.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.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="33.0.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/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="33.0.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.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="33.0.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" />

Original file line number	Diff line number	Diff line change
`@@ -376,11 +376,14 @@ private void Run()`
`376`	`376`	`}`
`377`	`377`	`vUpgradePolicy.AutomaticOSUpgradePolicy.EnableAutomaticOSUpgrade = this.AutoOSUpgrade.IsPresent;`
`378`	`378`
`379`		`- if (vAutomaticRepairsPolicy == null)`
	`379`	`+ if (this.EnableAutomaticRepair.IsPresent)`
`380`	`380`	`{`
`381`		`- vAutomaticRepairsPolicy = new PSAutomaticRepairsPolicy();`
	`381`	`+ if (vAutomaticRepairsPolicy == null)`
	`382`	`+ {`
	`383`	`+ vAutomaticRepairsPolicy = new PSAutomaticRepairsPolicy();`
	`384`	`+ }`
	`385`	`+ vAutomaticRepairsPolicy.Enabled = this.EnableAutomaticRepair.IsPresent;`
`382`	`386`	`}`
`383`		`- vAutomaticRepairsPolicy.Enabled = this.EnableAutomaticRepair.IsPresent;`
`384`	`387`
`385`	`388`	`if (this.IsParameterBound(c => c.AutomaticRepairGracePeriod))`
`386`	`389`	`{`