You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/27 06:58:03 UTC
[8/33] git commit: CS-16375: do desetup network after last VM in
guest network is gone
CS-16375: do desetup network after last VM in guest network is gone
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d59b5f88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d59b5f88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d59b5f88
Branch: refs/heads/4.0
Commit: d59b5f88b567287137561fbf2f5a2e44b6773ce4
Parents: a0e390f
Author: Anthony Xu <an...@cloud.com>
Authored: Wed Sep 26 10:13:55 2012 -0700
Committer: Edison Su <di...@gmail.com>
Committed: Wed Sep 26 21:55:16 2012 -0700
----------------------------------------------------------------------
.../cloud/agent/api/SetupGuestNetworkCommand.java | 4 ++++
.../xen/resource/CitrixResourceBase.java | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d59b5f88/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
index 693db29..60003b4 100644
--- a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
+++ b/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
@@ -45,6 +45,10 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand{
return networkDomain;
}
+ boolean isAdd() {
+ return add;
+ }
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d59b5f88/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 5c4db2b..d2db85c 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
@@ -7359,7 +7359,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
return new SetupGuestNetworkAnswer(cmd, false, "Can not find vif with mac " + mac + " for VM " + domrName);
}
- String args = "vpc_guestnw.sh " + domrIP + " -C";
+ String args = "vpc_guestnw.sh " + domrIP + (cmd.isAdd()?" -C":" -D");
String dev = "eth" + domrVif.getDevice(conn);
args += " -d " + dev;
args += " -i " + domrGIP;