Maor Lipchuk has uploaded a new change for review.
Change subject: core: Remove unused shutdown commands.
......................................................................
core: Remove unused shutdown commands.
Removing unused vdc command ShutdownVdsCommand and its parameter class.
also removing vds command ShutdownVdsVDSCommand and its parameter class.
Change-Id: I42cb8777ea1838229e05c17cae46e75305510dc6
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVdsCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsShutdownParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ShutdownVdsVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ShutdownVdsVDSCommand.java
6 files changed, 0 insertions(+), 121 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/13889/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVdsCommand.java
deleted file mode 100644
index dd39bb3..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVdsCommand.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.VdsShutdownParameters;
-import org.ovirt.engine.core.common.businessentities.VDSStatus;
-import org.ovirt.engine.core.common.errors.VdcBLLException;
-import org.ovirt.engine.core.common.errors.VdcBllErrors;
-import
org.ovirt.engine.core.common.vdscommands.ShutdownVdsVDSCommandParameters;
-import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
-import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
-import org.ovirt.engine.core.dal.VdcBllMessages;
-
-public class ShutdownVdsCommand<T extends VdsShutdownParameters> extends
VdsCommand<T> {
- public ShutdownVdsCommand(T parameters) {
- super(parameters);
-
- }
-
- @Override
- protected void executeCommand() {
- VDSReturnValue result = Backend
- .getInstance()
- .getResourceManager()
- .RunVdsCommand(VDSCommandType.ShutdownVds,
- new ShutdownVdsVDSCommandParameters(getVds().getId(),
getParameters().getReboot()));
- if (result == null || (VDSStatus) result.getReturnValue() !=
VDSStatus.Down) {
- throw new VdcBLLException(VdcBllErrors.VDS_SHUTDOWN_ERROR);
- }
- getVds().setStatus((VDSStatus) result.getReturnValue());
- setSucceeded(true);
- }
-
- @Override
- protected boolean canDoAction() {
- boolean returnValue = true;
- if (getVds() == null) {
- addCanDoActionMessage(VdcBllMessages.VDS_SHUTDOWN_VDS_NOT_FOUND);
- returnValue = false;
- }
- if (getVds().getStatus() == VDSStatus.Down || getVds().getStatus() ==
VDSStatus.NonResponsive) {
- addCanDoActionMessage(VdcBllMessages.VDS_SHUTDOWN_NO_RESPONSE);
- returnValue = false;
- }
- return returnValue;
- }
-
- @Override
- public AuditLogType getAuditLogTypeValue() {
- return getSucceeded() ? AuditLogType.USER_VDS_SHUTDOWN :
AuditLogType.USER_FAILED_VDS_SHUTDOWN;
- }
-}
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..10e018e 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
@@ -60,7 +60,6 @@
ActivateVds(108, ActionGroup.MANIPUTLATE_HOST, QuotaDependency.NONE),
InstallVds(109, QuotaDependency.NONE),
ClearNonResponsiveVdsVms(110, QuotaDependency.NONE),
- ShutdownVds(111, QuotaDependency.NONE),
ApproveVds(112, ActionGroup.CREATE_HOST, QuotaDependency.NONE),
HandleVdsCpuFlagsOrClusterChanged(114, QuotaDependency.NONE),
InitVdsOnUp(115, QuotaDependency.NONE),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsShutdownParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsShutdownParameters.java
deleted file mode 100644
index 85a4fbe..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsShutdownParameters.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.ovirt.engine.core.common.action;
-
-import org.ovirt.engine.core.compat.*;
-
-public class VdsShutdownParameters extends VdsActionParameters {
- private static final long serialVersionUID = 6589404824277164961L;
- private boolean privateReboot;
-
- public boolean getReboot() {
- return privateReboot;
- }
-
- private void setReboot(boolean value) {
- privateReboot = value;
- }
-
- public VdsShutdownParameters(Guid vdsId, boolean reboot) {
- super(vdsId);
- setReboot(reboot);
- }
-
- public VdsShutdownParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ShutdownVdsVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ShutdownVdsVDSCommandParameters.java
deleted file mode 100644
index c2c28f2..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ShutdownVdsVDSCommandParameters.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.ovirt.engine.core.common.vdscommands;
-
-import org.ovirt.engine.core.compat.Guid;
-
-public class ShutdownVdsVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
- private boolean _reboot;
-
- public ShutdownVdsVDSCommandParameters(Guid vdsId, boolean reboot) {
- super(vdsId);
- _reboot = reboot;
- }
-
- public boolean getReboot() {
- return _reboot;
- }
-
- public ShutdownVdsVDSCommandParameters() {
- }
-
- @Override
- public String toString() {
- return String.format("%s, reboot=%s", super.toString(), getReboot());
- }
-}
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..76e4e20 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
@@ -27,7 +27,6 @@
IsVmDuringInitiating("org.ovirt.engine.core.vdsbroker"),
StartSpice("org.ovirt.engine.core.vdsbroker.vdsbroker"),
RunVmHyperChannelCommand("org.ovirt.engine.core.vdsbroker.vdsbroker"),
- ShutdownVds("org.ovirt.engine.core.vdsbroker.vdsbroker"),
UpdateVdsVMsCleared("org.ovirt.engine.core.vdsbroker"),
AddNetwork("org.ovirt.engine.core.vdsbroker.vdsbroker"),
RemoveNetwork("org.ovirt.engine.core.vdsbroker.vdsbroker"),
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ShutdownVdsVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ShutdownVdsVDSCommand.java
deleted file mode 100644
index 314b1b1..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ShutdownVdsVDSCommand.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.vdsbroker;
-
-import org.ovirt.engine.core.common.businessentities.*;
-import org.ovirt.engine.core.common.vdscommands.*;
-
-public class ShutdownVdsVDSCommand<P extends ShutdownVdsVDSCommandParameters>
extends VdsBrokerCommand<P> {
- public ShutdownVdsVDSCommand(P parameters) {
- super(parameters);
- _reboot = parameters.getReboot() ? 1 : 0;
- }
-
- private int _reboot;
-
- @Override
- protected void ExecuteVdsBrokerCommand() {
- status = getBroker().shutdownHost(_reboot);
- ProceedProxyReturnValue();
- this.setReturnValue(VDSStatus.Down);
- }
-}
--
To view, visit http://gerrit.ovirt.org/13889
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42cb8777ea1838229e05c17cae46e75305510dc6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
