Sahina Bose has uploaded a new change for review. Change subject: restapi: Refactored BackendGlusterBrickResource ......................................................................
restapi: Refactored BackendGlusterBrickResource Refactored BackendGlusterBrickResource to use parent's populateAdvancedDetails method to populate brick with advance details in case of All-Content set to true. Change-Id: I70354105b57159e6ba872804701910b4111b734b Signed-off-by: Sahina Bose <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBricksResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java 3 files changed, 30 insertions(+), 39 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/13120/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResource.java index b1ba675..be0e341 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResource.java @@ -81,30 +81,7 @@ @Override protected GlusterBrick doPopulate(GlusterBrick model, GlusterBrickEntity entity) { - return populateAdvancedDetails(model,entity); - } - - private GlusterBrick populateAdvancedDetails(GlusterBrick model, GlusterBrickEntity entity) { - - GlusterVolumeEntity volumeEntity = getEntity(GlusterVolumeEntity.class, - VdcQueryType.GetGlusterVolumeById, - new IdQueryParameters(entity.getVolumeId()), - null, - true); - - GlusterVolumeAdvancedDetails detailsEntity = getEntity(GlusterVolumeAdvancedDetails.class, - VdcQueryType.GetGlusterVolumeAdvancedDetails, - new GlusterVolumeAdvancedDetailsParameters(volumeEntity.getClusterId(), - volumeEntity.getName(), - entity.getQualifiedName(),true), - null, - true); - - model = getMapper(GlusterVolumeAdvancedDetails.class, GlusterBrick.class) - .map(detailsEntity, model); - - return model; - + return parent.populateAdvancedDetails(model,entity); } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBricksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBricksResource.java index b0fe626..47a793f 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBricksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBricksResource.java @@ -176,7 +176,7 @@ return populateAdvancedDetails(model, entity); } - private GlusterBrick populateAdvancedDetails(GlusterBrick model, GlusterBrickEntity entity) { + protected GlusterBrick populateAdvancedDetails(GlusterBrick model, GlusterBrickEntity entity) { GlusterVolumeEntity volumeEntity = getEntity(GlusterVolumeEntity.class, VdcQueryType.GetGlusterVolumeById, diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java index 9278fe3..274bce9 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java @@ -50,6 +50,7 @@ @Override protected void init() { super.init(); + bricksResourceMock = control.createMock(BackendGlusterBricksResource.class); } @Test @@ -86,7 +87,7 @@ resource.replace(new Action()); } catch (WebApplicationException wae) { verifyIncompleteException(wae, "Action", "replace", "Brick.serverId, Brick.brickDir"); - } + } } @Test @@ -186,7 +187,7 @@ expect(brickDetails.getBrickProperties()).andReturn(brickProps).anyTimes(); //List<BrickDetails> brickDetailsList = Arrays.asList(brickDetails); expect(entity.getBrickDetails()).andReturn(brickDetails).anyTimes(); - } + } return entity; } @@ -207,9 +208,9 @@ } private void verifyModelWithDetails(GlusterBrick model, int index) { - verifyModel(model, index); - assertEquals(GlusterTestHelper.BRICK_PORT, model.getPort()); - assertEquals(GlusterTestHelper.BRICK_MNT_OPT, model.getMntOptions()); + verifyModel(model, index); + assertEquals(GlusterTestHelper.BRICK_PORT, model.getPort()); + assertEquals(GlusterTestHelper.BRICK_MNT_OPT, model.getMntOptions()); } protected void setUpGetEntityExpectations(int times) throws Exception { @@ -227,11 +228,11 @@ } private void setUpGetEntityExpectationsAllContent(int times, boolean notFound) throws Exception { + setUpGetEntityExpectations(times,notFound); List<String> populateValue = new ArrayList<String>(); populateValue.add("true"); expect(httpHeaders.getRequestHeader(AbstractBackendResource.POPULATE)).andReturn(populateValue).anyTimes(); - - setupEntityExpectationAdvancedDetails(times, notFound, false); + setupParentPopulateExpectations(notFound); } private void setupEntityExpectationAdvancedDetails(int times, boolean notFound, boolean hasBrickDetails) throws Exception { @@ -240,10 +241,10 @@ GlusterTestHelper helper = new GlusterTestHelper(control); while (times-- > 0) { setUpGetEntityExpectations(VdcQueryType.GetGlusterBrickById, - IdQueryParameters.class, - new String[] { "Id" }, - new Object[] { brickId }, - hasBrickDetails? getEntityWithDetails(0): getEntity(0)); + IdQueryParameters.class, + new String[] { "Id" }, + new Object[] { brickId }, + hasBrickDetails? getEntityWithDetails(0): getEntity(0)); setUpGetEntityExpectations(VdcQueryType.GetGlusterVolumeById, IdQueryParameters.class, new String[] { "Id" }, @@ -258,11 +259,24 @@ } } + private void setupParentPopulateExpectations(boolean notFound) { + + expect(bricksResourceMock.populateAdvancedDetails(isA(GlusterBrick.class), isA(GlusterBrickEntity.class))).andDelegateTo( + new BackendGlusterBricksResource() { + + @Override + protected GlusterBrick populateAdvancedDetails(GlusterBrick model, GlusterBrickEntity entity) { + model.setPort(GlusterTestHelper.BRICK_PORT); + model.setMntOptions(GlusterTestHelper.BRICK_MNT_OPT); + return model; + } + + }).anyTimes(); + + } + private void setupParentExpectations() { - - - bricksResourceMock = control.createMock(BackendGlusterBricksResource.class); volumeResourceMock = control.createMock(BackendGlusterVolumeResource.class); expect(bricksResourceMock.getParent()).andReturn(volumeResourceMock).anyTimes(); expect(volumeResourceMock.getId()).andReturn(volumeId.toString()).anyTimes(); -- To view, visit http://gerrit.ovirt.org/13120 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70354105b57159e6ba872804701910b4111b734b 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
