Merge branch 'dev' of https://github.com/psap/azure-powershell into dev

Author: balukambala

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

@@ -59,6 +59,13 @@ public class GetAzureAutomationDscNode : AzureAutomationBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string NodeConfigurationName { get; set; }
 
+        /// <summary>
+        /// Gets or sets the configuration name.
+        /// </summary>
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByConfigurationName, Mandatory = true, HelpMessage = "The configuration name.")]
+        [ValidateNotNullOrEmpty]
+        public string ConfigurationName { get; set; }
+
         /// <summary>
         /// Execute this cmdlet.
         /// </summary>
@@ -90,6 +97,14 @@ public override void ExecuteCmdlet()
                     this.NodeConfigurationName,
                     this.Status);
             }
+            else if (this.ParameterSetName == AutomationCmdletParameterSets.ByConfigurationName)
+            {
+                ret = this.AutomationClient.ListDscNodesByConfiguration(
+                    this.ResourceGroupName,
+                    this.AutomationAccountName,
+                    this.ConfigurationName,
+                    this.Status);
+            }
             else
             {
                 // ByAll

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

@@ -459,7 +459,46 @@ public Model.DscNode GetDscNodeById(
 
             return dscNodes.Select(dscNode => new Model.DscNode(resourceGroupName, automationAccountName, dscNode));
         }
-        
+
+        public IEnumerable<Model.DscNode> ListDscNodesByConfiguration(
+            string resourceGroupName,
+            string automationAccountName,
+            string configurationName,
+            string status)
+        {
+            Requires.Argument("ResourceGroupName", resourceGroupName).NotNull();
+            Requires.Argument("AutomationAccountName", automationAccountName).NotNull();
+            Requires.Argument("ConfigurationName", configurationName).NotNull();
+
+            IEnumerable<Model.DscNode> listOfNodes = Enumerable.Empty<Model.DscNode>();
+            
+            // first get the list of node configurations for the given configuration
+            IEnumerable<Model.NodeConfiguration> listOfNodeConfigurations = this.EnumerateNodeConfigurationsByConfigurationName(
+                resourceGroupName,
+                automationAccountName,
+                configurationName);
+
+             IEnumerable<Model.DscNode> listOfNodesForGivenNodeConfiguration;
+
+            // for each nodeconfiguration, get the list of nodes and concatenate
+            foreach (var nodeConfiguration in listOfNodeConfigurations)
+            {
+                listOfNodesForGivenNodeConfiguration =
+                    this.ListDscNodesByNodeConfiguration(
+                        resourceGroupName,
+                        automationAccountName,
+                        nodeConfiguration.Name, 
+                        status);
+
+                if (listOfNodesForGivenNodeConfiguration != null)
+                {
+                    listOfNodes = listOfNodes.Concat(listOfNodesForGivenNodeConfiguration);
+                }
+            }
+
+            return listOfNodes;
+        }
+
         public IEnumerable<Model.DscNode> ListDscNodes(
             string resourceGroupName,
             string automationAccountName,
@@ -890,6 +929,37 @@ public Model.NodeConfiguration GetNodeConfiguration(string resourceGroupName, st
             }
         }
 
+        /// <summary>
+        /// Enumerate the list of NodeConfigurations for given configuration - without any rollup status
+        /// </summary>
+        /// <param name="resourceGroupName">Resource group name</param>
+        /// <param name="automationAccountName">Automation account</param>
+        /// <param name="configurationName">Name of configuration</param>
+        /// <returns>List of NodeConfigurations</returns>
+        private IEnumerable<Model.NodeConfiguration> EnumerateNodeConfigurationsByConfigurationName(string resourceGroupName, string automationAccountName, string configurationName)
+        {
+            using (var request = new RequestSettings(this.automationManagementClient))
+            {
+                IEnumerable<AutomationManagement.Models.DscNodeConfiguration> nodeConfigModels;
+
+                nodeConfigModels = AutomationManagementClient.ContinuationTokenHandler(
+                    skipToken =>
+                    {
+                        var response = this.automationManagementClient.NodeConfigurations.List(
+                            resourceGroupName,
+                            automationAccountName,
+                            new AutomationManagement.Models.DscNodeConfigurationListParameters
+                            {
+                                ConfigurationName = configurationName
+                            });
+                        return new ResponseWithSkipToken<AutomationManagement.Models.DscNodeConfiguration>(response, response.DscNodeConfigurations);
+                    });
+
+
+                return nodeConfigModels.Select(nodeConfigModel => new Commands.Automation.Model.NodeConfiguration(automationAccountName, nodeConfigModel));
+            }
+        }
+
         #endregion
 
         #region privatemethods

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

@@ -90,6 +90,11 @@ public interface IAutomationClient
         IEnumerable<DscNode> ListDscNodesByName(string resourceGroupName, string automationAccountName, string nodeName, string status);
         IEnumerable<DscNode> ListDscNodesByNodeConfiguration(string resourceGroupName, string automationAccountName, string nodeConfigurationName, string status);
 
+        IEnumerable<DscNode> ListDscNodesByConfiguration(
+            string resourceGroupName,
+            string automationAccountName,
+            string configurationName,
+            string status);
         DscNode SetDscNodeById(string resourceGroupName, string automationAccountName, Guid nodeId, string nodeConfigurationName, bool force);
 
         void DeleteDscNode(string resourceGroupName, string automationAccountName, Guid nodeId);