Juan Hernandez has uploaded a new change for review. Change subject: restapi: Move iSCSI Bond subresources remove from collection to entity ......................................................................
restapi: Move iSCSI Bond subresources remove from collection to entity This patch moves the methods that implement the DELETE operation from the collection interfaces to the entity interfaces. This is needed to avoid issues with newer versions of Resteasy. Change-Id: Ieb5a4c1331c70ac85bf73ce47cd0728cfcaa58cb Related: https://gerrit.ovirt.org/41783 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResourceTest.java 8 files changed, 94 insertions(+), 63 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/42212/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResource.java index 8d26925..f7523e8 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResource.java @@ -1,9 +1,13 @@ package org.ovirt.engine.api.restapi.resource; import org.ovirt.engine.api.model.Network; +import org.ovirt.engine.core.common.action.EditIscsiBondParameters; +import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.IscsiBond; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; + +import javax.ws.rs.core.Response; public class BackendIscsiBondNetworkResource extends BackendNetworkResource { @@ -40,4 +44,13 @@ public BackendIscsiBondNetworksResource getParent() { return parent; } + + + @Override + public Response remove() { + get(); + IscsiBond iscsiBond = parent.getIscsiBond(); + iscsiBond.getNetworkIds().remove(guid); + return performAction(VdcActionType.EditIscsiBond, new EditIscsiBondParameters(iscsiBond)); + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResource.java index c92fd5f..7e0129e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResource.java @@ -39,13 +39,6 @@ } @Override - public Response performRemove(String id) { - IscsiBond iscsiBond = getIscsiBond(); - iscsiBond.getNetworkIds().remove(Guid.createGuidFromString(id)); - return performAction(VdcActionType.EditIscsiBond, new EditIscsiBondParameters(iscsiBond)); - } - - @Override protected Network doPopulate(Network model, org.ovirt.engine.core.common.businessentities.network.Network entity) { return model; } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResource.java index cf4e562..2c8f11d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResource.java @@ -1,10 +1,14 @@ package org.ovirt.engine.api.restapi.resource; import org.ovirt.engine.api.model.StorageConnection; +import org.ovirt.engine.core.common.action.EditIscsiBondParameters; +import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.IscsiBond; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.queries.StorageServerConnectionQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; + +import javax.ws.rs.core.Response; public class BackendIscsiBondStorageConnectionResource extends BackendStorageServerConnectionResource { @@ -33,4 +37,12 @@ } return addLinks(map(entity)); } + + @Override + public Response remove() { + get(); + IscsiBond iscsiBond = parent.getIscsiBond(); + iscsiBond.getStorageConnectionIds().remove(id); + return performAction(VdcActionType.EditIscsiBond, new EditIscsiBondParameters(iscsiBond)); + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResource.java index d1a2465..74b22c4 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResource.java @@ -46,13 +46,6 @@ return inject(new BackendIscsiBondStorageConnectionResource(id, this)); } - @Override - protected Response performRemove(String id) { - IscsiBond iscsiBond = getIscsiBond(); - iscsiBond.getStorageConnectionIds().remove(id); - return performAction(VdcActionType.EditIscsiBond, new EditIscsiBondParameters(iscsiBond)); - } - protected IscsiBond getIscsiBond() { return getEntity(IscsiBond.class, VdcQueryType.GetIscsiBondById, new IdQueryParameters(iscsiBondId), iscsiBondId.toString()); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResourceTest.java index b050840..63775aa 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworkResourceTest.java @@ -4,8 +4,11 @@ import java.util.List; import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; import org.junit.Test; +import org.ovirt.engine.core.common.action.EditIscsiBondParameters; +import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.IscsiBond; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -71,6 +74,31 @@ } } + @Test + public void testRemove() throws Exception { + setUriInfo(setUpBasicUriExpectations()); + setUpEntityQueryExpectations(2, getIscsiBondContainingNetwork()); + setUpEntityQueryExpectations( + VdcQueryType.GetNetworkById, + IdQueryParameters.class, + new String[] { "Id" }, + new Object[] { NETWORK_ID }, + getEntityList() + ); + setUpActionExpectations( + VdcActionType.EditIscsiBond, + EditIscsiBondParameters.class, + new String[] { "IscsiBond" }, + new Object[] { getIscsiBondWithNoNetworks() }, + true, + true, + null + ); + Response response = resource.remove(); + assertNotNull(response); + assertEquals(200, response.getStatus()); + } + protected void setUpEntityQueryExpectations(int times, IscsiBond iscsiBond) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetIscsiBondById, @@ -94,4 +122,11 @@ iscsiBond.getNetworkIds().add(GUIDS[0]); return iscsiBond; } + + private org.ovirt.engine.core.common.businessentities.IscsiBond getIscsiBondWithNoNetworks() { + org.ovirt.engine.core.common.businessentities.IscsiBond iscsiBond = + new org.ovirt.engine.core.common.businessentities.IscsiBond(); + iscsiBond.setId(ISCSI_BOND_ID); + return iscsiBond; + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResourceTest.java index 0ddebda..c87998c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondNetworksResourceTest.java @@ -68,31 +68,6 @@ assertEquals(200, response.getStatus()); } - @Test - public void testRemove() throws Exception { - setUriInfo(setUpBasicUriExpectations()); - Network network = new Network(); - network.setId(NETWORK_ID.toString()); - - setUpGetEntityExpectations(VdcQueryType.GetIscsiBondById, - IdQueryParameters.class, - new String[] { "Id" }, - new Object[] { ISCSI_BOND_ID }, - getIscsiBondContainingNetwork()); - - setUpActionExpectations(VdcActionType.EditIscsiBond, - EditIscsiBondParameters.class, - new String[] { "IscsiBond" }, - new Object[] { getIscsiBondWithNoNetworks() }, - true, - true, - null); - - Response response = collection.performRemove(network.getId()); - assertNotNull(response); - assertEquals(200, response.getStatus()); - } - @Override protected void setUpEntityQueryExpectations(int times, Object failure) throws Exception { while (times-- > 0) { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResourceTest.java index 519f54f..0e502f6 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionResourceTest.java @@ -1,9 +1,12 @@ package org.ovirt.engine.api.restapi.resource; import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; import org.junit.Test; import org.ovirt.engine.api.model.StorageConnection; +import org.ovirt.engine.core.common.action.EditIscsiBondParameters; +import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.IscsiBond; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.queries.IdQueryParameters; @@ -79,6 +82,30 @@ } } + @Test + public void testRemove() throws Exception { + setUriInfo(setUpBasicUriExpectations()); + setUpEntityQueryExpectations(2, getIscsiBondContainingStorageConnection()); + setUpEntityQueryExpectations( + VdcQueryType.GetStorageServerConnectionById, + StorageServerConnectionQueryParametersBase.class, + new String[] { "ServerConnectionId" }, + new Object[] { STORAGE_CONNECTION_ID.toString() }, + getEntity(0) + ); + setUpActionExpectations( + VdcActionType.EditIscsiBond, + EditIscsiBondParameters.class, + new String[] { "IscsiBond" }, + new Object[] { getIscsiBond() }, + true, + true, + null + ); + Response response = resource.remove(); + assertEquals(200, response.getStatus()); + } + protected void setUpEntityQueryExpectations(int times, IscsiBond iscsiBond) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetIscsiBondById, @@ -112,4 +139,11 @@ cnx.setconnection("10.11.12.13" + ":" + "/1"); return cnx; } + + private org.ovirt.engine.core.common.businessentities.IscsiBond getIscsiBond() { + org.ovirt.engine.core.common.businessentities.IscsiBond iscsiBond = + new org.ovirt.engine.core.common.businessentities.IscsiBond(); + iscsiBond.setId(ISCSI_BOND_ID); + return iscsiBond; + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResourceTest.java index 8acad7e..afd62b9 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondStorageConnectionsResourceTest.java @@ -65,30 +65,6 @@ assertEquals(200, response.getStatus()); } - @Test - public void testRemove() throws Exception { - setUriInfo(setUpBasicUriExpectations()); - StorageConnection storageConnection = new StorageConnection(); - storageConnection.setId(STORAGE_CONNECTION_ID.toString()); - - setUpGetEntityExpectations(VdcQueryType.GetIscsiBondById, - IdQueryParameters.class, - new String[] { "Id" }, - new Object[] { ISCSI_BOND_ID }, - getIscsiBondContainingStorageConnection()); - - setUpActionExpectations(VdcActionType.EditIscsiBond, - EditIscsiBondParameters.class, - new String[] { "IscsiBond" }, - new Object[] { getIscsiBond() }, - true, - true, - null); - - Response response = collection.performRemove(storageConnection.getId()); - assertEquals(200, response.getStatus()); - } - @Override protected void setUpQueryExpectations(String query, Object failure) throws Exception { setUpEntityQueryExpectations(VdcQueryType.GetStorageServerConnectionByIscsiBondId, -- To view, visit https://gerrit.ovirt.org/42212 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb5a4c1331c70ac85bf73ce47cd0728cfcaa58cb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
