Martin Peřina has uploaded a new change for review. Change subject: core: Remove action attribute from FenceVdsActionParameters ......................................................................
core: Remove action attribute from FenceVdsActionParameters Removes FenceActionType action attribute from FenceVdsActionParameters, because it doesn't have any meaning in commands which are using FenceVdsActionParameters. Change-Id: I50f9a7064b9977c127b5c443af87a8f20a802070 Bug-Url: https://bugzilla.redhat.com/1182510 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/FenceVdsActionParameters.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java 10 files changed, 31 insertions(+), 57 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/39836/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java index 3a75367..b642294 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java @@ -101,7 +101,7 @@ result = createHostFenceActionExecutor( getVds(), getParameters().getFencingPolicy() - ).fence(getParameters().getAction()); + ).fence(getAction()); handleResult(result); if (getSucceeded()) { log.info("Power-Management: {} host '{}' succeeded.", getAction(), getVdsName()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java index 2262c89..ee455d0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java @@ -23,7 +23,6 @@ import org.ovirt.engine.core.common.action.LockProperties.Scope; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.common.businessentities.pm.FenceActionType; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.pm.FenceOperationResult; import org.ovirt.engine.core.common.businessentities.pm.FenceOperationResult.Status; @@ -126,7 +125,7 @@ } else { // execute StopVds action - returnValue = executeVdsFenceAction(vdsId, sessionId, FenceActionType.STOP, VdcActionType.StopVds); + returnValue = executeVdsFenceAction(vdsId, sessionId, VdcActionType.StopVds); } if (wasSkippedDueToPolicy(returnValue)) { // fence execution was skipped due to fencing policy, host should be alive @@ -139,7 +138,7 @@ executeFenceVdsManuallyAction(vdsId, sessionId); // execute StartVds action - returnValue = executeVdsFenceAction(vdsId, sessionId, FenceActionType.START, VdcActionType.StartVds); + returnValue = executeVdsFenceAction(vdsId, sessionId, VdcActionType.StartVds); setSucceeded(returnValue.getSucceeded()); } else { handleError(); @@ -167,9 +166,8 @@ private VdcReturnValueBase executeVdsFenceAction(final Guid vdsId, String sessionId, - FenceActionType fenceAction, VdcActionType action) { - FenceVdsActionParameters params = new FenceVdsActionParameters(vdsId, fenceAction); + FenceVdsActionParameters params = new FenceVdsActionParameters(vdsId); params.setParentCommand(VdcActionType.RestartVds); params.setSessionId(sessionId); params.setFencingPolicy(getParameters().getFencingPolicy()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index d79741c..c894476 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; + import javax.enterprise.event.Observes; import javax.enterprise.inject.Instance; import javax.inject.Inject; @@ -36,7 +37,6 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.action.VdsActionParameters; -import org.ovirt.engine.core.common.businessentities.pm.FenceActionType; import org.ovirt.engine.core.common.businessentities.IVdsAsyncCommand; import org.ovirt.engine.core.common.businessentities.IVdsEventListener; import org.ovirt.engine.core.common.businessentities.NonOperationalReason; @@ -245,9 +245,7 @@ vds.getId(), vds.getHostName()); - FenceVdsActionParameters params = new FenceVdsActionParameters( - vds.getId(), - FenceActionType.RESTART); + FenceVdsActionParameters params = new FenceVdsActionParameters(vds.getId()); Backend.getInstance().runInternalAction(VdcActionType.VdsNotRespondingTreatment, params, ExecutionHandler.createInternalJobContext()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java index cfa402f..5473744 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java @@ -7,9 +7,8 @@ import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.bll.utils.EngineSSHClient; import org.ovirt.engine.core.common.action.FenceVdsActionParameters; -import org.ovirt.engine.core.common.action.VdsPowerDownParameters; import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.pm.FenceActionType; +import org.ovirt.engine.core.common.action.VdsPowerDownParameters; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; @@ -63,7 +62,7 @@ } } else if (getParameters().getFallbackToPowerManagement() && getVds().isPmEnabled()) { - FenceVdsActionParameters parameters = new FenceVdsActionParameters(getVds().getId(), FenceActionType.STOP); + FenceVdsActionParameters parameters = new FenceVdsActionParameters(getVds().getId()); parameters.setKeepPolicyPMEnabled(getParameters().getKeepPolicyPMEnabled()); runInternalAction(VdcActionType.StopVds, parameters, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java index 7d6b933..1c57e5a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java @@ -20,7 +20,6 @@ import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.pm.FenceActionType; import org.ovirt.engine.core.common.businessentities.pm.FenceAgent; import org.ovirt.engine.core.common.businessentities.pm.FenceOperationResult.Status; import org.ovirt.engine.core.common.config.Config; @@ -261,7 +260,7 @@ for (VDS host : hostWithPMInStatusReboot) { RestartVdsCommand<FenceVdsActionParameters> restartVdsCommand = new RestartVdsCommand<FenceVdsActionParameters>(new - FenceVdsActionParameters(host.getId(), FenceActionType.STATUS)); + FenceVdsActionParameters(host.getId())); if (new HostFenceActionExecutor(host).isHostPoweredOff()) { VdcReturnValueBase retValue = Backend.getInstance().runInternalAction(VdcActionType.RestartVds, restartVdsCommand.getParameters()); if (retValue!= null && retValue.getSucceeded()) { @@ -295,10 +294,7 @@ private void executeNotRespondingTreatment(List<VDS> hosts) { for (VDS host : hosts) { - final FenceVdsActionParameters params = new FenceVdsActionParameters( - host.getId(), - FenceActionType.RESTART - ); + final FenceVdsActionParameters params = new FenceVdsActionParameters(host.getId()); ThreadPoolUtil.execute(new Runnable() { @Override public void run() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java index c283194..07f99ab 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java @@ -13,10 +13,9 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.FenceVdsActionParameters; import org.ovirt.engine.core.common.action.MaintenanceNumberOfVdssParameters; -import org.ovirt.engine.core.common.action.VdsPowerDownParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdsActionParameters; -import org.ovirt.engine.core.common.businessentities.pm.FenceActionType; +import org.ovirt.engine.core.common.action.VdsPowerDownParameters; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; @@ -115,7 +114,7 @@ logAction(vds, AuditLogType.PM_POLICY_TO_UP); /* Down -> Up */ - FenceVdsActionParameters parameters = new FenceVdsActionParameters(vds.getId(), FenceActionType.START); + FenceVdsActionParameters parameters = new FenceVdsActionParameters(vds.getId()); Backend.getInstance().runInternalAction(VdcActionType.StartVds, parameters, ExecutionHandler.createInternalJobContext()); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/FenceVdsActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/FenceVdsActionParameters.java index fed34ac..00efdc3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/FenceVdsActionParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/FenceVdsActionParameters.java @@ -1,6 +1,5 @@ package org.ovirt.engine.core.common.action; -import org.ovirt.engine.core.common.businessentities.pm.FenceActionType; import org.ovirt.engine.core.common.businessentities.FencingPolicy; import org.ovirt.engine.core.compat.Guid; @@ -16,26 +15,19 @@ */ private boolean keepPolicyPMEnabled; - private FenceActionType action; - private FencingPolicy fencingPolicy; public FenceVdsActionParameters() { - this(null, FenceActionType.RESTART); + this(null); } - public FenceVdsActionParameters(Guid vdsId, FenceActionType action) { - this(vdsId, action, false); + public FenceVdsActionParameters(Guid vdsId) { + this(vdsId, false); } - public FenceVdsActionParameters(Guid vdsId, FenceActionType action, boolean keepPolicyPMEnabled) { + public FenceVdsActionParameters(Guid vdsId, boolean keepPolicyPMEnabled) { super(vdsId); - this.action = action; this.keepPolicyPMEnabled = keepPolicyPMEnabled; - } - - public FenceActionType getAction() { - return action; } public boolean getKeepPolicyPMEnabled() { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java index aaf3f37..19570eb 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java @@ -56,7 +56,6 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.common.businessentities.VdsStatic; -import org.ovirt.engine.core.common.businessentities.pm.FenceActionType; import org.ovirt.engine.core.common.businessentities.pm.FenceAgent; import org.ovirt.engine.core.common.businessentities.pm.FenceOperationResult; import org.ovirt.engine.core.common.businessentities.pm.FenceOperationResult.Status; @@ -400,11 +399,11 @@ case MANUAL: return fenceManually(action); case RESTART: - return fence(action, VdcActionType.RestartVds, FenceActionType.RESTART); + return fence(action, VdcActionType.RestartVds); case START: - return fence(action, VdcActionType.StartVds, FenceActionType.START); + return fence(action, VdcActionType.StartVds); case STOP: - return fence(action, VdcActionType.StopVds, FenceActionType.STOP); + return fence(action, VdcActionType.StopVds); case STATUS: return getFenceStatus(action); default: @@ -449,8 +448,8 @@ return Response.ok().entity(action).build(); } - private Response fence(Action action, VdcActionType vdcAction, FenceActionType fenceType) { - return doAction(vdcAction, new FenceVdsActionParameters(guid, fenceType), action); + private Response fence(Action action, VdcActionType vdcAction) { + return doAction(vdcAction, new FenceVdsActionParameters(guid), action); } private Response fenceManually(Action action) { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java index d03e5bc..2431fd4 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java @@ -44,7 +44,6 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VdsStatistics; -import org.ovirt.engine.core.common.businessentities.pm.FenceActionType; import org.ovirt.engine.core.common.businessentities.pm.FenceOperationResult; import org.ovirt.engine.core.common.businessentities.pm.PowerStatus; import org.ovirt.engine.core.common.businessentities.storage.StorageType; @@ -499,31 +498,27 @@ @Test public void testRestartFence() throws Exception { doTestFence(FenceType.RESTART, - VdcActionType.RestartVds, - FenceActionType.RESTART); + VdcActionType.RestartVds); } @Test public void testStartFence() throws Exception { doTestFence(FenceType.START, - VdcActionType.StartVds, - FenceActionType.START); + VdcActionType.StartVds); } @Test public void testStopFence() throws Exception { doTestFence(FenceType.STOP, - VdcActionType.StopVds, - FenceActionType.STOP); + VdcActionType.StopVds); } public void doTestFence(FenceType fenceType, - VdcActionType actionType, - FenceActionType fenceActionType) throws Exception { + VdcActionType actionType) throws Exception { setUriInfo(setUpActionExpectations(actionType, FenceVdsActionParameters.class, - new String[] { "VdsId", "Action" }, - new Object[] { GUIDS[0], fenceActionType })); + new String[] { "VdsId" }, + new Object[] { GUIDS[0] })); Action action = new Action(); action.setFenceType(fenceType.value()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java index 449c1f1..799c01f8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Set; +import com.google.inject.Inject; import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddVdsActionParameters; @@ -45,7 +46,6 @@ import org.ovirt.engine.core.common.businessentities.VdsSpmStatus; import org.ovirt.engine.core.common.businessentities.VmNumaNode; import org.ovirt.engine.core.common.businessentities.aaa.DbUser; -import org.ovirt.engine.core.common.businessentities.pm.FenceActionType; import org.ovirt.engine.core.common.businessentities.pm.FenceAgent; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; @@ -99,8 +99,6 @@ import org.ovirt.engine.ui.uicompat.ReversibleFlow; import org.ovirt.engine.ui.uicompat.UIConstants; import org.ovirt.engine.ui.uicompat.UIMessages; - -import com.google.inject.Inject; @SuppressWarnings("unused") public class HostListModel<E> extends ListWithDetailsAndReportsModel<E, VDS> implements ISupportSystemTreeContext @@ -1666,7 +1664,7 @@ for (Object item : getSelectedItems()) { VDS vds = (VDS) item; - list.add(new FenceVdsActionParameters(vds.getId(), FenceActionType.RESTART)); + list.add(new FenceVdsActionParameters(vds.getId())); } model.startProgress(null); @@ -1690,7 +1688,7 @@ for (Object item : getSelectedItems()) { VDS vds = (VDS) item; - list.add(new FenceVdsActionParameters(vds.getId(), FenceActionType.START)); + list.add(new FenceVdsActionParameters(vds.getId())); } Frontend.getInstance().runMultipleAction(VdcActionType.StartVds, list, @@ -1738,7 +1736,7 @@ for (Object item : getSelectedItems()) { VDS vds = (VDS) item; - list.add(new FenceVdsActionParameters(vds.getId(), FenceActionType.STOP)); + list.add(new FenceVdsActionParameters(vds.getId())); } model.startProgress(null); -- To view, visit https://gerrit.ovirt.org/39836 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50f9a7064b9977c127b5c443af87a8f20a802070 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
