Skip to content

Commit 79a92f6

Browse files
committed
Update New-AzVmss for AutomaticRepairsPolicy issue.
1 parent abb87b6 commit 79a92f6

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetProfileTests.ps1

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ function Test-VirtualMachineScaleSetProfile
128128
# AdditionalCapabilities
129129
Assert-Null $vmss.VirtualMachineProfile.AdditionalCapabilities;
130130

131+
# AutomaticRepairsPolicy
132+
Assert-Null $vmss.AutomaticRepairsPolicy;
133+
131134
$extname2 = 'catextension';
132135
$publisher2 = 'Microsoft.AzureCAT.AzureEnhancedMonitoring';
133136
$exttype2 = 'AzureCATExtensionHandler';
@@ -150,12 +153,16 @@ function Test-VirtualMachineScaleSetProfile
150153
Assert-AreEqual $extname $vmss2.VirtualMachineProfile.ExtensionProfile.Extensions[1].ProvisionAfterExtensions[0];
151154

152155
$vmss3 = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'Automatic' -DisableAutoRollback $true -EnableUltraSSD `
153-
-TerminateScheduledEvents -TerminateScheduledEventNotBeforeTimeoutInMinutes 15;
156+
-TerminateScheduledEvents -TerminateScheduledEventNotBeforeTimeoutInMinutes 15 `
157+
-EnableAutomaticRepair;
154158
Assert-True { $vmss3.UpgradePolicy.AutomaticOSUpgradePolicy.DisableAutomaticRollback };
155159
Assert-True { $vmss3.AdditionalCapabilities.UltraSSDEnabled };
156160
Assert-True { $vmss3.VirtualMachineProfile.ScheduledEventsProfile.TerminateNotificationProfile.Enable };
157161
Assert-AreEqual "PT15M" $vmss3.VirtualMachineProfile.ScheduledEventsProfile.TerminateNotificationProfile.NotBeforeTimeout;
158162

163+
# AutomaticRepairsPolicy
164+
Assert-True { $vmss3.AutomaticRepairsPolicy.Enabled };
165+
159166
$ppgid = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgname/providers/Microsoft.Compute/proximityPlacementGroups/ppgname"
160167
$vmss4 = New-AzVmssConfig -Location $loc -SkuCapacity $skuCapacity -SkuName $skuName -UpgradePolicyMode $upgradePolicy -ProximityPlacementGroupId $ppgid;
161168
Assert-Null $vmss4.Identity;

src/Compute/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
## Upcoming Release
2222
* Fix errors in examples of help document
2323
* Show the exact string value for VM PowerState in the table format.
24+
* New-AzVmssConfig does not create AutomaticRepairs property when it is disabled.
2425

2526
## Version 3.5.0
2627
* Allowed empty value for ProximityPlacementGroupId during update

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,11 +376,14 @@ private void Run()
376376
}
377377
vUpgradePolicy.AutomaticOSUpgradePolicy.EnableAutomaticOSUpgrade = this.AutoOSUpgrade.IsPresent;
378378

379-
if (vAutomaticRepairsPolicy == null)
379+
if (this.EnableAutomaticRepair.IsPresent)
380380
{
381-
vAutomaticRepairsPolicy = new PSAutomaticRepairsPolicy();
381+
if (vAutomaticRepairsPolicy == null)
382+
{
383+
vAutomaticRepairsPolicy = new PSAutomaticRepairsPolicy();
384+
}
385+
vAutomaticRepairsPolicy.Enabled = this.EnableAutomaticRepair.IsPresent;
382386
}
383-
vAutomaticRepairsPolicy.Enabled = this.EnableAutomaticRepair.IsPresent;
384387

385388
if (this.IsParameterBound(c => c.AutomaticRepairGracePeriod))
386389
{

0 commit comments

Comments
 (0)