apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 10731: reverting changes for source cidr for portforwading and loadbalancing rules

Browse Source
This commit is contained in:
Abhinandan Prateek 2011-08-09 16:05:20 +05:30 committed by root
parent 33b3e02c17
commit f24e14d2d9
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -144,9 +144,6 @@ public class VirtualRoutingResource implements Manager {
command.add("-p ", rule.getStringSrcPortRange());
command.add("-r ", rule.getDstIp());
command.add("-d ", rule.getStringDstPortRange());
if (rule.getSourceCidrs() != null && rule.getSourceCidrs().size() > 0){
command.add(" -s " + rule.getStringSourceCidrs());
}
result = command.execute();
results[i++] = (!(result == null || result.isEmpty())) ? "Failed" : null;
}

4
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -1250,9 +1250,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
args.append(" -p ").append(rule.getStringSrcPortRange());
args.append(" -r ").append(rule.getDstIp());
args.append(" -d ").append(rule.getStringDstPortRange());
if (rule.getSourceCidrs() != null && rule.getSourceCidrs().size() > 0){
args.append(" -s " + rule.getStringSourceCidrs());
}
String result = callHostPlugin(conn, "vmops", "setFirewallRule", "args", args.toString());
results[i++] = (result == null || result.isEmpty()) ? "Failed" : null;

6
core/src/com/cloud/network/HAProxyConfigurator.java
View File

@ -254,12 +254,6 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
StringBuilder sb = new StringBuilder();
sb.append(lbTO.getSrcIp()).append(":");
sb.append(lbTO.getSrcPort()).append(":");
if (lbTO.getSourceCidrs() != null && lbTO.getSourceCidrs().size() > 0){
sb.append(lbTO.getStringSourceCidrs()).append(":");
}
else {
sb.append("0/0:");
}
String lbRuleEntry = sb.toString();
if (!lbTO.isRevoked()) {
toAdd.add(lbRuleEntry);