Fix forceRerun parameter to accept any string.

hyonholee · hyonholee · commit 2b1885815cfe · 2016-03-22T18:28:37.000-07:00
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
@@ -64,7 +64,7 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Compute, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1
@@ -1382,7 +1382,10 @@ function Test-VirtualMachineExtensionWithSwitch
         # Set extension settings by raw strings
         $settingstr = '{"fileUris":[],"commandToExecute":""}';
         $protectedsettingstr = '{"storageAccountName":"' + $stoname + '","storageAccountKey":"' + $stokey + '"}';
-        Set-AzureRmVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -ExtensionType $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr -DisableAutoUpgradeMinorVersion -ForceRerun
+        Set-AzureRmVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname `
+            -Name $extname -Publisher $publisher `
+            -ExtensionType $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr `
+            -DisableAutoUpgradeMinorVersion -ForceRerun "RerunExtension";
 
         # Get VM Extension
         $ext = Get-AzureRmVMExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname;
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/packages.config b/src/ResourceManager/Compute/Commands.Compute.Test/packages.config
@@ -6,7 +6,7 @@
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Graph.RBAC" version="1.9.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Compute" version="12.0.0-prerelease" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Compute" version="12.0.1-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Network" version="3.3.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5896.19355-prerelease" targetFramework="net45" />
diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
@@ -77,7 +77,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Compute, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.0-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.12.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/SetAzureVMExtensionCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/SetAzureVMExtensionCommand.cs
@@ -134,7 +134,8 @@ public class SetAzureVMExtensionCommand : VirtualMachineExtensionBaseCmdlet
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Force re-run even if extension configuration has not changed")]
-        public SwitchParameter ForceRerun { get; set; }
+        [ValidateNotNullOrEmpty]
+        public string ForceRerun { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -161,7 +162,7 @@ public override void ExecuteCmdlet()
                     Settings = this.Settings,
                     ProtectedSettings = this.ProtectedSettings,
                     AutoUpgradeMinorVersion = !this.DisableAutoUpgradeMinorVersion.IsPresent,
-                    ForceUpdateTag = (this.ForceRerun.IsPresent) ? ForceUpdateTagTypes.RerunExtension : (ForceUpdateTagTypes?) null
+                    ForceUpdateTag = this.ForceRerun
                 };
 
                 var op = this.VirtualMachineExtensionClient.CreateOrUpdateWithHttpMessagesAsync(
diff --git a/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineExtension.cs b/src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineExtension.cs
@@ -59,7 +59,7 @@ public string SubStatusesText
             get { return JsonConvert.SerializeObject(SubStatuses, Formatting.Indented); }
         }
         public bool? AutoUpgradeMinorVersion { get; set; }
-        public ForceUpdateTagTypes? ForceUpdateTag { get; set; }
+        public string ForceUpdateTag { get; set; }
     }
 
     public static class PSVirtualMachineExtensionConversions
diff --git a/src/ResourceManager/Compute/Commands.Compute/packages.config b/src/ResourceManager/Compute/Commands.Compute/packages.config
@@ -9,7 +9,7 @@
   <package id="Microsoft.Azure.Graph.RBAC" version="1.9.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Compute" version="12.0.0-prerelease" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Compute" version="12.0.1-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Network" version="3.3.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public string SubStatusesText`
`59`	`59`	`get { return JsonConvert.SerializeObject(SubStatuses, Formatting.Indented); }`
`60`	`60`	`}`
`61`	`61`	`public bool? AutoUpgradeMinorVersion { get; set; }`
`62`		`- public ForceUpdateTagTypes? ForceUpdateTag { get; set; }`
	`62`	`+ public string ForceUpdateTag { get; set; }`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public static class PSVirtualMachineExtensionConversions`