Sahina Bose has uploaded a new change for review. Change subject: engine: Refactor GlusterQueriesCommand Base ......................................................................
engine: Refactor GlusterQueriesCommand Base Introducting runVdsCommand() in the GlusterQueriesCommandBase and refactored GetGlusterVolumeProfileInfoQuery, GetGlusterVolumeOptionsInfoQuery and GetGlusterVolumeAdvancedDetailsQuery Moving this change to separate patch(from Gluster Hooks patch) Change-Id: If73701b7756de155c4917944ed43517e53f9b4e6 Signed-off-by: Sahina Bose <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterQueriesCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQueryTest.java 7 files changed, 37 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/12398/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQuery.java index 98a3b21..eefa99b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQuery.java @@ -93,7 +93,7 @@ private GlusterVolumeAdvancedDetails fetchAdvancedDetails(String volumeName) { VDSReturnValue returnValue = - getBackendResourceManager().RunVdsCommand(VDSCommandType.GetGlusterVolumeAdvancedDetails, + runVdsCommand(VDSCommandType.GetGlusterVolumeAdvancedDetails, new GlusterVolumeAdvancedDetailsVDSParameters(getUpServerId(getParameters().getClusterId()), getParameters().getClusterId(), volumeName, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQuery.java index 84f59c0..d324a6c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQuery.java @@ -17,7 +17,7 @@ @Override protected void executeQueryCommand() { VDSReturnValue returnValue = - getBackendResourceManager().RunVdsCommand(VDSCommandType.GetGlusterVolumeOptionsInfo, + runVdsCommand(VDSCommandType.GetGlusterVolumeOptionsInfo, new VdsIdVDSCommandParametersBase(getUpServerId(getParameters().getClusterId()))); getQueryReturnValue().setReturnValue(returnValue.getReturnValue()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQuery.java index 4886816..9fad7f9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQuery.java @@ -17,11 +17,10 @@ @Override protected void executeQueryCommand() { - VDSReturnValue returnValue = - getBackendResourceManager().RunVdsCommand(VDSCommandType.GetGlusterVolumeProfileInfo, - new GlusterVolumeProfileInfoVDSParameters(getParameters().getClusterId(), - getUpServerId(getParameters().getClusterId()), - getGlusterVolumeName(getParameters().getVolumeId()))); + VDSReturnValue returnValue = runVdsCommand(VDSCommandType.GetGlusterVolumeProfileInfo, + new GlusterVolumeProfileInfoVDSParameters(getParameters().getClusterId(), + getUpServerId(getParameters().getClusterId()), + getGlusterVolumeName(getParameters().getVolumeId()))); getQueryReturnValue().setReturnValue(returnValue.getReturnValue()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterQueriesCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterQueriesCommandBase.java index 8fab8d5..6e7166a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterQueriesCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterQueriesCommandBase.java @@ -1,13 +1,19 @@ package org.ovirt.engine.core.bll.gluster; +import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.bll.utils.ClusterUtils; import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; +import org.ovirt.engine.core.common.vdscommands.VDSCommandType; +import org.ovirt.engine.core.common.vdscommands.VDSParametersBase; +import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.gluster.GlusterBrickDao; +import org.ovirt.engine.core.dao.gluster.GlusterHooksDao; import org.ovirt.engine.core.dao.gluster.GlusterVolumeDao; public abstract class GlusterQueriesCommandBase<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { @@ -24,8 +30,20 @@ return DbFacade.getInstance().getGlusterBrickDao(); } + protected GlusterHooksDao getGlusterHookDao() { + return DbFacade.getInstance().getGlusterHookDao(); + } + protected String getGlusterVolumeName(Guid volumeId) { return getGlusterVolumeDao().getById(volumeId).getName(); + } + + private VDSBrokerFrontend getBackendResourceManager() { + return Backend.getInstance().getResourceManager(); + } + + protected ClusterUtils getClusterUtils() { + return ClusterUtils.getInstance(); } protected Guid getUpServerId(Guid clusterId) { @@ -36,11 +54,13 @@ return vds.getId(); } - protected ClusterUtils getClusterUtils() { - return ClusterUtils.getInstance(); - } - - protected VDSBrokerFrontend getBackendResourceManager() { - return getBackend().getResourceManager(); + public VDSReturnValue runVdsCommand(VDSCommandType commandType, VDSParametersBase parameters) + throws VdcBLLException { + VDSReturnValue returnValue = getBackendResourceManager().RunVdsCommand(commandType, parameters); + if (!returnValue.getSucceeded()) { + throw new VdcBLLException(returnValue.getVdsError().getCode(), returnValue.getVdsError() + .getMessage()); + } + return returnValue; } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQueryTest.java index b3cd00a..509c934 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQueryTest.java @@ -136,9 +136,6 @@ doReturn(vdsDao).when(clusterUtils).getVdsDao(); when(vdsDao.getAllForVdsGroupWithStatus(CLUSTER_ID, VDSStatus.Up)).thenReturn(Collections.singletonList(getVds(VDSStatus.Up))); - vdsBrokerFrontend = mock(VDSBrokerFrontend.class); - doReturn(vdsBrokerFrontend).when(getQuery()).getBackendResourceManager(); - // Mock the query's parameters doReturn(CLUSTER_ID).when(getQueryParameters()).getClusterId(); doReturn(VOLUME_NAME).when(getQueryParameters()).getVolumeName(); @@ -148,8 +145,8 @@ VDSReturnValue returnValue = new VDSReturnValue(); returnValue.setSucceeded(true); returnValue.setReturnValue(expectedVolumeAdvancedDetails); - when(vdsBrokerFrontend.RunVdsCommand(eq(VDSCommandType.GetGlusterVolumeAdvancedDetails), - any(VDSParametersBase.class))).thenReturn(returnValue); + doReturn(returnValue).when(getQuery()).runVdsCommand(eq(VDSCommandType.GetGlusterVolumeAdvancedDetails), + any(VDSParametersBase.class)); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQueryTest.java index b574179..71875d6 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeOptionsInfoQueryTest.java @@ -83,14 +83,11 @@ } private void setupMock() { - vdsBrokerFrontend = mock(VDSBrokerFrontend.class); - doReturn(vdsBrokerFrontend).when(getQuery()).getBackendResourceManager(); - VDSReturnValue returnValue = new VDSReturnValue(); returnValue.setSucceeded(true); returnValue.setReturnValue(expected); - when(vdsBrokerFrontend.RunVdsCommand(eq(VDSCommandType.GetGlusterVolumeOptionsInfo), - any(VDSParametersBase.class))).thenReturn(returnValue); + doReturn(returnValue).when(getQuery()).runVdsCommand(eq(VDSCommandType.GetGlusterVolumeOptionsInfo), + any(VDSParametersBase.class)); } @Test diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQueryTest.java index 8e648ea..5af917d 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQueryTest.java @@ -23,7 +23,6 @@ import org.ovirt.engine.core.common.businessentities.gluster.FopStats; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeProfileInfo; import org.ovirt.engine.core.common.businessentities.gluster.StatsInfo; -import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend; import org.ovirt.engine.core.common.queries.gluster.GlusterVolumeQueriesParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSParametersBase; @@ -40,9 +39,6 @@ private static final Guid VOLUME_ID = new Guid("b399944a-81ab-4ec5-8266-e19ba7c3c943"); private GlusterVolumeProfileInfo expectedProfileInfo; private GlusterVolumeQueriesParameters params; - - @Mock - private VDSBrokerFrontend vdsBrokerFrontend; @Mock private VdsDAO vdsDao; @@ -82,11 +78,10 @@ } private void setupMock() { - doReturn(vdsBrokerFrontend).when(getQuery()).getBackendResourceManager(); VDSReturnValue returnValue = new VDSReturnValue(); returnValue.setSucceeded(true); returnValue.setReturnValue(expectedProfileInfo); - doReturn(returnValue).when(vdsBrokerFrontend).RunVdsCommand(eq(VDSCommandType.GetGlusterVolumeProfileInfo), + doReturn(returnValue).when(getQuery()).runVdsCommand(eq(VDSCommandType.GetGlusterVolumeProfileInfo), any(VDSParametersBase.class)); } -- To view, visit http://gerrit.ovirt.org/12398 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If73701b7756de155c4917944ed43517e53f9b4e6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
