etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VPC: CS-15791 - allow having the same NetworkACL for 2 different protocols

This commit is contained in:
Alena Prokharchyk 2012-08-01 15:25:00 -07:00
parent 204b6e6ad9
commit 751ebce589
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
View File

@ -225,8 +225,8 @@ public class NetworkACLManagerImpl implements Manager,NetworkACLManager{
"network conflicts so we should at least have one rule at this point.";
for (FirewallRuleVO rule : rules) {
if (rule.getId() == newRule.getId()) {
continue; // Skips my own rule.
if (rule.getId() == newRule.getId() || !rule.getProtocol().equalsIgnoreCase(newRule.getProtocol())) {
continue; // Skips my own rule and skip the rule if the protocol is different
}
// if one cidr overlaps another, do port veirficatino