Fix piping issue for Remove-AzureVMDataDisk

 and Remove-AzureVMNetworkInterface

Author: unknown

src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachine.cs

@@ -33,6 +33,7 @@ public string ResourceGroupName
         {
             get
             {
+                if (string.IsNullOrEmpty(Id)) return null;
                 Regex r = new Regex(@"(.*?)/resourcegroups/(?<rgname>\S+)/providers/(.*?)", RegexOptions.IgnoreCase);
                 Match m = r.Match(Id);
                 return m.Success ? m.Groups["rgname"].Value : null;
@@ -134,5 +135,37 @@ public string StorageProfileText
         {
             get { return JsonConvert.SerializeObject(StorageProfile, Formatting.Indented); }
         }
+
+        [JsonIgnore]
+        public string [] DataDiskNames
+        {
+            get
+            {
+                if (this.StorageProfile == null) return null;
+
+                var dataDiskNames = new List<string>();
+                foreach (var disk in StorageProfile.DataDisks)
+                {
+                    dataDiskNames.Add(disk.Name);
+                }
+                return dataDiskNames.ToArray();
+            }
+        }
+
+        [JsonIgnore]
+        public string[] NicIds
+        {
+            get
+            {
+                if (this.NetworkProfile == null) return null;
+
+                var nicIds = new List<string>();
+                foreach (var nic in NetworkProfile.NetworkInterfaces)
+                {
+                    nicIds.Add(nic.ReferenceUri);
+                }
+                return nicIds.ToArray();
+            }
+        }
     }
 }

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/RemoveAzureVMDataDiskCommand.cs

@@ -38,13 +38,14 @@ public class RemoveAzureVMDataDiskCommand : AzurePSCmdlet
         [ValidateNotNullOrEmpty]
         public PSVirtualMachine VM { get; set; }
 
+        [Alias("Name")]
         [Parameter(
             Mandatory = true,
             Position = 1,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = HelpMessages.VMDataDiskName)]
         [ValidateNotNullOrEmpty]
-        public string Name { get; set; }
+        public string [] DataDiskNames { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -54,7 +55,10 @@ public override void ExecuteCmdlet()
             {
                 var disks = storageProfile.DataDisks.ToList();
                 var comp = StringComparison.OrdinalIgnoreCase;
-                disks.RemoveAll(d => string.Equals(d.Name, this.Name, comp));
+                foreach (var diskName in DataDiskNames)
+                {
+                    disks.RemoveAll(d => string.Equals(d.Name, diskName, comp));
+                }
                 storageProfile.DataDisks = disks;
             }
 

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/RemoveAzureVMNetworkInterfaceCommand.cs

@@ -41,30 +41,35 @@ public class RemoveAzureVMNetworkInterfaceCommand : AzurePSCmdlet
         [ValidateNotNullOrEmpty]
         public PSVirtualMachine VM { get; set; }
 
-        [Alias("NicId", "NetworkInterfaceId")]
+        [Alias("Id", "NetworkInterfaceId")]
         [Parameter(
             Mandatory = true,
             Position = 1,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = HelpMessages.VMNetworkInterfaceID)]
         [ValidateNotNullOrEmpty]
-        public string Id { get; set; }
+        public string [] NicIds { get; set; }
 
         public override void ExecuteCmdlet()
         {
             var networkProfile = this.VM.NetworkProfile;
 
-            if (networkProfile != null && networkProfile.NetworkInterfaces != null && networkProfile.NetworkInterfaces.Any(nic => string.Equals(nic.ReferenceUri, this.Id, StringComparison.OrdinalIgnoreCase)))
+            foreach (var id in this.NicIds)
             {
-                var nicReference = networkProfile.NetworkInterfaces.First(nic => string.Equals(nic.ReferenceUri, this.Id, StringComparison.OrdinalIgnoreCase));
-                networkProfile.NetworkInterfaces.Remove(nicReference);
-
-                if (!networkProfile.NetworkInterfaces.Any())
+                if (networkProfile != null &&
+                    networkProfile.NetworkInterfaces != null &&
+                    networkProfile.NetworkInterfaces.Any(nic =>
+                        string.Equals(nic.ReferenceUri, id, StringComparison.OrdinalIgnoreCase)))
                 {
-                    networkProfile = null;
+                    var nicReference = networkProfile.NetworkInterfaces.First(nic => string.Equals(nic.ReferenceUri, id, StringComparison.OrdinalIgnoreCase));
+                    networkProfile.NetworkInterfaces.Remove(nicReference);
                 }
             }
 
+            if (!networkProfile.NetworkInterfaces.Any())
+            {
+                networkProfile = null;
+            }
             this.VM.NetworkProfile = networkProfile;
 
             WriteObject(this.VM);