Merge branch 'VMScaleSet' into ExpressRoute

Author: deepakswifty

src/ResourceManager/Network/Commands.Network/NetworkInterface/GetAzureNetworkInterfaceCommand.cs

@@ -31,29 +31,63 @@ public class GetAzureNetworkInterfaceCommand : NetworkInterfaceBaseCmdlet
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource name.")]
         [ValidateNotNullOrEmpty]
-        public virtual string Name { get; set; }
+        public string Name { get; set; }
 
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource group name.")]
         [ValidateNotNullOrEmpty]
-        public virtual string ResourceGroupName { get; set; }
+        public string ResourceGroupName { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Virtual Machine Scale Set Name.",
+            ParameterSetName = "ScaleSetNic")]
+        [ValidateNotNullOrEmpty]
+        public string VirtualMachineScaleSetName { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Virtual Machine Index.",
+            ParameterSetName = "ScaleSetNic")]
+        [ValidateNotNullOrEmpty]
+        public string VirtualMachineIndex { get; set; }
 
         protected override void ProcessRecord()
         {
             base.ProcessRecord();
 
             if (!string.IsNullOrEmpty(this.Name))
             {
-                var networkInterface = this.GetNetworkInterface(this.ResourceGroupName, this.Name);
+                PSNetworkInterface networkInterface;
+
+                if (ParameterSetName.Equals("ScaleSetNic"))
+                {
+                    networkInterface = this.GetScaleSetNetworkInterface(this.ResourceGroupName, this.VirtualMachineScaleSetName, this.VirtualMachineIndex, this.Name);
+                }
+                else
+                {
+                    networkInterface = this.GetNetworkInterface(this.ResourceGroupName, this.Name);
+                }
 
                 WriteObject(networkInterface);
             }
             else if (!string.IsNullOrEmpty(this.ResourceGroupName))
             {
-                var getNetworkInterfaceResponse = this.NetworkInterfaceClient.List(this.ResourceGroupName);
+                var getNetworkInterfaceResponse = new MNM.NetworkInterfaceListResponse();
 
+                if (ParameterSetName.Equals("ScaleSetNic"))
+                {
+                    getNetworkInterfaceResponse = this.NetworkInterfaceClient.ListVirtualMachineScaleSetNetworkInterfaces(this.ResourceGroupName, this.VirtualMachineScaleSetName);
+                }
+                else
+                {
+                    getNetworkInterfaceResponse = this.NetworkInterfaceClient.List(this.ResourceGroupName);
+                }
+                
                 var psNetworkInterfaces = new List<PSNetworkInterface>();
 
                 foreach (var nic in getNetworkInterfaceResponse.NetworkInterfaces)

src/ResourceManager/Network/Commands.Network/NetworkInterface/NetworkInterfaceBaseCmdlet.cs

@@ -63,11 +63,18 @@ public PSNetworkInterface GetNetworkInterface(string resourceGroupName, string n
             networkInterface.ResourceGroupName = resourceGroupName;
             networkInterface.Tag =
                 TagsConversionHelper.CreateTagHashtable(getNetworkInterfaceResponse.NetworkInterface.Tags);
-            
-            if (networkInterface.IpConfigurations[0].PublicIpAddress == null)
-            {
-                networkInterface.IpConfigurations[0].PublicIpAddress = new PSResourceId();
-            }
+
+            return networkInterface;
+        }
+
+        public PSNetworkInterface GetScaleSetNetworkInterface(string resourceGroupName, string scaleSetName, string vmIndex, string name)
+        {
+            var getNetworkInterfaceResponse = this.NetworkInterfaceClient.GetVirtualMachineScaleSetNetworkInterface(resourceGroupName, scaleSetName, vmIndex, name);
+
+            var networkInterface = Mapper.Map<PSNetworkInterface>(getNetworkInterfaceResponse.NetworkInterface);
+            networkInterface.ResourceGroupName = resourceGroupName;
+            networkInterface.Tag =
+                TagsConversionHelper.CreateTagHashtable(getNetworkInterfaceResponse.NetworkInterface.Tags);
 
             return networkInterface;
         }