You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2012/08/08 01:32:52 UTC
[1/2] git commit: S2S VPN: CS-15884: Delete iptables rules after
delete vpn connection
Updated Branches:
refs/heads/vpc b5e1c5313 -> c4eadf301
S2S VPN: CS-15884: Delete iptables rules after delete vpn connection
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c4eadf30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c4eadf30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c4eadf30
Branch: refs/heads/vpc
Commit: c4eadf301123073c96de2da2cea1834489d2515b
Parents: 5e0eb93
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Aug 7 16:32:22 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Tue Aug 7 16:32:22 2012 -0700
----------------------------------------------------------------------
.../virtualnetwork/VirtualRoutingResource.java | 2 ++
.../xen/resource/CitrixResourceBase.java | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4eadf30/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 522ceb8..ffc766c 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -611,6 +611,8 @@ public class VirtualRoutingResource implements Manager {
args = "-D";
args += " -r ";
args += cmd.getPeerGatewayIp();
+ args += " -n ";
+ args += cmd.getLocalGuestCidr();
args += " -N ";
args += cmd.getPeerGuestCidrList();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4eadf30/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index fd09c8a..7abe281 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -7435,6 +7435,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();
}