report model update2

Author: avkaur

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

@@ -46,15 +46,15 @@ public class ImportAzureAutomationDscNodeConfiguration : AzureAutomationBaseCmdl
         /// <summary>
         /// 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'")]
+        [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 ConfigurationName { get; set; }
+        public string Name { get; set; }
 
 
         /// <summary>
         /// Gets or sets switch parameter to confirm overwriting of existing configurations.
         /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "Forces the command to overwrite an existing configuration.")]
+        [Parameter(Mandatory = false, HelpMessage = "Forces the command to overwrite an existing Node Configuration.")]
         public SwitchParameter Force
         {
             get { return this.overwriteExistingConfiguration; }
@@ -71,7 +71,7 @@ public override void ExecuteCmdlet()
                     this.ResourceGroupName,
                     this.AutomationAccountName,
                     this.SourcePath,
-                    this.ConfigurationName,
+                    this.Name,
                     this.Force);
 
             this.WriteObject(nodeConfiguration);

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

@@ -1169,25 +1169,22 @@ public Model.NodeConfiguration CreateNodeConfiguration(
         {
             using (var request = new RequestSettings(this.automationManagementClient))
             {
-                Requires.Argument("ResourceGroupName", resourceGroupName).NotNull();
-                Requires.Argument("AutomationAccountName", automationAccountName).NotNull();
-                Requires.Argument("SourcePath", sourcePath).NotNull();
-                Requires.Argument("nodeConfigurationName", nodeConfigurationName).NotNull();
+                Requires.Argument("ResourceGroupName", resourceGroupName).NotNullOrEmpty();
+                Requires.Argument("AutomationAccountName", automationAccountName).NotNullOrEmpty();
+                Requires.Argument("SourcePath", sourcePath).NotNullOrEmpty();
+                Requires.Argument("nodeConfigurationName", nodeConfigurationName).NotNullOrEmpty();
 
                 string fileContent = null;
                 string configurationName = null;
                 string nodeName = null;
 
-                try
+                if (File.Exists(Path.GetFullPath(sourcePath)))
                 {
-                    if (File.Exists(Path.GetFullPath(sourcePath)))
-                    {
-                        fileContent = System.IO.File.ReadAllText(sourcePath);
-                    }
+                    fileContent = System.IO.File.ReadAllText(sourcePath);
                 }
-                catch (Exception)
+                else
                 {
-                    // exception in accessing the file path
+                    // file path not valid.
                     throw new FileNotFoundException(
                                         string.Format(
                                             CultureInfo.CurrentCulture,
@@ -1196,21 +1193,25 @@ public Model.NodeConfiguration CreateNodeConfiguration(
 
                 try
                 {
-                    var configuration = nodeConfigurationName.Split('.');
-                    if(configuration.Length == 2)
+                    int index = nodeConfigurationName.IndexOf(".");
+                    if (index > 0)
                     {
-                        configurationName = configuration[0];
-                        nodeName = configuration[1];
+                        nodeName = nodeConfigurationName.Substring(0, index);
+                        int configNameStartIndex = index + 1;
+                        int configNameLenght = nodeConfigurationName.Length - index -1;
+                        configurationName = nodeConfigurationName.Substring(configNameStartIndex, configNameLenght);
                     }
                     else
                     {
-                        throw new Exception();
+                        throw new ArgumentException(string.Format(
+                                            CultureInfo.CurrentCulture,
+                                            Resources.NodeConfigurationNameInvalid));
                     }
                 }
                  catch (Exception)
                 {
-                    // exception in getting the config name from NodeConfigName
-                    throw new FileNotFoundException(
+                    // exception in getting the config name from configurationName
+                    throw new ArgumentException(
                                         string.Format(
                                             CultureInfo.CurrentCulture,
                                             Resources.NodeConfigurationNameInvalid));
@@ -1490,17 +1491,16 @@ private IDictionary<string, string> ProcessConfigurationParameters(string resour
         {
             parameters = parameters ?? new Dictionary<string, string>();
             var filteredParameters = new Dictionary<string,string>();
-            foreach (var configParameter in parameters.Keys)
+            foreach (var key in parameters.Keys)
             {                
                 try
                 {
-                    filteredParameters.Add(configParameter.ToString(), Newtonsoft.Json.JsonConvert.SerializeObject(parameters[configParameter]));
+                    filteredParameters.Add(key.ToString(), Newtonsoft.Json.JsonConvert.SerializeObject(parameters[key]));
                 }
                 catch (JsonSerializationException)
                 {
-                    throw new ArgumentException(
-                    string.Format(
-                        CultureInfo.CurrentCulture, Resources.ConfigurationParameterCannotBeSerializedToJson, configParameter.ToString()));
+                    throw new ArgumentException(string.Format(
+                        CultureInfo.CurrentCulture, Resources.ConfigurationParameterCannotBeSerializedToJson, key.ToString()));
                 }             
             }
             return filteredParameters;

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

@@ -73,6 +73,24 @@ public ArgumentRequirements<T> NotNull()
 
                 return this;
             }
+
+            /// <summary>
+            /// Checks argument value for not null or empty
+            /// </summary>
+            /// <returns>The not null requirement</returns>
+            public ArgumentRequirements<T> NotNullOrEmpty()
+            {
+                if (this.Value == null)
+                {
+                    throw new ArgumentNullException(this.Name);
+                }
+                else if (string.IsNullOrEmpty(this.Value.ToString()))
+                {
+                    throw new ArgumentNullException(this.Name);
+                }
+
+                return this;
+            }
         }
     }
 }

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

@@ -415,7 +415,7 @@
     <comment>Automation</comment>
   </data>
   <data name="NodeConfigurationNameInvalid" xml:space="preserve">
-    <value>Invalid node configuration name. Please specify in the format &lt;node name&gt;.&lt;config name&gt;</value>
+    <value>Invalid node configuration name. Please specify in the format &lt;config name&gt;.&lt;node name&gt;</value>
     <comment>Automation</comment>
   </data>
 </root>