Added flag IgnoreNodeMappings

Author: balukambala

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

@@ -28,14 +28,17 @@ public class RemoveAzureAutomationDscNodeConfiguration : AzureAutomationBaseCmdl
         /// Gets or sets the Configuration name.
         /// </summary>
         [Parameter(Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true,
-            HelpMessage = "The Node configuration name.")]
+            HelpMessage = "The node configuration name.")]
         [Alias("NodeConfigurationName")]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
-        [Parameter(Position = 3, HelpMessage = "Force confirmation of the removal of the Node configuration")]
+        [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")]
+        public SwitchParameter IgnoreNodeMappings { get; set; }
+
         /// <summary>
         /// Execute this cmdlet.
         /// </summary>
@@ -44,13 +47,14 @@ protected override void AutomationProcessRecord()
         {
             ConfirmAction(
                 Force.IsPresent,
-                string.Format(Resources.RemovingAzureAutomationResourceWarning, "DSC NodeConfiguration"),
-                string.Format(Resources.RemoveAzureAutomationResourceDescription, "DSC NodeConfiguration"),
+                string.Format(Resources.RemovingAzureAutomationResourceWarning, "DSC node configuration"),
+                string.Format(Resources.RemoveAzureAutomationResourceDescription, "DSC node configuration"),
                 Name,
                 () => this.AutomationClient.DeleteNodeConfiguration(
                     this.ResourceGroupName,
                     this.AutomationAccountName,
-                    this.Name));
+                    this.Name,
+                    IgnoreNodeMappings.IsPresent));
         }
     }
 }

src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj

@@ -63,7 +63,7 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.4.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Automation, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Management.Automation, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Automation.0.50.2-prerelease\lib\portable-net45+wp8+wpa81+win\Microsoft.Azure.Management.Automation.dll</HintPath>
     </Reference>

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

@@ -591,7 +591,7 @@ public Model.DscNode GetDscNodeById(
 
                 IEnumerable<AutomationManagement.Models.DscNode> dscNodes;
 
-                if (!String.IsNullOrEmpty(status))
+                if (!string.IsNullOrEmpty(status))
                 {
                     dscNodes = AutomationManagementClient.ContinuationTokenHandler(
                         skipToken =>
@@ -1285,17 +1285,31 @@ public Model.NodeConfiguration CreateNodeConfiguration(
             }
         }
 
-        public void DeleteNodeConfiguration(string resourceGroupName, string automationAccountName, string name)
+        public void DeleteNodeConfiguration(string resourceGroupName, string automationAccountName, string name, bool ignoreNodeMappings)
         {
             Requires.Argument("ResourceGroupName", resourceGroupName).NotNull();
             Requires.Argument("AutomationAccountName", automationAccountName).NotNull();
-            Requires.Argument("NodeConfigurationname", name).NotNull();
+            Requires.Argument("NodeConfigurationName", name).NotNull();
 
             using (var request = new RequestSettings(this.automationManagementClient))
             {
                 try
                 {
-                    this.automationManagementClient.NodeConfigurations.Delete(resourceGroupName, automationAccountName, name);
+                    if (ignoreNodeMappings)
+                    {
+                        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),
+                                string.Format(CultureInfo.CurrentCulture, Resources.CannotDeleteNodeConfiguration, name));
+                        }
+                    }
                 }
                 catch (CloudException cloudException)
                 {
@@ -1309,6 +1323,7 @@ public void DeleteNodeConfiguration(string resourceGroupName, string automationA
                 }
             }
         }
+
         #endregion
 
         #region dsc reports

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

@@ -63,7 +63,7 @@ public interface IAutomationClient
 
         NodeConfiguration CreateNodeConfiguration(string resourceGroupName, string automationAccountName, string sourcePath, string nodeConfiguraionName, bool overWrite);
 
-        void DeleteNodeConfiguration(string resourceGroupName, string automationAccountName, string name);
+        void DeleteNodeConfiguration(string resourceGroupName, string automationAccountName, string name, bool ignoreNodeMappings);
         #endregion
 
         #region Configurations

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

@@ -388,6 +388,10 @@
     <value>The Dsc Configuration was not found. Configuration name {0}.</value>
     <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>
+    <comment>Automation</comment>
+  </data>
   <data name="WebhookNotFound" xml:space="preserve">
     <value>The Webhook with Name: {0} was not found.</value>
     <comment>Automation</comment>