name fix

Author: matyang222

src/Network/Network/Generated/LoadBalancer/NewAzureRMLoadBalancerCommand.cs

@@ -247,7 +247,7 @@ public override void Execute()
                 }
             }
 
-            List<string> resourceIds = new List<string>();
+            List<string> resourceIdsRequiringAuthToken = new List<string>();
             Dictionary<string, List<string>> auxAuthHeader = null;
 
             // Get aux token for each gateway lb references
@@ -256,15 +256,20 @@ public override void Execute()
                 if (frontend.GatewayLoadBalancer != null)
                 {
                     //Get the aux header for the remote vnet
-                    resourceIds.Add(frontend.GatewayLoadBalancer.Id);
-                    var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
-                    if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
-                    {
-                        auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
-                    }
+                    resourceIdsRequiringAuthToken.Add(frontend.GatewayLoadBalancer.Id);
+                }
+            }
+
+            if (resourceIdsRequiringAuthToken.Count > 0)
+            {
+                var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIdsRequiringAuthToken);
+                if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
+                {
+                    auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
                 }
             }
 
+
             ConfirmAction(
                 Force.IsPresent,
                 string.Format(Properties.Resources.OverwritingResource, Name),

src/Network/Network/Generated/LoadBalancer/SetAzureRMLoadBalancerCommand.cs

@@ -138,11 +138,15 @@ public override void Execute()
                 {
                     //Get the aux header for the remote vnet
                     resourceIds.Add(frontend.GatewayLoadBalancer.Id);
-                    var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
-                    if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
-                    {
-                        auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
-                    }
+                }
+            }
+
+            if (resourceIds.Count > 0)
+            {
+                var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
+                if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
+                {
+                    auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
                 }
             }
 

src/Network/Network/NetworkInterface/NewAzureNetworkInterfaceCommand.cs

@@ -437,7 +437,7 @@ private PSNetworkInterface CreateNetworkInterface()
                 networkInterface.NetworkSecurityGroup.Id = this.NetworkSecurityGroupId;
             }
 
-            List<string> resourceIds = new List<string>();
+            List<string> resourceIdsRequiringAuthToken = new List<string>();
             Dictionary<string, List<string>> auxAuthHeader = null;
 
             // Get aux token for each gateway lb references
@@ -446,12 +446,16 @@ private PSNetworkInterface CreateNetworkInterface()
                 if (ipConfiguration.GatewayLoadBalancer != null)
                 {
                     //Get the aux header for the remote vnet
-                    resourceIds.Add(ipConfiguration.GatewayLoadBalancer.Id);
-                    var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
-                    if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
-                    {
-                        auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
-                    }
+                    resourceIdsRequiringAuthToken.Add(ipConfiguration.GatewayLoadBalancer.Id);
+                }
+            }
+
+            if (resourceIdsRequiringAuthToken.Count > 0)
+            {
+                var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIdsRequiringAuthToken);
+                if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
+                {
+                    auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
                 }
             }
 

src/Network/Network/NetworkInterface/SetAzureNetworkInterfaceCommand.cs

@@ -44,7 +44,7 @@ public override void Execute()
                 throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
             }
 
-            List<string> resourceIds = new List<string>();
+            List<string> resourceIdsRequiringAuthToken = new List<string>();
             Dictionary<string, List<string>> auxAuthHeader = null;
 
             foreach (var ipconfig in NetworkInterface.IpConfigurations)
@@ -59,12 +59,16 @@ public override void Execute()
                 if (ipconfig.GatewayLoadBalancer != null)
                 {
                     //Get the aux header for the remote vnet
-                    resourceIds.Add(ipconfig.GatewayLoadBalancer.Id);
-                    var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
-                    if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
-                    {
-                        auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
-                    }
+                    resourceIdsRequiringAuthToken.Add(ipconfig.GatewayLoadBalancer.Id);
+                }
+            }
+
+            if (resourceIdsRequiringAuthToken.Count > 0)
+            {
+                var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIdsRequiringAuthToken);
+                if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
+                {
+                    auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
                 }
             }