Allon Mureinik has uploaded a new change for review. Change subject: core: Remove GlusterBrickEntity ctor used in tests ......................................................................
core: Remove GlusterBrickEntity ctor used in tests Removed the ctor that isn't used anywhere in production code. This in fact also makes the tests easier to understand, as now the test GlusterBrickEntitys instances only have the relevant field values and not all the values demanded by this useless constructor. Change-Id: I7a215614f37b3858127fd420cc59777896ed9284 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJobTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoTest.java 8 files changed, 59 insertions(+), 95 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/18114/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java index 55d86f1..8abb182 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java @@ -16,7 +16,6 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.common.businessentities.VdsStatic; import org.ovirt.engine.core.common.businessentities.gluster.AccessProtocol; import org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity; @@ -81,21 +80,12 @@ List<GlusterBrickEntity> bricks = new ArrayList<GlusterBrickEntity>(); GlusterBrickEntity brick = null; for (Integer i = 0; i < max; i++) { - brick = - new GlusterBrickEntity(volumeId, - new VdsStatic(serverName, - "127.0.0.1", - "0934390834", - 20, - 22, - "root", - Guid.newGuid(), - serverId, - serverName, - true, - VDSType.oVirtNode), - "/tmp/s" + i.toString(), - GlusterStatus.UP); + brick = new GlusterBrickEntity(); + brick.setVolumeId(volumeId); + brick.setServerId(serverId); + brick.setServerName(serverName); + brick.setBrickDirectory("/tmp/s" + i.toString()); + brick.setStatus(GlusterStatus.UP); bricks.add(brick); } @@ -106,21 +96,12 @@ } private GlusterBrickEntity getBrick(Guid volumeId) { - GlusterBrickEntity brick = - new GlusterBrickEntity(volumeId, - new VdsStatic(serverName, - "127.0.0.1", - "0934390834", - 20, - 22, - "root", - Guid.newGuid(), - serverId, - serverName, - true, - VDSType.oVirtNode), - BRICK_DIRECTORY, - GlusterStatus.UP); + GlusterBrickEntity brick = new GlusterBrickEntity(); + brick.setVolumeId(volumeId); + brick.setServerId(serverId); + brick.setServerName(serverName); + brick.setBrickDirectory(BRICK_DIRECTORY); + brick.setStatus(GlusterStatus.UP); return brick; } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java index 755a438..1a58210 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java @@ -17,7 +17,6 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.common.businessentities.VdsStatic; import org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus; @@ -108,21 +107,12 @@ List<GlusterBrickEntity> bricks = new ArrayList<GlusterBrickEntity>(); GlusterBrickEntity brick = null; for (Integer i = 0; i < max; i++) { - brick = - new GlusterBrickEntity(volumeId, - new VdsStatic(serverName, - "127.0.0.1", - "0934390834", - 20, - 22, - "root", - Guid.newGuid(), - serverId, - serverName, - true, - VDSType.oVirtNode), - "/tmp/s" + i.toString(), - GlusterStatus.UP); + brick = new GlusterBrickEntity(); + brick.setVolumeId(volumeId); + brick.setServerId(serverId); + brick.setServerName(serverName); + brick.setBrickDirectory("/tmp/s" + i.toString()); + brick.setStatus(GlusterStatus.UP); bricks.add(brick); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJobTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJobTest.java index 66ada8c..c94c204 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJobTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJobTest.java @@ -212,7 +212,13 @@ } private GlusterBrickEntity createBrick(Guid existingVolDistId, VDS server, String brickDir) { - return new GlusterBrickEntity(existingVolDistId, server.getStaticData(), brickDir, GlusterStatus.UP); + GlusterBrickEntity brick = new GlusterBrickEntity(); + brick.setVolumeId(existingVolDistId); + brick.setServerId(server.getId()); + brick.setServerName(server.getHostName()); + brick.setBrickDirectory(brickDir); + brick.setStatus(GlusterStatus.UP); + return brick; } private GlusterServer getGlusterServer() { @@ -684,11 +690,12 @@ volume.addAccessProtocol(AccessProtocol.GLUSTER); volume.addAccessProtocol(AccessProtocol.NFS); - GlusterBrickEntity brick = - new GlusterBrickEntity(NEW_VOL_ID, - existingServer1.getStaticData(), - "/export/testVol1", - GlusterStatus.UP); + GlusterBrickEntity brick = new GlusterBrickEntity(); + brick.setVolumeId(NEW_VOL_ID); + brick.setServerId(existingServer1.getId()); + brick.setServerName(existingServer1.getHostName()); + brick.setBrickDirectory("/export/testvol1"); + brick.setStatus(GlusterStatus.UP); brick.setBrickOrder(0); volume.addBrick(brick); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java index ce535d4..86b46d1 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java @@ -16,7 +16,6 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.common.businessentities.VdsStatic; import org.ovirt.engine.core.common.businessentities.gluster.AccessProtocol; import org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity; @@ -122,21 +121,12 @@ List<GlusterBrickEntity> bricks = new ArrayList<GlusterBrickEntity>(); GlusterBrickEntity brick; for (Integer i = 0; i < n; i++) { - brick = - new GlusterBrickEntity(volumeId, - new VdsStatic(serverName, - "127.0.0.1", - "0934390834", - 20, - 22, - "root", - Guid.newGuid(), - serverId, - serverName, - true, - VDSType.oVirtNode), - "/tmp/" + dirPrefix + i.toString(), - GlusterStatus.UP); + brick = new GlusterBrickEntity(); + brick.setVolumeId(volumeId); + brick.setServerId(serverId); + brick.setServerName(serverName); + brick.setBrickDirectory("/tmp/" + dirPrefix + i.toString()); + brick.setStatus(GlusterStatus.UP); bricks.add(brick); } return bricks; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommandTest.java index 75e441f..e4e5dea 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommandTest.java @@ -15,7 +15,6 @@ import org.ovirt.engine.core.common.action.gluster.GlusterVolumeRebalanceParameters; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VdsStatic; import org.ovirt.engine.core.common.businessentities.gluster.AccessProtocol; import org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus; @@ -93,11 +92,10 @@ List<GlusterBrickEntity> bricks = new ArrayList<GlusterBrickEntity>(); GlusterBrickEntity brick; for (Integer i = 0; i < n; i++) { - brick = - new GlusterBrickEntity(volumeId, - new VdsStatic(), - "/tmp/test-vol" + i.toString(), - GlusterStatus.UP); + brick = new GlusterBrickEntity(); + brick.setVolumeId(volumeId); + brick.setBrickDirectory("/tmp/test-vol" + i.toString()); + brick.setStatus(GlusterStatus.UP); bricks.add(brick); } return bricks; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java index dfb0e7d..cc5183d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java @@ -4,7 +4,6 @@ import org.ovirt.engine.core.common.businessentities.BusinessEntity; import org.ovirt.engine.core.common.businessentities.IVdcQueryable; -import org.ovirt.engine.core.common.businessentities.VdsStatic; import org.ovirt.engine.core.common.utils.ObjectUtils; import org.ovirt.engine.core.common.validation.group.CreateEntity; import org.ovirt.engine.core.common.validation.group.gluster.AddBrick; @@ -44,14 +43,6 @@ private BrickDetails brickDetails; public GlusterBrickEntity() { - } - - public GlusterBrickEntity(Guid volumeId, VdsStatic server, String brickDirectory, GlusterStatus brickStatus) { - setVolumeId(volumeId); - setServerId(server.getId()); - setServerName(server.getHostName()); - setBrickDirectory(brickDirectory); - setStatus(brickStatus); } public Guid getVolumeId() { diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java index 849168b7..2ebe324 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java @@ -35,10 +35,12 @@ @Test public void testSaveAndGetById() { - GlusterBrickEntity brickToAdd = new GlusterBrickEntity(EXISTING_VOL_ID, - server, - "/export/test-vol-distribute-1/dir3", - GlusterStatus.UP); + GlusterBrickEntity brickToAdd = new GlusterBrickEntity(); + brickToAdd.setVolumeId(EXISTING_VOL_ID); + brickToAdd.setServerId(server.getId()); + brickToAdd.setServerName(server.getHostName()); + brickToAdd.setBrickDirectory("/export/test-vol-distribute-1/dir3"); + brickToAdd.setStatus(GlusterStatus.UP); brickToAdd.setBrickOrder(0); dao.save(brickToAdd); @@ -91,11 +93,12 @@ GlusterBrickEntity firstBrick = dao.getById(EXISTING_BRICK_ID); assertNotNull(firstBrick); - GlusterBrickEntity newBrick = - new GlusterBrickEntity(EXISTING_VOL_ID, - server, - "/export/test-vol-distribute-1/dir3", - GlusterStatus.UP); + GlusterBrickEntity newBrick = new GlusterBrickEntity(); + newBrick.setVolumeId(EXISTING_VOL_ID); + newBrick.setServerId(server.getId()); + newBrick.setServerName(server.getHostName()); + newBrick.setBrickDirectory("/export/test-vol-distribute-1/dir3"); + newBrick.setStatus(GlusterStatus.UP); newBrick.setBrickOrder(0); assertNull(dao.getById(newBrick.getId())); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoTest.java index 10e19c8..9a01378 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoTest.java @@ -386,8 +386,12 @@ volume.addAccessProtocol(AccessProtocol.GLUSTER); volume.addAccessProtocol(AccessProtocol.NFS); - GlusterBrickEntity brick = - new GlusterBrickEntity(volumeId, server, "/export/testVol1", GlusterStatus.UP); + GlusterBrickEntity brick = new GlusterBrickEntity(); + brick.setVolumeId(volumeId); + brick.setServerId(server.getId()); + brick.setServerName(server.getHostName()); + brick.setBrickDirectory("/export/testVol1"); + brick.setStatus(GlusterStatus.UP); brick.setBrickOrder(0); volume.addBrick(brick); -- To view, visit http://gerrit.ovirt.org/18114 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a215614f37b3858127fd420cc59777896ed9284 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
