Ori Liel has uploaded a new change for review.
Change subject: restapi: Move Template remove from collection to entity
......................................................................
restapi: Move Template remove from collection 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: Ic7503ad17e2376fbb3853cee988653b5d810f0f4
Signed-off-by: Ori Liel <ol...@redhat.com>
---
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplatesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java
6 files changed, 70 insertions(+), 69 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/41951/1
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
index 927cd17..e1b3ca4 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
@@ -17,6 +17,7 @@
package org.ovirt.engine.api.resource;
import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -43,6 +44,9 @@
@Path("export")
public Response export(Action action);
+ @DELETE
+ public Response remove();
+
@Path("cdroms")
public ReadOnlyDevicesResource<CdRom, CdRoms> getCdRomsResource();
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplatesResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplatesResource.java
index b293cdc..171d49a 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplatesResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplatesResource.java
@@ -17,7 +17,6 @@
package org.ovirt.engine.api.resource;
import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -38,10 +37,6 @@
@POST
@Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON,
ApiMediaType.APPLICATION_X_YAML})
public Response add(Template template);
-
- @DELETE
- @Path("{id}")
- public Response remove(@PathParam("id") String id);
@Path("{id}")
public TemplateResource getTemplateSubResource(@PathParam("id") String id);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
index 19c9385..f7e2975 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
@@ -31,6 +31,7 @@
import org.ovirt.engine.core.common.action.UpdateVmTemplateParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
+import org.ovirt.engine.core.common.action.VmTemplateParametersBase;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VmRngDevice;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
@@ -60,6 +61,12 @@
}
@Override
+ public Response remove() {
+ get();
+ return performAction(VdcActionType.RemoveVmTemplate, new
VmTemplateParametersBase(asGuid(id)));
+ }
+
+ @Override
public Template update(Template incoming) {
validateEnums(Template.class, incoming);
Template result = performUpdate(
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
index 87a8d74..b788c2f 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java
@@ -25,7 +25,6 @@
import org.ovirt.engine.api.restapi.util.VmHelper;
import org.ovirt.engine.core.common.action.AddVmTemplateParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.action.VmTemplateParametersBase;
import org.ovirt.engine.core.common.businessentities.storage.DiskImage;
import org.ovirt.engine.core.common.businessentities.Entities;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
@@ -195,11 +194,6 @@
VdcQueryType.GetAllDisksByVmId,
new IdQueryParameters(asGuid(vm.getId())));
return Entities.businessEntitiesById(vmDisks);
- }
-
- @Override
- public Response performRemove(String id) {
- return performAction(VdcActionType.RemoveVmTemplate, new
VmTemplateParametersBase(asGuid(id)));
}
protected Templates mapCollection(List<VmTemplate> entities) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java
index a8893c2..a01de1e 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java
@@ -8,10 +8,12 @@
import org.ovirt.engine.core.common.action.MoveVmParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
+import org.ovirt.engine.core.common.action.VmTemplateParametersBase;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
+import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -59,6 +61,63 @@
}
@Test
+ public void testRemove() throws Exception {
+ setUpGetEntityExpectations(1);
+ setUpGetGraphicsExpectations(1);
+ setUriInfo(setUpActionExpectations(VdcActionType.RemoveVmTemplate,
+ VmTemplateParametersBase.class,
+ new String[] { "VmTemplateId" },
+ new Object[] { GUIDS[0] },
+ true,
+ true));
+ verifyRemove(resource.remove());
+ }
+
+ @Test
+ public void testRemoveNonExistant() throws Exception {
+ setUpGetEntityExpectations(VdcQueryType.GetVmTemplate,
+ GetVmTemplateParameters.class,
+ new String[] { "Id" },
+ new Object[] { GUIDS[0] },
+ null);
+ control.replay();
+ try {
+ resource.remove();
+ fail("expected WebApplicationException");
+ } catch (WebApplicationException wae) {
+ assertNotNull(wae.getResponse());
+ assertEquals(404, wae.getResponse().getStatus());
+ }
+ }
+
+ @Test
+ public void testRemoveCantDo() throws Exception {
+ doTestBadRemove(false, true, CANT_DO);
+ }
+
+ @Test
+ public void testRemoveFailed() throws Exception {
+ doTestBadRemove(true, false, FAILURE);
+ }
+
+ protected void doTestBadRemove(boolean canDo, boolean success, String
detail) throws Exception {
+ setUpGetEntityExpectations(1);
+ setUpGetGraphicsExpectations(1);
+ setUriInfo(setUpActionExpectations(VdcActionType.RemoveVmTemplate,
+ VmTemplateParametersBase.class,
+ new String[] { "VmTemplateId" },
+ new Object[] { GUIDS[0] },
+ canDo,
+ success));
+ try {
+ resource.remove();
+ fail("expected WebApplicationException");
+ } catch (WebApplicationException wae) {
+ verifyFault(wae, detail);
+ }
+ }
+
+ @Test
public void testExport() throws Exception {
testExportWithStorageDomainId(false);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java
index 5a7c241..0b85b31 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java
@@ -6,7 +6,6 @@
import org.ovirt.engine.api.model.Template;
import org.ovirt.engine.core.common.action.AddVmTemplateParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.action.VmTemplateParametersBase;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum;
import org.ovirt.engine.core.common.businessentities.GraphicsDevice;
@@ -30,63 +29,6 @@
protected BackendTemplatesBasedResourceTest(C collection, SearchType
searchType, String prefix) {
super(collection, searchType, prefix);
- }
-
- @Test
- public void testRemove() throws Exception {
- setUpGetEntityExpectations(0);
- setUpGetGraphicsExpectations(1);
- setUriInfo(setUpActionExpectations(VdcActionType.RemoveVmTemplate,
- VmTemplateParametersBase.class,
- new String[] { "VmTemplateId" },
- new Object[] { GUIDS[0] },
- true,
- true));
- verifyRemove(collection.remove(GUIDS[0].toString()));
- }
-
- @Test
- public void testRemoveNonExistant() throws Exception{
- setUpGetEntityExpectations(VdcQueryType.GetVmTemplate,
- GetVmTemplateParameters.class,
- new String[] { "Id" },
- new Object[] { NON_EXISTANT_GUID },
- null);
- control.replay();
- try {
- collection.remove(NON_EXISTANT_GUID.toString());
- fail("expected WebApplicationException");
- } catch (WebApplicationException wae) {
- assertNotNull(wae.getResponse());
- assertEquals(404, wae.getResponse().getStatus());
- }
- }
-
- @Test
- public void testRemoveCantDo() throws Exception {
- doTestBadRemove(false, true, CANT_DO);
- }
-
- @Test
- public void testRemoveFailed() throws Exception {
- doTestBadRemove(true, false, FAILURE);
- }
-
- protected void doTestBadRemove(boolean canDo, boolean success, String
detail) throws Exception {
- setUpGetEntityExpectations(0);
- setUpGetGraphicsExpectations(1);
- setUriInfo(setUpActionExpectations(VdcActionType.RemoveVmTemplate,
- VmTemplateParametersBase.class,
- new String[] { "VmTemplateId" },
- new Object[] { GUIDS[0] },
- canDo,
- success));
- try {
- collection.remove(GUIDS[0].toString());
- fail("expected WebApplicationException");
- } catch (WebApplicationException wae) {
- verifyFault(wae, detail);
- }
}
@Test
--
To view, visit https://gerrit.ovirt.org/41951
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7503ad17e2376fbb3853cee988653b5d810f0f4
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
