Deleting node config if there is no mapping also without switch parameter

Author: balukambala

src/ResourceManager/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationDscNodeConfiguration.cs

@@ -36,7 +36,7 @@ public class RemoveAzureAutomationDscNodeConfiguration : AzureAutomationBaseCmdl
         [Parameter(Position = 3, HelpMessage = "Force confirmation of the removal of the node configuration")]
         public SwitchParameter Force { get; set; }
 
-        [Parameter(Position = 4, HelpMessage = "Delete even if the node configuration is mapped to a node")]
+        [Parameter(Position = 4, HelpMessage = "Remove the node configuration even if the node configuration is mapped to one or more nodes")]
         public SwitchParameter IgnoreNodeMappings { get; set; }
 
         /// <summary>

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClientDSC.cs

@@ -1297,18 +1297,21 @@ public void DeleteNodeConfiguration(string resourceGroupName, string automationA
                 {
                     if (ignoreNodeMappings)
                     {
-                        this.automationManagementClient.NodeConfigurations.Delete(resourceGroupName, automationAccountName,
-                            name);
+                        this.automationManagementClient.NodeConfigurations.Delete(resourceGroupName, automationAccountName, name);
                     }
                     else
                     {
                         var nodeList = this.ListDscNodesByNodeConfiguration(resourceGroupName, automationAccountName, name, null);
                         if (nodeList.Any())
                         {
-                            throw new ResourceNotFoundException(
-                                typeof(Model.NodeConfiguration),
+                            throw new ResourceCommonException(
+                                typeof (Model.NodeConfiguration),
                                 string.Format(CultureInfo.CurrentCulture, Resources.CannotDeleteNodeConfiguration, name));
                         }
+                        else
+                        {
+                            this.automationManagementClient.NodeConfigurations.Delete(resourceGroupName, automationAccountName, name);
+                        }
                     }
                 }
                 catch (CloudException cloudException)

src/ResourceManager/Automation/Commands.Automation/Properties/Resources.Designer.cs

@@ -389,7 +389,7 @@
     <comment>Automation</comment>
   </data>
   <data name="CannotDeleteNodeConfiguration" xml:space="preserve">
-    <value>The Node configuration is mapped a node. Specify IgnoreNodeMappings to delete the node configuration {0}.</value>
+    <value>The node configuration '{0}' is currently assigned to one or more nodes. Either specify the IgnoreNodeMappings parameter, or reassign these nodes to a different node configuration, to delete this node configuration.</value>
     <comment>Automation</comment>
   </data>
   <data name="WebhookNotFound" xml:space="preserve">