From 5a0fa3380defce8fb10d02ef56850f90a8e78164 Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 22 Dec 2010 18:04:13 -0800 Subject: [PATCH] SetupAnswer need to indicate whether reconnect is needed --- core/src/com/cloud/agent/api/SetupAnswer.java | 16 ++++++++++------ .../xen/resource/CitrixResourceBase.java | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/core/src/com/cloud/agent/api/SetupAnswer.java b/core/src/com/cloud/agent/api/SetupAnswer.java index 6475560bcf6..1257e4975e8 100644 --- a/core/src/com/cloud/agent/api/SetupAnswer.java +++ b/core/src/com/cloud/agent/api/SetupAnswer.java @@ -18,17 +18,21 @@ package com.cloud.agent.api; public class SetupAnswer extends Answer { + // indicate if agent reconnect is needed after setup command + private boolean _reconnect; public SetupAnswer() {} - public SetupAnswer(SetupCommand cmd) { + public SetupAnswer(SetupCommand cmd, boolean reconnect) { super(cmd, true, null); + _reconnect = reconnect; } - - public SetupAnswer(SetupCommand cmd, boolean result, String details) { - super(cmd, result, details); - } - + public SetupAnswer(SetupCommand cmd, String details) { super(cmd, false, details); + _reconnect = true; } + public boolean needReconnect() { + return _reconnect; + } + } diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index fa5b804d5b1..8c4f6669120 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -932,7 +932,7 @@ public abstract class CitrixResourceBase implements ServerResource { } protected SetupAnswer execute(SetupCommand cmd) { - return new SetupAnswer(cmd); + return new SetupAnswer(cmd, false); } protected SetPortForwardingRulesAnswer execute(SetPortForwardingRulesCommand cmd) {