Dhandapani Gopal has uploaded a new change for review. Change subject: engine: Moved getUpServerId to GlusterQueriesCommandBase ......................................................................
engine: Moved getUpServerId to GlusterQueriesCommandBase Moved getUpServerId() to base class GlusterQueriesCommandBase, so that other gluster queries like GetGlusterVolumeProfileInfoQuery, GetGlusterVolumeOptionsInfoQuery and GetGlusterVolumeAdvancedDetailsQuery can make use of it. Change-Id: Ia71ac0984d13adbd59af96ef00f6459d65595d29 Signed-off-by: Dhandapani <[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/GetGlusterVolumeOptionsInfoQueryTest.java 5 files changed, 24 insertions(+), 57 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/11140/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 54d7b47..c3be9bf 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 @@ -3,12 +3,9 @@ import java.util.List; import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.bll.utils.ClusterUtils; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeAdvancedDetails; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; -import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend; import org.ovirt.engine.core.common.queries.gluster.GlusterVolumeAdvancedDetailsParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; @@ -74,19 +71,4 @@ return volumeName; } - private Guid getUpServerId(Guid clusterId) { - VDS vds = getClusterUtils().getUpServer(clusterId); - if (vds == null) { - throw new RuntimeException("No up server found"); - } - return vds.getId(); - } - - protected ClusterUtils getClusterUtils() { - return ClusterUtils.getInstance(); - } - - protected VDSBrokerFrontend getBackendResourceManager() { - return getBackend().getResourceManager(); - } } 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 a729d23..84f59c0 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 @@ -1,9 +1,5 @@ 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.interfaces.VDSBrokerFrontend; import org.ovirt.engine.core.common.queries.gluster.GlusterParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; @@ -12,7 +8,7 @@ /** * Query to get volume option info */ -public class GetGlusterVolumeOptionsInfoQuery<P extends GlusterParameters> extends QueriesCommandBase<P> { +public class GetGlusterVolumeOptionsInfoQuery<P extends GlusterParameters> extends GlusterQueriesCommandBase<P> { public GetGlusterVolumeOptionsInfoQuery(P params) { super(params); @@ -20,19 +16,9 @@ @Override protected void executeQueryCommand() { - VDSReturnValue returnValue = getBackendInstance().RunVdsCommand(VDSCommandType.GetGlusterVolumeOptionsInfo, - new VdsIdVDSCommandParametersBase(getClusterUtils() - .getUpServer(getParameters().getClusterId()) - .getId())); + VDSReturnValue returnValue = + getBackendResourceManager().RunVdsCommand(VDSCommandType.GetGlusterVolumeOptionsInfo, + new VdsIdVDSCommandParametersBase(getUpServerId(getParameters().getClusterId()))); getQueryReturnValue().setReturnValue(returnValue.getReturnValue()); - } - - public ClusterUtils getClusterUtils() { - return ClusterUtils.getInstance(); - } - - public VDSBrokerFrontend getBackendInstance() { - return Backend.getInstance() - .getResourceManager(); } } 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 355055e..4886816 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 @@ -1,13 +1,9 @@ package org.ovirt.engine.core.bll.gluster; -import org.ovirt.engine.core.bll.utils.ClusterUtils; -import org.ovirt.engine.core.common.businessentities.VDS; -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.VDSReturnValue; import org.ovirt.engine.core.common.vdscommands.gluster.GlusterVolumeProfileInfoVDSParameters; -import org.ovirt.engine.core.compat.Guid; /** @@ -27,21 +23,5 @@ getUpServerId(getParameters().getClusterId()), getGlusterVolumeName(getParameters().getVolumeId()))); getQueryReturnValue().setReturnValue(returnValue.getReturnValue()); - } - - private Guid getUpServerId(Guid clusterId) { - VDS vds = getClusterUtils().getUpServer(clusterId); - if (vds == null) { - throw new RuntimeException("No up server found"); - } - return vds.getId(); - } - - protected ClusterUtils getClusterUtils() { - return ClusterUtils.getInstance(); - } - - protected VDSBrokerFrontend getBackendResourceManager() { - return getBackend().getResourceManager(); } } 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 4d31981..8fab8d5 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,6 +1,9 @@ package org.ovirt.engine.core.bll.gluster; 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.interfaces.VDSBrokerFrontend; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; @@ -24,4 +27,20 @@ protected String getGlusterVolumeName(Guid volumeId) { return getGlusterVolumeDao().getById(volumeId).getName(); } + + protected Guid getUpServerId(Guid clusterId) { + VDS vds = getClusterUtils().getUpServer(clusterId); + if (vds == null) { + throw new RuntimeException("No up server found"); + } + return vds.getId(); + } + + protected ClusterUtils getClusterUtils() { + return ClusterUtils.getInstance(); + } + + protected VDSBrokerFrontend getBackendResourceManager() { + return getBackend().getResourceManager(); + } } 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 64111de..2d6bc01 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 @@ -84,7 +84,7 @@ private void setupMock() { vdsBrokerFrontend = mock(VDSBrokerFrontend.class); - doReturn(vdsBrokerFrontend).when(getQuery()).getBackendInstance(); + doReturn(vdsBrokerFrontend).when(getQuery()).getBackendResourceManager(); VDSReturnValue returnValue = new VDSReturnValue(); returnValue.setSucceeded(true); -- To view, visit http://gerrit.ovirt.org/11140 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia71ac0984d13adbd59af96ef00f6459d65595d29 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Dhandapani Gopal <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
