From ba8b4185421a15d5afb4d17e8bf5c39a5e81c002 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Wed, 26 Sep 2012 10:13:55 -0700 Subject: [PATCH] CS-16375: do desetup network after last VM in guest network is gone --- api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java | 4 ++++ .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java index 693db291e5f..60003b44a6b 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; 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 5c4db2b45fb..d2db85c8597 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;