Merge pull request Azure#360 from Azure/net440fix

Fixes for NIC and NSG

Author: markcowl

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

@@ -77,6 +77,23 @@ public PSNetworkInterface GetScaleSetNetworkInterface(string resourceGroupName,
             return psNetworkInterface;
         }
 
+		public void NullifyApplicationSecurityGroupIfAbsent(NetworkInterface nic)
+		{
+			if (nic == null || nic.IpConfigurations == null)
+			{
+				return;
+			}
+
+			// Temporary - to be removed
+			foreach (var ipconfigModel in nic.IpConfigurations)
+			{
+				if (ipconfigModel.ApplicationSecurityGroups != null && ipconfigModel.ApplicationSecurityGroups.Count == 0)
+				{
+					ipconfigModel.ApplicationSecurityGroups = null;
+				}
+			}
+		}
+
         public PSNetworkInterface ToPsNetworkInterface(NetworkInterface nic)
         {
             var psNic = Mapper.Map<PSNetworkInterface>(nic);

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

@@ -419,7 +419,9 @@ private PSNetworkInterface CreateNetworkInterface()
 
             var networkInterfaceModel = Mapper.Map<MNM.NetworkInterface>(networkInterface);
 
-            networkInterfaceModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
+			this.NullifyApplicationSecurityGroupIfAbsent(networkInterfaceModel);
+
+			networkInterfaceModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
 
             this.NetworkInterfaceClient.CreateOrUpdate(this.ResourceGroupName, this.Name, networkInterfaceModel);
 

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

@@ -52,7 +52,10 @@ public override void Execute()
 
             // Map to the sdk object
             var networkInterfaceModel = Mapper.Map<MNM.NetworkInterface>(this.NetworkInterface);
-            networkInterfaceModel.Tags = TagsConversionHelper.CreateTagDictionary(this.NetworkInterface.Tag, validate: true);
+
+			this.NullifyApplicationSecurityGroupIfAbsent(networkInterfaceModel);
+
+			networkInterfaceModel.Tags = TagsConversionHelper.CreateTagDictionary(this.NetworkInterface.Tag, validate: true);
 
             this.NetworkInterfaceClient.CreateOrUpdate(this.NetworkInterface.ResourceGroupName, this.NetworkInterface.Name, networkInterfaceModel);
 

src/ResourceManager/Network/Commands.Network/NetworkSecurityGroup/NetworkSecurityGroupBaseCmdlet.cs

@@ -18,6 +18,8 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
 using System.Net;
+using System.Collections;
+using System.Collections.Generic;
 using Microsoft.Azure.Management.Network.Models;
 
 namespace Microsoft.Azure.Commands.Network
@@ -64,6 +66,39 @@ public PSNetworkSecurityGroup GetNetworkSecurityGroup(string resourceGroupName,
             return psNetworkSecurityGroup;
         }
 
+		// Temporary - to be removed
+		public void NullifyApplicationSecurityGroupsIfAbsent(NetworkSecurityGroup nsg)
+		{
+			if (nsg == null)
+			{
+				return;
+			}
+
+            this.NullifyApplicationSecurityRulesIfAbsent(nsg.DefaultSecurityRules);
+            this.NullifyApplicationSecurityRulesIfAbsent(nsg.SecurityRules);
+        }
+
+        public void NullifyApplicationSecurityRulesIfAbsent(IList<SecurityRule> rules)
+        {
+            if (rules == null)
+            {
+                return;
+            }
+
+            foreach (var rule in rules)
+            {
+                if (rule.SourceApplicationSecurityGroups != null && rule.SourceApplicationSecurityGroups.Count == 0)
+                {
+                    rule.SourceApplicationSecurityGroups = null;
+                }
+
+                if (rule.DestinationApplicationSecurityGroups != null && rule.DestinationApplicationSecurityGroups.Count == 0)
+                {
+                    rule.DestinationApplicationSecurityGroups = null;
+                }
+            }
+        }
+
         public PSNetworkSecurityGroup ToPsNetworkSecurityGroup(NetworkSecurityGroup nsg)
         {
             var psNsg = Mapper.Map<PSNetworkSecurityGroup>(nsg);

src/ResourceManager/Network/Commands.Network/NetworkSecurityGroup/NewAzureNetworkSecurityGroupCommand.cs

@@ -94,7 +94,10 @@ private PSNetworkSecurityGroup CreateNetworkSecurityGroup()
 
             // Map to the sdk object
             var nsgModel = Mapper.Map<MNM.NetworkSecurityGroup>(nsg);
-            nsgModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
+
+			this.NullifyApplicationSecurityGroupsIfAbsent(nsgModel);
+
+			nsgModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
 
             // Execute the Create NetworkSecurityGroup call
             this.NetworkSecurityGroupClient.CreateOrUpdate(this.ResourceGroupName, this.Name, nsgModel);

src/ResourceManager/Network/Commands.Network/NetworkSecurityGroup/SetAzureNetworkSecurityGroupCommand.cs

@@ -42,7 +42,10 @@ public override void Execute()
 
             // Map to the sdk object
             var nsgModel = Mapper.Map<MNM.NetworkSecurityGroup>(this.NetworkSecurityGroup);
-            nsgModel.Tags = TagsConversionHelper.CreateTagDictionary(this.NetworkSecurityGroup.Tag, validate: true);
+
+			this.NullifyApplicationSecurityGroupsIfAbsent(nsgModel);
+
+			nsgModel.Tags = TagsConversionHelper.CreateTagDictionary(this.NetworkSecurityGroup.Tag, validate: true);
 
             // Execute the PUT NetworkSecurityGroup call
             this.NetworkSecurityGroupClient.CreateOrUpdate(this.NetworkSecurityGroup.ResourceGroupName, this.NetworkSecurityGroup.Name, nsgModel);