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/ba8b4185 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ba8b4185 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ba8b4185 Branch: refs/heads/master Commit: ba8b4185421a15d5afb4d17e8bf5c39a5e81c002 Parents: 946295b Author: Anthony Xu <[email protected]> Authored: Wed Sep 26 10:13:55 2012 -0700 Committer: Anthony Xu <[email protected]> Committed: Wed Sep 26 17:42:42 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/ba8b4185/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/ba8b4185/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;
