Shubhendu Tripathi has uploaded a new change for review. Change subject: gluster: Set host name instead of IP in remove bricks status ......................................................................
gluster: Set host name instead of IP in remove bricks status Modified the query to set the host name instead of localhost or IP in gluster volume remove bricks status details. Change-Id: I655a664956bae1bcd91564d5867e160409bd9403 Bug-Url: https://bugzilla.redhat.com/1019561 Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQueryTest.java 2 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/20253/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQuery.java index 71bf710..86b4692 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQuery.java @@ -3,8 +3,11 @@ import java.util.List; import org.ovirt.engine.core.common.action.gluster.GlusterVolumeRemoveBricksQueriesParameters; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.gluster.GlusterServer; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeTaskStatusEntity; +import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeTaskStatusForHost; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.job.Step; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; @@ -12,6 +15,7 @@ import org.ovirt.engine.core.common.vdscommands.gluster.GlusterVolumeRemoveBricksVDSParameters; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dao.StepDao; +import org.ovirt.engine.core.dao.gluster.GlusterServerDao; public class GetGlusterVolumeRemoveBricksStatusQuery<P extends GlusterVolumeRemoveBricksQueriesParameters> extends GlusterQueriesCommandBase<P> { @@ -55,10 +59,29 @@ entity.setStartTime(stepsList.get(0).getStartTime()); } + // Set the host ip in status details + updateHostIP(entity); + return entity; + } + + private void updateHostIP(GlusterVolumeTaskStatusEntity taskStatus) { + for (GlusterVolumeTaskStatusForHost hostStatus : taskStatus.getHostwiseStatusDetails()) { + GlusterServer glusterServer = getGlusterServerDao().getByGlusterServerUuid(hostStatus.getHostUuid()); + if (glusterServer != null) { + VDS host = getVdsDao().get(glusterServer.getId()); + if (host != null) { + hostStatus.setHostName(host.getName()); + } + } + } } public StepDao getStepDao() { return getDbFacade().getStepDao(); } + + public GlusterServerDao getGlusterServerDao() { + return getDbFacade().getGlusterServerDao(); + } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQueryTest.java index 0eb63bc..2b1f044 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQueryTest.java @@ -24,6 +24,7 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity; +import org.ovirt.engine.core.common.businessentities.gluster.GlusterServer; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeTaskStatusDetail; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeTaskStatusEntity; @@ -37,6 +38,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dao.StepDao; import org.ovirt.engine.core.dao.VdsDAO; +import org.ovirt.engine.core.dao.gluster.GlusterServerDao; import org.ovirt.engine.core.dao.gluster.GlusterVolumeDao; public class GetGlusterVolumeRemoveBricksStatusQueryTest extends @@ -48,9 +50,11 @@ private static final Guid VOLUME_ID = Guid.newGuid(); private static final Guid SERVER_ID = Guid.newGuid(); private static final Guid STEP_ID = Guid.newGuid(); + private static final Guid SERVER_UUID_1 = Guid.newGuid(); private GlusterVolumeTaskStatusEntity expectedVolumeStatusDetails; private VdsDAO vdsDao; private GlusterVolumeDao volumeDao; + private GlusterServerDao glusterServerDao; private StepDao stepDao; private ClusterUtils clusterUtils; @@ -75,6 +79,7 @@ GlusterVolumeTaskStatusForHost status1 = new GlusterVolumeTaskStatusForHost(); status1.setHostName(SERVER_1); + status1.setHostUuid(Guid.newGuid()); status1.setFilesScanned(100); status1.setFilesMoved(100); status1.setFilesFailed(0); @@ -83,10 +88,12 @@ status1.setRunTime(20); status1.setStatus(JobExecutionStatus.FINISHED); status1.setTotalSizeMoved(1024); + status1.setHostUuid(SERVER_UUID_1); statusList.add(status1); GlusterVolumeTaskStatusForHost status2 = new GlusterVolumeTaskStatusForHost(); status2.setHostName(SERVER_2); + status2.setHostUuid(Guid.newGuid()); status2.setFilesScanned(100); status2.setFilesMoved(100); status2.setFilesFailed(0); @@ -95,6 +102,7 @@ status2.setRunTime(20); status2.setStatus(JobExecutionStatus.FINISHED); status2.setTotalSizeMoved(1024); + status2.setHostUuid(SERVER_UUID_1); statusList.add(status2); return statusList; @@ -172,19 +180,31 @@ return asyncTask; } + private GlusterServer getGlusterServer() { + GlusterServer glusterServer = new GlusterServer(); + glusterServer.setId(SERVER_ID); + glusterServer.setGlusterServerUuid(SERVER_UUID_1); + + return glusterServer; + } + private void setupMock() { clusterUtils = mock(ClusterUtils.class); vdsDao = mock(VdsDAO.class); volumeDao = mock(GlusterVolumeDao.class); + glusterServerDao = mock(GlusterServerDao.class); stepDao = mock(StepDao.class); doReturn(vdsDao).when(getQuery()).getVdsDao(); doReturn(volumeDao).when(getQuery()).getGlusterVolumeDao(); doReturn(stepDao).when(getQuery()).getStepDao(); + doReturn(glusterServerDao).when(getQuery()).getGlusterServerDao(); doReturn(CLUSTER_ID).when(getQueryParameters()).getClusterId(); doReturn(VOLUME_ID).when(getQueryParameters()).getVolumeId(); when(volumeDao.getById(VOLUME_ID)).thenReturn(getVolume()); when(stepDao.getStepsByExternalId(any(Guid.class))).thenReturn(getStepsList()); + when(glusterServerDao.getByGlusterServerUuid(any(Guid.class))).thenReturn(getGlusterServer()); + when(vdsDao.get(any(Guid.class))).thenReturn(getVds(VDSStatus.Up)); VDSReturnValue returnValue = new VDSReturnValue(); returnValue.setSucceeded(true); -- To view, visit http://gerrit.ovirt.org/20253 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I655a664956bae1bcd91564d5867e160409bd9403 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
