From c7c13aea9138282e6b9f3849753ed998bc8ca995 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Tue, 7 Aug 2012 11:24:09 -0700 Subject: [PATCH] S2S VPN: CS-15884: Delete iptables rules after delete vpn connection --- .../agent/resource/virtualnetwork/VirtualRoutingResource.java | 2 ++ .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 ++ .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 936608c8b9e..252d80da81c 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -607,6 +607,8 @@ public class VirtualRoutingResource implements Manager { args = "-D"; args += " -r "; args += cmd.getPeerGatewayIp(); + args += " -n "; + args += cmd.getLocalGuestCidr(); args += " -N "; args += cmd.getPeerGuestCidrList(); } diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 47de7d51e48..2cc9492b465 100755 --- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -1274,6 +1274,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa args += " -D"; args += " -r "; args += cmd.getPeerGatewayIp(); + args += " -n "; + args += cmd.getLocalGuestCidr(); args += " -N "; args += cmd.getPeerGuestCidrList(); } diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 9ba5081981a..db50d1ee1ae 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -7406,6 +7406,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe args += " -D"; args += " -r "; args += cmd.getPeerGatewayIp(); + args += " -n "; + args += cmd.getLocalGuestCidr(); args += " -N "; args += cmd.getPeerGuestCidrList(); }