report model update3

Author: avkaur

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

@@ -47,8 +47,8 @@ public class ImportAzureAutomationDscNodeConfiguration : AzureAutomationBaseCmdl
         /// Gets or sets the configuration name for the node configuration.
         /// </summary>
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The name of the DSC Configuration to import the Node Configuration under. All Node Configurations in Azure Automation must exist under a Configuration. The name of the Configuration will become the namespace of the imported Node Configuration, in the form of 'ConfigurationName.MofFileName'")]
-        [Alias("NodeConfigurationName")]
-        public string Name { get; set; }
+        [Alias("ConfigurationName")]
+        public string ConfigName { get; set; }
 
 
         /// <summary>
@@ -71,7 +71,7 @@ public override void ExecuteCmdlet()
                     this.ResourceGroupName,
                     this.AutomationAccountName,
                     this.SourcePath,
-                    this.Name,
+                    this.ConfigName,
                     this.Force);
 
             this.WriteObject(nodeConfiguration);

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

@@ -1065,6 +1065,22 @@ public Model.CompilationJob StartCompilationJob(string resourceGroupName, string
         #endregion
 
         #region node configuration
+        public Model.NodeConfiguration TryGetNodeConfiguration(string resourceGroupName, string automationAccountName, string nodeConfigurationName, string rollupStatus)
+        {
+            using (var request = new RequestSettings(this.automationManagementClient))
+            {
+                try
+                {
+                    return GetNodeConfiguration(resourceGroupName, automationAccountName, nodeConfigurationName, rollupStatus);
+                }
+                catch (ResourceNotFoundException resourceNotFoundException)
+                {
+                    Console.Write(resourceNotFoundException.Message);
+                    return null;
+                }                
+            }
+        }
+
         public Model.NodeConfiguration GetNodeConfiguration(string resourceGroupName, string automationAccountName, string nodeConfigurationName, string rollupStatus)
         {
             using (var request = new RequestSettings(this.automationManagementClient))
@@ -1164,23 +1180,24 @@ public Model.NodeConfiguration CreateNodeConfiguration(
             string resourceGroupName,
             string automationAccountName,
             string sourcePath,
-            string nodeConfigurationName,
+            string configurationName,
             bool overWrite)
         {
             using (var request = new RequestSettings(this.automationManagementClient))
             {
                 Requires.Argument("ResourceGroupName", resourceGroupName).NotNullOrEmpty();
                 Requires.Argument("AutomationAccountName", automationAccountName).NotNullOrEmpty();
                 Requires.Argument("SourcePath", sourcePath).NotNullOrEmpty();
-                Requires.Argument("nodeConfigurationName", nodeConfigurationName).NotNullOrEmpty();
+                Requires.Argument("configurationName", configurationName).NotNullOrEmpty();
 
                 string fileContent = null;
-                string configurationName = null;
+                string nodeConfigurationName = null;
                 string nodeName = null;
 
                 if (File.Exists(Path.GetFullPath(sourcePath)))
                 {
                     fileContent = System.IO.File.ReadAllText(sourcePath);
+                    nodeConfigurationName = configurationName + "." + System.IO.Path.GetFileNameWithoutExtension(sourcePath);
                 }
                 else
                 {
@@ -1190,35 +1207,9 @@ public Model.NodeConfiguration CreateNodeConfiguration(
                                             CultureInfo.CurrentCulture,
                                             Resources.ConfigurationSourcePathInvalid));
                 }
-
-                try
-                {
-                    int index = nodeConfigurationName.IndexOf(".");
-                    if (index > 0)
-                    {
-                        nodeName = nodeConfigurationName.Substring(0, index);
-                        int configNameStartIndex = index + 1;
-                        int configNameLenght = nodeConfigurationName.Length - index -1;
-                        configurationName = nodeConfigurationName.Substring(configNameStartIndex, configNameLenght);
-                    }
-                    else
-                    {
-                        throw new ArgumentException(string.Format(
-                                            CultureInfo.CurrentCulture,
-                                            Resources.NodeConfigurationNameInvalid));
-                    }
-                }
-                 catch (Exception)
-                {
-                    // exception in getting the config name from configurationName
-                    throw new ArgumentException(
-                                        string.Format(
-                                            CultureInfo.CurrentCulture,
-                                            Resources.NodeConfigurationNameInvalid));
-                }
-
+                
                  // if node configuration already exists, ensure overwrite flag is specified
-                var nodeConfigurationModel = this.GetNodeConfiguration(
+                var nodeConfigurationModel = this.TryGetNodeConfiguration(
                     resourceGroupName,
                     automationAccountName,
                     nodeConfigurationName,