Allon Mureinik has uploaded a new change for review. Change subject: core: Remove VmLogoffVDSCommand ......................................................................
core: Remove VmLogoffVDSCommand Removed VmLogoffVDSCommand, as it is not used anywhere in the code base. Change-Id: I806bbff67c9da2eaa07ebfd2f260be082c90c41b Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogoffVDSCommandParameters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmLogoffVDSCommand.java 6 files changed, 0 insertions(+), 62 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/14796/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index 60acf0b..a441860 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -17,7 +17,6 @@ ChangeDisk("org.ovirt.engine.core.vdsbroker.vdsbroker"), ChangeFloppy("org.ovirt.engine.core.vdsbroker.vdsbroker"), VmLogon("org.ovirt.engine.core.vdsbroker.vdsbroker"), - VmLogoff("org.ovirt.engine.core.vdsbroker.vdsbroker"), VmMonitorCommand("org.ovirt.engine.core.vdsbroker.vdsbroker"), SetVmTicket("org.ovirt.engine.core.vdsbroker.vdsbroker"), SetVdsStatus("org.ovirt.engine.core.vdsbroker"), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogoffVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogoffVDSCommandParameters.java deleted file mode 100644 index 90d3dcb..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogoffVDSCommandParameters.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.ovirt.engine.core.common.vdscommands; - -import org.ovirt.engine.core.compat.Guid; - -public class VmLogoffVDSCommandParameters extends VdsAndVmIDVDSParametersBase { - private boolean _force; - - public VmLogoffVDSCommandParameters(Guid vdsId, Guid vmId, boolean force) { - super(vdsId, vmId); - _force = force; - } - - public boolean getForce() { - return _force; - } - - public VmLogoffVDSCommandParameters() { - } - - @Override - public String toString() { - return String.format("%s, force=%s", super.toString(), getForce()); - } -} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java index 09fc156..9837592 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java @@ -44,8 +44,6 @@ StatusOnlyReturnForXmlRpc desktopLogin(String vmId, String domain, String user, String password); - StatusOnlyReturnForXmlRpc desktopLogoff(String vmId, String force); - VMInfoListReturnForXmlRpc getVmStats(String vmId); VMInfoListReturnForXmlRpc getAllVmStats(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java index 50028b8..366dad2 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java @@ -30,8 +30,6 @@ public Map<String, Object> desktopLogin(String vmId, String domain, String user, String password); - public Map<String, Object> desktopLogoff(String vmId, String force); - public Map<String, Object> getVmStats(String vmId); public Map<String, Object> getAllVmStats(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java index 6721327..25a1177 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java @@ -189,18 +189,6 @@ } @Override - public StatusOnlyReturnForXmlRpc desktopLogoff(String vmId, String force) { - try { - Map<String, Object> xmlRpcReturnValue = vdsServer.desktopLogoff(vmId, force); - StatusOnlyReturnForXmlRpc wrapper = new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue); - return wrapper; - } catch (UndeclaredThrowableException ute) { - throw new XmlRpcRunTimeException(ute); - } - - } - - @Override public synchronized VMInfoListReturnForXmlRpc getVmStats(String vmId) { try { Map<String, Object> xmlRpcReturnValue = vdsServer.getVmStats(vmId); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmLogoffVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmLogoffVDSCommand.java deleted file mode 100644 index d500dcf..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmLogoffVDSCommand.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.vdsbroker; - -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.vdscommands.*; - -public class VmLogoffVDSCommand<P extends VmLogoffVDSCommandParameters> extends VdsBrokerCommand<P> { - private Guid mVmId = new Guid(); - private boolean mForce; - - public VmLogoffVDSCommand(P parameters) { - super(parameters); - mVmId = parameters.getVmId(); - mForce = parameters.getForce(); - } - - @Override - protected void ExecuteVdsBrokerCommand() { - status = getBroker().desktopLogoff(mVmId.toString(), String.valueOf(mForce)); - ProceedProxyReturnValue(); - } -} -- To view, visit http://gerrit.ovirt.org/14796 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I806bbff67c9da2eaa07ebfd2f260be082c90c41b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
