Ori Liel has uploaded a new change for review.
Change subject: restapi: Move OpenStackNetworkProviders remove to entity
......................................................................
restapi: Move OpenStackNetworkProviders 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: If0e61f98cd2fa7118f1b8355e1fab599e688aa31
Signed-off-by: Ori Liel <ol...@redhat.com>
---
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProvidersResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResourceTest.java
5 files changed, 31 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/41838/1
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java
index ef57fc3..1f6aa23 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java
@@ -16,8 +16,10 @@
package org.ovirt.engine.api.resource.openstack;
+import javax.ws.rs.DELETE;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
import org.ovirt.engine.api.model.OpenStackNetworkProvider;
import org.ovirt.engine.api.resource.ApiMediaType;
@@ -27,4 +29,7 @@
public interface OpenStackNetworkProviderResource extends
ExternalProviderResource<OpenStackNetworkProvider> {
@Path("networks")
public OpenStackNetworksResource getOpenStackNetworks();
+
+ @DELETE
+ public Response remove();
}
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java
index 385eb13..703514e 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java
@@ -17,7 +17,6 @@
package org.ovirt.engine.api.resource.openstack;
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;
@@ -39,10 +38,6 @@
@POST
@Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON,
ApiMediaType.APPLICATION_X_YAML})
public Response add(OpenStackNetworkProvider provider);
-
- @DELETE
- @Path("{id}")
- public Response remove(@PathParam("id") String id);
@Path("{id}")
public OpenStackNetworkProviderResource
getOpenStackNetworkProvider(@PathParam("id") String id);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResource.java
index 9731a2d..5125aae 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResource.java
@@ -18,12 +18,18 @@
import static
org.ovirt.engine.api.restapi.resource.openstack.BackendOpenStackNetworkProvidersResource.SUB_COLLECTIONS;
+import javax.ws.rs.core.Response;
+
import org.ovirt.engine.api.model.OpenStackNetworkProvider;
import org.ovirt.engine.api.resource.ExternalProviderCertificatesResource;
import
org.ovirt.engine.api.resource.openstack.OpenStackNetworkProviderResource;
import org.ovirt.engine.api.resource.openstack.OpenStackNetworksResource;
import
org.ovirt.engine.api.restapi.resource.AbstractBackendExternalProviderResource;
import
org.ovirt.engine.api.restapi.resource.BackendExternalProviderCertificatesResource;
+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;
public class BackendOpenStackNetworkProviderResource
extends
AbstractBackendExternalProviderResource<OpenStackNetworkProvider>
@@ -41,4 +47,11 @@
public ExternalProviderCertificatesResource getCertificates() {
return inject(new BackendExternalProviderCertificatesResource(id));
}
+
+ @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/BackendOpenStackNetworkProvidersResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProvidersResource.java
index 02ff680..622cdbc 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProvidersResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProvidersResource.java
@@ -28,7 +28,6 @@
import
org.ovirt.engine.api.resource.openstack.OpenStackNetworkProvidersResource;
import org.ovirt.engine.api.restapi.resource.AbstractBackendCollectionResource;
import org.ovirt.engine.api.restapi.resource.SingleEntityResource;
-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;
@@ -98,13 +97,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/BackendOpenStackNetworkProviderResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResourceTest.java
index 68aa328..020d4fa 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResourceTest.java
@@ -145,6 +145,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 OpenStackNetworkProvider getModel(int index) {
OpenStackNetworkProvider model = new OpenStackNetworkProvider();
model.setName(NAMES[index]);
--
To view, visit https://gerrit.ovirt.org/41838
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0e61f98cd2fa7118f1b8355e1fab599e688aa31
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ori Liel <ol...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
