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

Author: huangpf

src/ServiceManagement/Compute/Commands.ServiceManagement/Helpers/PersistentVMHelper.cs

@@ -117,6 +117,27 @@ public static RoleNamesCollection GetRoleNames(IList<RoleInstance> roleInstanceL
             return roleNamesCollection;
         }
 
+        // Return the list of role names that match any of the given query.
+        public static RoleNamesCollection GetRoleNames(IList<RoleInstance> roleInstanceList, string[] roleNameQueries)
+        {
+            List<string> distinctRoleNameList = new List<string>();
+
+            foreach (var roleNameQuery in roleNameQueries)
+            {
+                var unionResult = distinctRoleNameList.Union(GetRoleNames(roleInstanceList, roleNameQuery));
+                distinctRoleNameList = unionResult.Distinct(StringComparer.OrdinalIgnoreCase).ToList();
+            }
+
+            var roleNamesCollection = new RoleNamesCollection();
+
+            foreach (var roleName in distinctRoleNameList)
+            {
+                roleNamesCollection.Add(roleName);
+            }
+
+            return roleNamesCollection;
+        }
+
         public static Collection<ConfigurationSet> MapConfigurationSets(IList<Management.Compute.Models.ConfigurationSet> configurationSets)
         {
             var result = new Collection<ConfigurationSet>();

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/StartAzureVM.cs

@@ -29,12 +29,12 @@ public class StartAzureVMCommand : IaaSDeploymentManagementCmdletBase
     {
         [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The name of the Virtual Machine to start.", ParameterSetName = "ByName")]
         [ValidateNotNullOrEmpty]
-        public string Name { get; set; }
+        public string[] Name { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The Virtual Machine to restart.", ParameterSetName = "Input")]
         [ValidateNotNullOrEmpty]
         [Alias("InputObject")]
-        public PersistentVM VM { get; set; }
+        public PersistentVM[] VM { get; set; }
 
         protected override void ExecuteCommand()
         {
@@ -47,11 +47,11 @@ protected override void ExecuteCommand()
                 return;
             }
 
-            string roleName = (this.ParameterSetName == "ByName") ? this.Name : this.VM.RoleName;
-            
+            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.RoleName).ToArray();
+
             // Generate a list of role names matching wildcard patterns or
             // the exact name specified in the -Name parameter.
-            var roleNames = PersistentVMHelper.GetRoleNames(this.CurrentDeploymentNewSM.RoleInstances, roleName);
+            var roleNames = PersistentVMHelper.GetRoleNames(this.CurrentDeploymentNewSM.RoleInstances, inputRoleNames);
 
             // Insure at least one of the role name instances can be found.
             if ((roleNames == null) || (!roleNames.Any()))

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/StopAzureVM.cs

@@ -12,16 +12,17 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Management.Automation;
+using Microsoft.Azure;
 using Microsoft.WindowsAzure.Commands.ServiceManagement.Helpers;
 using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Microsoft.WindowsAzure.Management.Compute;
 using Microsoft.WindowsAzure.Management.Compute.Models;
-using Microsoft.Azure;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Management.Automation;
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS
 {
@@ -30,12 +31,12 @@ public class StopAzureVMCommand : IaaSDeploymentManagementCmdletBase
     {
         [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The name of the Virtual Machine to stop.", ParameterSetName = "ByName")]
         [ValidateNotNullOrEmpty]
-        public string Name { get; set; }
+        public string[] Name { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The Virtual Machine to restart.", ParameterSetName = "Input")]
         [ValidateNotNullOrEmpty]
         [Alias("InputObject")]
-        public Model.PersistentVM VM { get; set; }
+        public Model.PersistentVM[] VM { get; set; }
 
         [Parameter(Position = 2, HelpMessage = "Keeps the VM provisioned")]
         public SwitchParameter StayProvisioned { get; set; }
@@ -53,11 +54,11 @@ protected override void ExecuteCommand()
                 return;
             }
 
-            string roleName = (this.ParameterSetName == "ByName") ? this.Name : this.VM.RoleName;
+            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.RoleName).ToArray();
 
             // Generate a list of role names matching regular expressions or
             // the exact name specified in the -Name parameter.
-            var roleNames = PersistentVMHelper.GetRoleNames(this.CurrentDeploymentNewSM.RoleInstances, roleName);
+            var roleNames = PersistentVMHelper.GetRoleNames(this.CurrentDeploymentNewSM.RoleInstances, inputRoleNames);
 
             // Insure at least one of the role name instances can be found.
             if ((roleNames == null) || (!roleNames.Any()))
@@ -66,7 +67,7 @@ protected override void ExecuteCommand()
             }
 
             // Insure the Force switch is specified for wildcard operations when StayProvisioned is not specified.
-            if (WildcardPattern.ContainsWildcardCharacters(roleName) && (!this.StayProvisioned.IsPresent) && (!this.Force.IsPresent))
+            if (roleNames.Any(r => WildcardPattern.ContainsWildcardCharacters(r)) && (!this.StayProvisioned.IsPresent) && (!this.Force.IsPresent))
             {
                 throw new ArgumentException(Resources.MustSpecifyForceParameterWhenUsingWildcards);
             }
@@ -93,7 +94,7 @@ protected override void ExecuteCommand()
                     {
                         this.ConfirmAction(false,
                             Resources.DeploymentVIPLossWarning,
-                            string.Format(Resources.DeprovisioningVM, roleName),
+                            string.Format(Resources.DeprovisioningVM, string.Join(", ", roleNames)),
                             String.Empty,
                             () => this.ExecuteClientActionNewSM(
                                 null,
@@ -149,7 +150,7 @@ protected override void ExecuteCommand()
                     {
                         this.ConfirmAction(false,
                             Resources.DeploymentVIPLossWarning,
-                            string.Format(Resources.DeprovisioningVM, roleName),
+                            string.Format(Resources.DeprovisioningVM, string.Join(", ", roleNames)),
                             String.Empty,
                             () => this.ExecuteClientActionNewSM(
                                 null,