|
18 | 18 | using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
|
19 | 19 | using Microsoft.Azure.Management.Network;
|
20 | 20 | using System.Net;
|
| 21 | +using System.Collections; |
| 22 | +using System.Collections.Generic; |
21 | 23 | using Microsoft.Azure.Management.Network.Models;
|
22 | 24 |
|
23 | 25 | namespace Microsoft.Azure.Commands.Network
|
@@ -67,24 +69,35 @@ public PSNetworkSecurityGroup GetNetworkSecurityGroup(string resourceGroupName,
|
67 | 69 | // Temporary - to be removed
|
68 | 70 | public void NullifyApplicationSecurityGroupsIfAbsent(NetworkSecurityGroup nsg)
|
69 | 71 | {
|
70 |
| - if (nsg ==null || nsg.SecurityRules == null) |
| 72 | + if (nsg == null) |
71 | 73 | {
|
72 | 74 | return;
|
73 | 75 | }
|
74 | 76 |
|
75 |
| - foreach (var rule in nsg.SecurityRules) |
76 |
| - { |
77 |
| - if (rule.SourceApplicationSecurityGroups != null && rule.SourceApplicationSecurityGroups.Count == 0) |
78 |
| - { |
79 |
| - rule.SourceApplicationSecurityGroups = null; |
80 |
| - } |
81 |
| - |
82 |
| - if (rule.DestinationApplicationSecurityGroups != null && rule.DestinationApplicationSecurityGroups.Count == 0) |
83 |
| - { |
84 |
| - rule.DestinationApplicationSecurityGroups = null; |
85 |
| - } |
86 |
| - } |
87 |
| - } |
| 77 | + this.NullifyApplicationSecurityRulesIfAbsent(nsg.DefaultSecurityRules); |
| 78 | + this.NullifyApplicationSecurityRulesIfAbsent(nsg.SecurityRules); |
| 79 | + } |
| 80 | + |
| 81 | + public void NullifyApplicationSecurityRulesIfAbsent(IList<SecurityRule> rules) |
| 82 | + { |
| 83 | + if (rules == null) |
| 84 | + { |
| 85 | + return; |
| 86 | + } |
| 87 | + |
| 88 | + foreach (var rule in rules) |
| 89 | + { |
| 90 | + if (rule.SourceApplicationSecurityGroups != null && rule.SourceApplicationSecurityGroups.Count == 0) |
| 91 | + { |
| 92 | + rule.SourceApplicationSecurityGroups = null; |
| 93 | + } |
| 94 | + |
| 95 | + if (rule.DestinationApplicationSecurityGroups != null && rule.DestinationApplicationSecurityGroups.Count == 0) |
| 96 | + { |
| 97 | + rule.DestinationApplicationSecurityGroups = null; |
| 98 | + } |
| 99 | + } |
| 100 | + } |
88 | 101 |
|
89 | 102 | public PSNetworkSecurityGroup ToPsNetworkSecurityGroup(NetworkSecurityGroup nsg)
|
90 | 103 | {
|
|
0 commit comments