Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove unused VmLockCommad
......................................................................
core: Remove unused VmLockCommad
VmLockCommand is not used anywhere in the codebsae, and can thus be
removed.
This patch removes:
1. The VmLockCommand class
2. Its corresponding constant in VdcActionType
3. The VmLockVDSCommand class, only used by VmLockCommand
4. The corresponding constant in VDSCommantType
5. The VmLockVDSCommandParameters class, only used by VmLockVDSCommand
6. The vmLock method in IVdsServer/VdsServerConnector/VdsServerWrapper
which was only used by VmLockVDSCommand
Change-Id: I00ffd5da1a93271cd4cc31de0f72953d78e4d62a
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLockCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
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/VmLockVDSCommandParameters.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/VmLockVDSCommand.java
8 files changed, 0 insertions(+), 68 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/13864/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLockCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLockCommand.java
deleted file mode 100644
index 1e2f2ef..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLockCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.action.VmOperationParameterBase;
-import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
-import org.ovirt.engine.core.common.vdscommands.VmLockVDSCommandParameters;
-
-@InternalCommandAttribute
-public class VmLockCommand<T extends VmOperationParameterBase> extends
VmOperationCommandBase<T> {
- public VmLockCommand(T parameters) {
- super(parameters);
- }
-
- @Override
- protected void Perform() {
- setSucceeded(Backend.getInstance().getResourceManager()
- .RunVdsCommand(VDSCommandType.VmLock, new
VmLockVDSCommandParameters(getVdsId(), getVm().getId()))
- .getSucceeded());
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
index d749a7c..9c8ed9c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
@@ -23,7 +23,6 @@
InternalMigrateVm(15, QuotaDependency.NONE),
MigrateVmToServer(16, ActionGroup.MIGRATE_VM, QuotaDependency.NONE),
VmLogon(18, ActionGroup.CONNECT_TO_VM, QuotaDependency.NONE),
- VmLock(20, QuotaDependency.NONE),
SetVmTicket(22, ActionGroup.CONNECT_TO_VM, false, QuotaDependency.NONE),
ExportVm(23, ActionGroup.IMPORT_EXPORT_VM, QuotaDependency.NONE),
ExportVmTemplate(24, ActionGroup.IMPORT_EXPORT_VM, QuotaDependency.NONE),
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 c876a11..2681316 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
@@ -18,7 +18,6 @@
ChangeFloppy("org.ovirt.engine.core.vdsbroker.vdsbroker"),
VmLogon("org.ovirt.engine.core.vdsbroker.vdsbroker"),
VmLogoff("org.ovirt.engine.core.vdsbroker.vdsbroker"),
- VmLock("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/VmLockVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLockVDSCommandParameters.java
deleted file mode 100644
index 9d4f96e..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLockVDSCommandParameters.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.ovirt.engine.core.common.vdscommands;
-
-import org.ovirt.engine.core.compat.Guid;
-
-public class VmLockVDSCommandParameters extends VdsAndVmIDVDSParametersBase {
- public VmLockVDSCommandParameters(Guid vdsId, Guid vmId) {
- super(vdsId, vmId);
- }
-
- public VmLockVDSCommandParameters() {
- }
-}
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 d6968ca..d4cd19f 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
@@ -48,8 +48,6 @@
StatusOnlyReturnForXmlRpc desktopLogoff(String vmId, String force);
- StatusOnlyReturnForXmlRpc desktopLock(String vmId);
-
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 b019cec..320d903 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
@@ -36,8 +36,6 @@
public Map<String, Object> desktopLogoff(String vmId, String force);
- public Map<String, Object> desktopLock(String vmId);
-
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 4a6f15c..398ddb8 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
@@ -222,18 +222,6 @@
}
@Override
- public StatusOnlyReturnForXmlRpc desktopLock(String vmId) {
- try {
- Map<String, Object> xmlRpcReturnValue =
vdsServer.desktopLock(vmId);
- 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/VmLockVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmLockVDSCommand.java
deleted file mode 100644
index 694da4e..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmLockVDSCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.vdsbroker;
-
-import org.ovirt.engine.core.compat.*;
-import org.ovirt.engine.core.common.vdscommands.*;
-
-public class VmLockVDSCommand<P extends VmLockVDSCommandParameters> extends
VdsBrokerCommand<P> {
- private Guid mVmId = new Guid();
-
- public VmLockVDSCommand(P parameters) {
- super(parameters);
- mVmId = parameters.getVmId();
- }
-
- @Override
- protected void ExecuteVdsBrokerCommand() {
- status = getBroker().desktopLock(mVmId.toString());
- ProceedProxyReturnValue();
- }
-}
--
To view, visit http://gerrit.ovirt.org/13864
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00ffd5da1a93271cd4cc31de0f72953d78e4d62a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
