From f24e14d2d9ae55d7b60b7c2a3327f66b43bdda41 Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Tue, 9 Aug 2011 16:05:20 +0530 Subject: [PATCH] bug 10731: reverting changes for source cidr for portforwading and loadbalancing rules --- .../resource/virtualnetwork/VirtualRoutingResource.java | 3 --- .../cloud/hypervisor/xen/resource/CitrixResourceBase.java | 4 +--- core/src/com/cloud/network/HAProxyConfigurator.java | 6 ------ 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 831d03e0ca3..fa19d66fe1f 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -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; } diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index eefd4cc9dec..33d9157fe05 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -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; diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java index a2e9fa633b8..1f482f4b0df 100644 --- a/core/src/com/cloud/network/HAProxyConfigurator.java +++ b/core/src/com/cloud/network/HAProxyConfigurator.java @@ -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);