Merge pull request Azure#4932 from vrdmr/vameru-import-dscnodeconfiguration-fix

Fixed the import issue when importing a DSC Node Configuration

Author: markcowl

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

@@ -79,12 +79,20 @@ public override void ExecuteCmdlet()
             {
                 var nodeName = System.IO.Path.GetFileNameWithoutExtension(Path);
                 var nodeConfigurationName = ConfigurationName + "." + nodeName;
+                NodeConfiguration nodeConfigurationModel = null;
 
-                // if node configuration already exists, ensureuser knows about it.
-                var nodeConfigurationModel = AutomationClient.GetNodeConfiguration(ResourceGroupName,
-                    AutomationAccountName,
-                    nodeConfigurationName,
-                    null);
+                try
+                {
+                    // if node configuration already exists, ensureuser knows about it.
+                    nodeConfigurationModel = AutomationClient.GetNodeConfiguration(ResourceGroupName,
+                        AutomationAccountName,
+                        nodeConfigurationName,
+                        null);
+                }
+                catch (ResourceNotFoundException)
+                {
+                    nodeConfigurationModel = null;
+                }
 
                 if (nodeConfigurationModel != null && !IncrementNodeConfigurationBuild.IsPresent)
                 {