display script action bug fix

Author: Shefali

src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj

@@ -83,6 +83,7 @@
     <Compile Include="Models\Management\AzureHDInsightMetastore.cs" />
     <Compile Include="ManagementCommands\NewAzureHDInsightClusterCommand.cs" />
     <Compile Include="ClusterConfigurationUtils.cs" />
+    <Compile Include="Models\Management\AzureHDInsightScriptAction.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/AddAzureHDInsightScriptActionCommand.cs

@@ -17,6 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
+using Microsoft.Azure.Commands.HDInsight.Models.Management;
 using Microsoft.Azure.Management.HDInsight.Models;
 
 namespace Microsoft.Azure.Commands.HDInsight
@@ -27,7 +28,7 @@ namespace Microsoft.Azure.Commands.HDInsight
     OutputType(typeof(AzureHDInsightConfig))]
     public class AddAzureHDInsightScriptActionCommand : HDInsightCmdletBase
     {
-        private ScriptAction _action;
+        private AzureHDInsightScriptAction _action;
         #region Input Parameter Definitions
 
         [Parameter(Position = 0,
@@ -55,12 +56,11 @@ public Uri Uri
             HelpMessage = "The name of the action.")]
         public string Name
         {
-            get { return _action.Name; }
-            set { _action.Name = value; }
+            get { return _action.ActionName; }
+            set { _action.ActionName = value; }
         }
 
         [Parameter(Position = 4,
-            Mandatory = true,
             HelpMessage = "The parameters for the action.")]
         public string Parameters
         {
@@ -72,12 +72,12 @@ public string Parameters
 
         public AddAzureHDInsightScriptActionCommand()
         {
-            _action = new ScriptAction();
+            _action = new AzureHDInsightScriptAction();
         }
 
         protected override void ProcessRecord()
         {
-            List<ScriptAction> actions;
+            List<AzureHDInsightScriptAction> actions;
 
             if (Config.ScriptActions.TryGetValue(NodeType, out actions))
             {
@@ -86,7 +86,7 @@ protected override void ProcessRecord()
             }
             else
             {
-                Config.ScriptActions.Add(NodeType, new List<ScriptAction> {_action});
+                Config.ScriptActions.Add(NodeType, new List<AzureHDInsightScriptAction> { _action });
             }
 
             WriteObject(Config);

src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/NewAzureHDInsightClusterCommand.cs

@@ -19,6 +19,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
+using Microsoft.Azure.Commands.HDInsight.Models.Management;
 using Microsoft.Azure.Management.HDInsight.Models;
 using Microsoft.WindowsAzure.Commands.Common;
 
@@ -103,7 +104,7 @@ public string DefaultStorageAccountKey
         public Dictionary<string, Dictionary<string, string>> Configurations { get; private set; }
 
         [Parameter(HelpMessage = "Gets config actions for the cluster.")]
-        public Dictionary<ClusterNodeType, List<ScriptAction>> ScriptActions { get; private set; }
+        public Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions { get; private set; }
 
         [Parameter(HelpMessage = "Gets or sets the StorageContainer for the default Azure Storage Account.")]
         public string DefaultStorageContainer
@@ -213,7 +214,7 @@ var storageAccount in
                 }
                 foreach (var action in parameters.ScriptActions.Where(action => result.ScriptActions.ContainsKey(action.Key)))
                 {
-                    result.ScriptActions.Add(action.Key, action.Value);
+                    result.ScriptActions.Add(action.Key, action.Value.Select(a => new AzureHDInsightScriptAction(a)).ToList());
                 }
                 return result;
             }
@@ -240,7 +241,7 @@ var storageAccount in
                 }
                 foreach (var action in value.ScriptActions.Where(action => parameters.ScriptActions.ContainsKey(action.Key)))
                 {
-                    parameters.ScriptActions.Add(action.Key, action.Value);
+                    parameters.ScriptActions.Add(action.Key, action.Value.Select(a => a.GetScriptActionFromPSModel()).ToList());
                 }
             } 
         }
@@ -253,7 +254,7 @@ public NewAzureHDInsightClusterCommand()
             parameters = new ClusterCreateParameters();
             AdditionalStorageAccounts = new Dictionary<string, string>();
             Configurations = new Dictionary<string, Dictionary<string, string>>();
-            ScriptActions = new Dictionary<ClusterNodeType, List<ScriptAction>>();
+            ScriptActions = new Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>>();
         }
 
         protected override void ProcessRecord()
@@ -293,7 +294,8 @@ var storageAccount in
             }
             foreach (var action in ScriptActions.Where(action => parameters.ScriptActions.ContainsKey(action.Key)))
             {
-                parameters.ScriptActions.Add(action.Key, action.Value);
+                parameters.ScriptActions.Add(action.Key,
+                    action.Value.Select(a => a.GetScriptActionFromPSModel()).ToList());
             }
             if (OozieMetastore != null)
             {

src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightConfig.cs

@@ -14,6 +14,7 @@
 
 using System.Collections;
 using System.Collections.Generic;
+using Microsoft.Azure.Commands.HDInsight.Models.Management;
 using Microsoft.Azure.Management.HDInsight.Models;
 
 namespace Microsoft.Azure.Commands.HDInsight.Models
@@ -73,14 +74,14 @@ public class AzureHDInsightConfig
         /// <summary>
         /// Gets config actions for the cluster.
         /// </summary>
-        public Dictionary<ClusterNodeType, List<ScriptAction>> ScriptActions { get; private set; }
+        public Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions { get; private set; }
 
         public AzureHDInsightConfig()
         {
             ClusterType = HDInsightClusterType.Hadoop;
             AdditionalStorageAccounts = new Dictionary<string, string>();
             Configurations = new Dictionary<string, Hashtable>();
-            ScriptActions = new Dictionary<ClusterNodeType, List<ScriptAction>>();
+            ScriptActions = new Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>>();
         }
     }
 }

src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightScriptAction.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Net.PeerToPeer.Collaboration;
+using Microsoft.Azure.Management.HDInsight.Models;
+
+namespace Microsoft.Azure.Commands.HDInsight.Models.Management
+{
+    public class AzureHDInsightScriptAction
+    {
+        public AzureHDInsightScriptAction(ScriptAction action)
+        {
+            ActionName = action.Name;
+            Uri = action.Uri;
+            Parameters = action.Parameters;
+        }
+
+        public AzureHDInsightScriptAction()
+        {
+        }
+
+        public ScriptAction GetScriptActionFromPSModel()
+        {
+            var param = "";
+            if (Parameters != null)
+            {
+                param = Parameters;
+            }
+            return new ScriptAction(ActionName, Uri, param);
+        }
+
+        public string ActionName { get; set; }
+
+        public Uri Uri { get; set; }
+
+        public string Parameters { get; set; }
+    }
+}