Add -WhatIf to Remove-AzureVM

Author: hyonholee

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/BVTTest.cs

@@ -379,6 +379,9 @@ public void AzureIaaSBVT()
                 //
                 // Remove-AzureVM
                 //
+                vmPowershellCmdlets.RemoveAzureVM(newAzureVMName, serviceName, false, true);
+                Assert.AreNotEqual(null, vmPowershellCmdlets.GetAzureVM(newAzureVMName, serviceName));
+
                 vmPowershellCmdlets.RemoveAzureVM(newAzureVMName, serviceName);
 
                 RecordTimeTaken(ref prevTime);

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/RemoveAzureVMCmdletInfo.cs

@@ -19,7 +19,7 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
 {
     public class RemoveAzureVMCmdletInfo : CmdletsInfo
     {
-        public RemoveAzureVMCmdletInfo(string vmName, string serviceName, bool deleteVhd)
+        public RemoveAzureVMCmdletInfo(string vmName, string serviceName, bool deleteVhd, bool whatif)
         {
             this.cmdletName = Utilities.RemoveAzureVMCmdletName;
             this.cmdletParams.Add(new CmdletParam("Name", vmName));
@@ -29,6 +29,11 @@ public RemoveAzureVMCmdletInfo(string vmName, string serviceName, bool deleteVhd
             {
                 this.cmdletParams.Add(new CmdletParam("DeleteVhd"));
             }
+
+            if (whatif)
+            {
+                this.cmdletParams.Add(new CmdletParam("WhatIf"));
+            }
         }
     }
 }

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs

@@ -1446,9 +1446,9 @@ public SM.PersistentVMRoleContext GetAzureVM(string vmName, string serviceName)
             return RunPSCmdletAndReturnFirst<SM.PersistentVMRoleContext>(new GetAzureVMCmdletInfo(vmName, serviceName));
         }
 
-        public ManagementOperationContext RemoveAzureVM(string vmName, string serviceName, bool deleteVhd = false)
+        public ManagementOperationContext RemoveAzureVM(string vmName, string serviceName, bool deleteVhd = false, bool whatif = false)
         {
-            return RunPSCmdletAndReturnFirst<ManagementOperationContext>(new RemoveAzureVMCmdletInfo(vmName, serviceName, deleteVhd));
+            return RunPSCmdletAndReturnFirst<ManagementOperationContext>(new RemoveAzureVMCmdletInfo(vmName, serviceName, deleteVhd, whatif));
         }
 
         public ManagementOperationContext StartAzureVM(string vmName, string serviceName)

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/RemoveAzureVM.cs

@@ -23,7 +23,7 @@
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS
 {
-    [Cmdlet(VerbsCommon.Remove, "AzureVM"), OutputType(typeof(ManagementOperationContext))]
+    [Cmdlet(VerbsCommon.Remove, "AzureVM", SupportsShouldProcess = true), OutputType(typeof(ManagementOperationContext))]
     public class RemoveAzureVMCommand : IaaSDeploymentManagementCmdletBase
     {
         [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The name of the role to remove.")]
@@ -43,38 +43,41 @@ public SwitchParameter DeleteVHD
 
         protected override void ExecuteCommand()
         {
-            ServiceManagementProfile.Initialize();
-
-            base.ExecuteCommand();
-            if (CurrentDeploymentNewSM == null)
+            if (this.ShouldProcess(String.Format("Service: {0},  VM: {1}", this.ServiceName, this.Name), Resources.RemoveAzureVMShouldProcessAction))
             {
-                return;
-            }
+                ServiceManagementProfile.Initialize();
 
-            DeploymentGetResponse deploymentGetResponse = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, DeploymentSlot.Production);
-            if (deploymentGetResponse.Roles.FirstOrDefault(r => r.RoleName.Equals(Name, StringComparison.InvariantCultureIgnoreCase)) == null)
-            {
-                throw new ArgumentOutOfRangeException(String.Format(Resources.RoleInstanceCanNotBeFoundWithName, Name));
-            }
+                base.ExecuteCommand();
+                if (CurrentDeploymentNewSM == null)
+                {
+                    return;
+                }
 
-            if (deploymentGetResponse.RoleInstances.Count > 1)
-            {
-                ExecuteClientActionNewSM(
-                    null,
-                    CommandRuntime.ToString(),
-                    () => this.ComputeClient.VirtualMachines.Delete(this.ServiceName, CurrentDeploymentNewSM.Name, Name, DeleteVHD.IsPresent));
-            }
-            else
-            {
-                if (deploymentGetResponse != null && !string.IsNullOrEmpty(deploymentGetResponse.ReservedIPName))
+                DeploymentGetResponse deploymentGetResponse = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, DeploymentSlot.Production);
+                if (deploymentGetResponse.Roles.FirstOrDefault(r => r.RoleName.Equals(Name, StringComparison.InvariantCultureIgnoreCase)) == null)
                 {
-                    WriteVerboseWithTimestamp(string.Format(Resources.ReservedIPNameNoLongerInUseByDeletingLastVMButStillBeingReserved, deploymentGetResponse.ReservedIPName));
+                    throw new ArgumentOutOfRangeException(String.Format(Resources.RoleInstanceCanNotBeFoundWithName, Name));
                 }
 
-                ExecuteClientActionNewSM<AzureOperationResponse>(
-                    null,
-                    CommandRuntime.ToString(),
-                    () => this.ComputeClient.Deployments.DeleteByName(this.ServiceName, CurrentDeploymentNewSM.Name, DeleteVHD.IsPresent));
+                if (deploymentGetResponse.RoleInstances.Count > 1)
+                {
+                    ExecuteClientActionNewSM(
+                        null,
+                        CommandRuntime.ToString(),
+                        () => this.ComputeClient.VirtualMachines.Delete(this.ServiceName, CurrentDeploymentNewSM.Name, Name, DeleteVHD.IsPresent));
+                }
+                else
+                {
+                    if (deploymentGetResponse != null && !string.IsNullOrEmpty(deploymentGetResponse.ReservedIPName))
+                    {
+                        WriteVerboseWithTimestamp(string.Format(Resources.ReservedIPNameNoLongerInUseByDeletingLastVMButStillBeingReserved, deploymentGetResponse.ReservedIPName));
+                    }
+
+                    ExecuteClientActionNewSM<AzureOperationResponse>(
+                        null,
+                        CommandRuntime.ToString(),
+                        () => this.ComputeClient.Deployments.DeleteByName(this.ServiceName, CurrentDeploymentNewSM.Name, DeleteVHD.IsPresent));
+                }
             }
         }
     }

src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs

@@ -753,4 +753,7 @@
     <value>Upload '{0}'</value>
     <comment>{0} is the name of an storage blob</comment>
   </data>
+  <data name="RemoveAzureVMShouldProcessAction" xml:space="preserve">
+    <value>Deleting VM</value>
+  </data>
 </root>