Hello Ori Liel,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/41871
to review the following change.
Change subject: restapi: Move OpenStackVolume Providers remove to entity
......................................................................
restapi: Move OpenStackVolume Providers remove to entity
This patch moves the method that implements the DELETE operation from
the collection interface to the entity interface. This is needed to
avoid issues with newer versions of Resteasy.
Change-Id: I21e9b69a1f47e5b55c79115cf7113c93d1404d07
Signed-off-by: Ori Liel <ol...@redhat.com>
---
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProvidersResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResourceTest.java
5 files changed, 30 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/41871/1
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java
index 4fb3b2f..0304a78 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java
@@ -20,11 +20,16 @@
import org.ovirt.engine.api.resource.ApiMediaType;
import org.ovirt.engine.api.resource.ExternalProviderResource;
+import javax.ws.rs.DELETE;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
@Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON,
ApiMediaType.APPLICATION_X_YAML})
public interface OpenStackVolumeProviderResource extends
ExternalProviderResource<OpenStackVolumeProvider> {
@Path("volumetypes")
public OpenStackVolumeTypesResource getOpenStackVolumeTypes();
+
+ @DELETE
+ Response remove();
}
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java
index a4fbb3f..de42558 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java
@@ -21,7 +21,6 @@
import org.ovirt.engine.api.resource.ApiMediaType;
import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -38,10 +37,6 @@
@POST
@Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON,
ApiMediaType.APPLICATION_X_YAML})
public Response add(OpenStackVolumeProvider provider);
-
- @DELETE
- @Path("{id}")
- public Response remove(@PathParam("id") String id);
@Path("{id}")
public OpenStackVolumeProviderResource
getOpenStackVolumeProvider(@PathParam("id") String id);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResource.java
index 0900b04..59eb65d 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResource.java
@@ -16,10 +16,15 @@
package org.ovirt.engine.api.restapi.resource.openstack;
+import javax.ws.rs.core.Response;
+
import org.ovirt.engine.api.model.OpenStackVolumeProvider;
import org.ovirt.engine.api.resource.openstack.OpenStackVolumeProviderResource;
import org.ovirt.engine.api.resource.openstack.OpenStackVolumeTypesResource;
import
org.ovirt.engine.api.restapi.resource.AbstractBackendExternalProviderResource;
+import org.ovirt.engine.api.restapi.resource.BackendExternalProviderHelper;
+import org.ovirt.engine.core.common.action.ProviderParameters;
+import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.Provider;
import static
org.ovirt.engine.api.restapi.resource.openstack.BackendOpenStackVolumeProvidersResource.SUB_COLLECTIONS;
@@ -48,4 +53,11 @@
BackendOpenStackVolumeProvidersResource getParent() {
return parent;
}
+
+ @Override
+ public Response remove() {
+ Provider provider = BackendExternalProviderHelper.getProvider(this,
id);
+ ProviderParameters parameters = new ProviderParameters(provider);
+ return performAction(VdcActionType.RemoveProvider, parameters);
+ }
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProvidersResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProvidersResource.java
index 0fa1b4b..39cb4a4 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProvidersResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProvidersResource.java
@@ -24,7 +24,6 @@
import org.ovirt.engine.api.resource.openstack.OpenStackVolumeProviderResource;
import
org.ovirt.engine.api.resource.openstack.OpenStackVolumeProvidersResource;
import org.ovirt.engine.api.restapi.resource.AbstractBackendCollectionResource;
-import org.ovirt.engine.api.restapi.resource.BackendExternalProviderHelper;
import org.ovirt.engine.api.restapi.resource.SingleEntityResource;
import org.ovirt.engine.api.restapi.types.DataCenterMapper;
import org.ovirt.engine.core.common.action.ProviderParameters;
@@ -107,13 +106,6 @@
new ProviderParameters(map(provider)),
new QueryIdResolver<Guid>(VdcQueryType.GetProviderById,
IdQueryParameters.class)
);
- }
-
- @Override
- protected Response performRemove(String id) {
- Provider provider = BackendExternalProviderHelper.getProvider(this,
id);
- ProviderParameters parameters = new ProviderParameters(provider);
- return performAction(VdcActionType.RemoveProvider, parameters);
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResourceTest.java
index 4322d41..6678b44 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackVolumeProviderResourceTest.java
@@ -157,6 +157,19 @@
}
}
+ @Test
+ public void testRemove() throws Exception {
+ setUriInfo(setUpBasicUriExpectations());
+ setUpGetEntityExpectations(1);
+ setUpActionExpectations(VdcActionType.RemoveProvider,
+ ProviderParameters.class,
+ new String[] { "Provider.Id" },
+ new Object[] { GUIDS[0] },
+ true,
+ true);
+ resource.remove();
+ }
+
private OpenStackVolumeProvider getModel(int index) {
OpenStackVolumeProvider model = new OpenStackVolumeProvider();
model.setName(NAMES[index]);
--
To view, visit https://gerrit.ovirt.org/41871
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21e9b69a1f47e5b55c79115cf7113c93d1404d07
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
Gerrit-Reviewer: Ori Liel <ol...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
