Ori Liel has uploaded a new change for review. Change subject: restapi: Move Storage-Domain Contentes remove to entity ......................................................................
restapi: Move Storage-Domain Contentes 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: I5953560657bc0e2c99ca8f5885821d6682b83fbf Signed-off-by: Ori Liel <ol...@redhat.com> --- D backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/RemovableStorageDomainContentsResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainContentResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java 10 files changed, 140 insertions(+), 113 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/42141/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/RemovableStorageDomainContentsResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/RemovableStorageDomainContentsResource.java deleted file mode 100644 index d836cc6..0000000 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/RemovableStorageDomainContentsResource.java +++ /dev/null @@ -1,33 +0,0 @@ -/* -* Copyright (c) 2010 Red Hat, Inc. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package org.ovirt.engine.api.resource; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; - -import org.ovirt.engine.api.model.BaseResource; -import org.ovirt.engine.api.model.BaseResources; - -@Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) -public interface RemovableStorageDomainContentsResource<C extends BaseResources, R extends BaseResource> extends StorageDomainContentsResource<C, R> { - - @DELETE - @Path("{id}") - public Response remove(@PathParam("id") String id); -} diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainContentResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainContentResource.java index 39e244c..a25b118 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainContentResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainContentResource.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.Path; import javax.ws.rs.PathParam; import javax.ws.rs.POST; @@ -51,4 +52,7 @@ @Path("disks") public StorageDomainContentDisksResource getDisksResource(); + + @DELETE + public Response remove(); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainResource.java index 739390e..640e9ab 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/StorageDomainResource.java @@ -42,10 +42,10 @@ public AssignedPermissionsResource getPermissionsResource(); @Path("vms") - public RemovableStorageDomainContentsResource<VMs, VM> getStorageDomainVmsResource(); + public StorageDomainContentsResource<VMs, VM> getStorageDomainVmsResource(); @Path("templates") - public RemovableStorageDomainContentsResource<Templates, Template> getStorageDomainTemplatesResource(); + public StorageDomainContentsResource<Templates, Template> getStorageDomainTemplatesResource(); @Path("files") public FilesResource getFilesResource(); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java index 197eb95..e981ee1 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResource.java @@ -28,7 +28,7 @@ import org.ovirt.engine.api.resource.DisksResource; import org.ovirt.engine.api.resource.FilesResource; import org.ovirt.engine.api.resource.ImagesResource; -import org.ovirt.engine.api.resource.RemovableStorageDomainContentsResource; +import org.ovirt.engine.api.resource.StorageDomainContentsResource; import org.ovirt.engine.api.resource.StorageDomainResource; import org.ovirt.engine.api.resource.StorageDomainServerConnectionsResource; import org.ovirt.engine.api.restapi.util.StorageDomainHelper; @@ -363,12 +363,12 @@ } @Override - public RemovableStorageDomainContentsResource<Templates, Template> getStorageDomainTemplatesResource() { + public StorageDomainContentsResource<Templates, Template> getStorageDomainTemplatesResource() { return inject(new BackendStorageDomainTemplatesResource(guid)); } @Override - public RemovableStorageDomainContentsResource<VMs, VM> getStorageDomainVmsResource() { + public StorageDomainContentsResource<VMs, VM> getStorageDomainVmsResource() { return inject(new BackendStorageDomainVmsResource(guid)); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java index 54957dd..42a9a4d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java @@ -10,6 +10,7 @@ import org.ovirt.engine.api.resource.StorageDomainContentResource; import org.ovirt.engine.core.common.action.ImportVmTemplateParameters; import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.action.VmTemplateImportExportParameters; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.storage.Disk; import org.ovirt.engine.core.common.businessentities.storage.DiskImage; @@ -122,4 +123,13 @@ public StorageDomainContentDisksResource getDisksResource() { return inject(new BackendExportDomainDisksResource(this)); } + + @Override + public Response remove() { + get(); + return performAction(VdcActionType.RemoveVmTemplateFromImportExport, + new VmTemplateImportExportParameters(asGuid(id), + parent.storageDomainId, + getDataCenterId(parent.storageDomainId))); + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java index 4ec7dee..7740753 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java @@ -5,15 +5,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; import org.ovirt.engine.api.common.util.QueryHelper; import org.ovirt.engine.api.model.Template; import org.ovirt.engine.api.model.Templates; -import org.ovirt.engine.api.resource.RemovableStorageDomainContentsResource; import org.ovirt.engine.api.resource.StorageDomainContentResource; -import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.action.VmTemplateImportExportParameters; +import org.ovirt.engine.api.resource.StorageDomainContentsResource; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.storage.DiskImage; import org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters; @@ -23,7 +20,7 @@ public class BackendStorageDomainTemplatesResource extends AbstractBackendStorageDomainContentsResource<Templates, Template, VmTemplate> - implements RemovableStorageDomainContentsResource<Templates, Template> { + implements StorageDomainContentsResource<Templates, Template> { static final String[] SUB_COLLECTIONS = { "disks" }; @@ -73,14 +70,6 @@ @SingleEntityResource public StorageDomainContentResource<Template> getStorageDomainContentSubResource(String id) { return inject(new BackendStorageDomainTemplateResource(this, id)); - } - - @Override - public Response performRemove(String id) { - return performAction(VdcActionType.RemoveVmTemplateFromImportExport, - new VmTemplateImportExportParameters(asGuid(id), - storageDomainId, - getDataCenterId(storageDomainId))); } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java index c476e58..c96c1a2 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java @@ -9,6 +9,7 @@ import org.ovirt.engine.api.resource.StorageDomainContentDisksResource; import org.ovirt.engine.api.resource.StorageDomainContentResource; import org.ovirt.engine.core.common.action.ImportVmParameters; +import org.ovirt.engine.core.common.action.RemoveVmFromImportExportParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.storage.Disk; import org.ovirt.engine.core.common.queries.IdQueryParameters; @@ -122,4 +123,14 @@ return model; } + @Override + public Response remove() { + get(); + RemoveVmFromImportExportParameters params = new RemoveVmFromImportExportParameters( + asGuid(id), + parent.storageDomainId, + getDataCenterId(parent.storageDomainId)); + return performAction(VdcActionType.RemoveVmFromImportExport, params); + } + } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java index 9fb2b96..813dced 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java @@ -4,15 +4,11 @@ import java.util.Collection; import java.util.List; -import javax.ws.rs.core.Response; - import org.ovirt.engine.api.common.util.QueryHelper; import org.ovirt.engine.api.model.VM; import org.ovirt.engine.api.model.VMs; -import org.ovirt.engine.api.resource.RemovableStorageDomainContentsResource; import org.ovirt.engine.api.resource.StorageDomainContentResource; -import org.ovirt.engine.core.common.action.RemoveVmFromImportExportParameters; -import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.api.resource.StorageDomainContentsResource; import org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -20,7 +16,7 @@ public class BackendStorageDomainVmsResource extends AbstractBackendStorageDomainContentsResource<VMs, VM, org.ovirt.engine.core.common.businessentities.VM> - implements RemovableStorageDomainContentsResource<VMs, VM> { + implements StorageDomainContentsResource<VMs, VM> { static final String[] SUB_COLLECTIONS = { "disks" }; @@ -65,15 +61,6 @@ @SingleEntityResource public StorageDomainContentResource<VM> getStorageDomainContentSubResource(String id) { return inject(new BackendStorageDomainVmResource(this, id)); - } - - @Override - public Response performRemove(String id) { - RemoveVmFromImportExportParameters params = new RemoveVmFromImportExportParameters( - asGuid(id), - storageDomainId, - getDataCenterId(storageDomainId)); - return performAction(VdcActionType.RemoveVmFromImportExport, params); } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java index 37aa673..749192b 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import javax.ws.rs.WebApplicationException; @@ -22,6 +23,7 @@ import org.ovirt.engine.core.common.action.ImportVmTemplateParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.action.VmTemplateImportExportParameters; import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus; import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum; import org.ovirt.engine.core.common.businessentities.StorageDomainType; @@ -198,12 +200,58 @@ doTestImport(storageDomain, cluster, true); } + @Test + public void testRemove() throws Exception { + setUpQueryExpectations("", null, StorageDomainType.ImportExport, false); + setUpGetDataCenterByStorageDomainExpectations(GUIDS[3], 2); + setUriInfo(setUpActionExpectations(VdcActionType.RemoveVmTemplateFromImportExport, + VmTemplateImportExportParameters.class, + new String[] { "VmTemplateId", "StorageDomainId", "StoragePoolId" }, + new Object[] { GUIDS[1], GUIDS[3], GUIDS[0] }, + true, + true)); + verifyRemove(resource.remove()); + } + + @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 { + setUpQueryExpectations("", null, StorageDomainType.ImportExport, false); + setUpGetDataCenterByStorageDomainExpectations(GUIDS[3], 2); + setUriInfo(setUpActionExpectations(VdcActionType.RemoveVmTemplateFromImportExport, + VmTemplateImportExportParameters.class, + new String[] { "VmTemplateId", "StorageDomainId", "StoragePoolId" }, + new Object[] { GUIDS[1], GUIDS[3], GUIDS[0] }, + canDo, + success)); + try { + resource.remove(); + fail("expected WebApplicationException"); + } catch (WebApplicationException wae) { + verifyFault(wae, detail); + } + } + + private void setUpGetDataCenterByStorageDomainExpectations(Guid id, int times) { + while (times-->0) { + setUpEntityQueryExpectations(VdcQueryType.GetStoragePoolsByStorageDomainId, + IdQueryParameters.class, + new String[] { "Id" }, + new Object[] { id }, + setUpStoragePool()); + } + } + private void setUpGetDataCenterByStorageDomainExpectations(Guid id) { - setUpEntityQueryExpectations(VdcQueryType.GetStoragePoolsByStorageDomainId, - IdQueryParameters.class, - new String[] { "Id" }, - new Object[] { id }, - setUpStoragePool()); + setUpGetDataCenterByStorageDomainExpectations(id, 1); } public void doTestImport(StorageDomain storageDomain, Cluster cluster, boolean importAsNewEntity) throws Exception { @@ -381,4 +429,57 @@ cluster.setId(GUIDS[idx]); return cluster; } + + protected void setUpQueryExpectations(String query, Object failure, StorageDomainType domainType, boolean replay) + throws Exception { + assertEquals("", query); + + setUpEntityQueryExpectations(VdcQueryType.GetStorageDomainById, + IdQueryParameters.class, + new String[] { "Id" }, + new Object[] { STORAGE_DOMAIN_ID }, + setUpStorageDomain(domainType)); + + switch (domainType) { + case Data: + setUpEntityQueryExpectations(VdcQueryType.GetVmTemplatesFromStorageDomain, + IdQueryParameters.class, + new String[] { "Id" }, + new Object[] { STORAGE_DOMAIN_ID }, + setUpTemplates(), + failure); + break; + case ImportExport: + setUpEntityQueryExpectations(VdcQueryType.GetTemplatesFromExportDomain, + GetAllFromExportDomainQueryParameters.class, + new String[] { "StoragePoolId", "StorageDomainId" }, + new Object[] { DATA_CENTER_ID, STORAGE_DOMAIN_ID }, + setUpExportTemplates(), + failure); + break; + default: + break; + } + + if (replay) { + control.replay(); + } + } + + protected List<VmTemplate> setUpTemplates() { + List<VmTemplate> ret = new ArrayList<VmTemplate>(); + for (int i = 0; i < NAMES.length; i++) { + ret.add(getEntity(i)); + } + return ret; + } + + protected HashMap<VmTemplate, List<DiskImage>> setUpExportTemplates() { + HashMap<VmTemplate, List<DiskImage>> ret = new LinkedHashMap<VmTemplate, List<DiskImage>>(); + for (int i = 0; i < NAMES.length; i++) { + ret.put(getEntity(i), new ArrayList<DiskImage>()); + } + return ret; + } + } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java index e63571b..7812348 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java @@ -8,14 +8,11 @@ import java.util.LinkedHashMap; import java.util.List; -import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.UriInfo; import org.junit.Ignore; import org.junit.Test; import org.ovirt.engine.api.model.Template; -import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.action.VmTemplateImportExportParameters; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VmTemplate; @@ -177,43 +174,4 @@ } } - @Test - public void testRemove() throws Exception { - setUpQueryExpectations("", null, StorageDomainType.ImportExport, false); - setUpGetDataCenterByStorageDomainExpectations(GUIDS[3], 2); - setUriInfo(setUpActionExpectations(VdcActionType.RemoveVmTemplateFromImportExport, - VmTemplateImportExportParameters.class, - new String[] { "VmTemplateId", "StorageDomainId", "StoragePoolId" }, - new Object[] { GUIDS[0], GUIDS[3], GUIDS[0] }, - true, - true)); - verifyRemove(collection.remove(GUIDS[0].toString())); - } - - @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 { - setUpQueryExpectations("", null, StorageDomainType.ImportExport, false); - setUpGetDataCenterByStorageDomainExpectations(GUIDS[3], 2); - setUriInfo(setUpActionExpectations(VdcActionType.RemoveVmTemplateFromImportExport, - VmTemplateImportExportParameters.class, - new String[] { "VmTemplateId", "StorageDomainId", "StoragePoolId" }, - new Object[] { GUIDS[0], GUIDS[3], GUIDS[0] }, - canDo, - success)); - try { - collection.remove(GUIDS[0].toString()); - fail("expected WebApplicationException"); - } catch (WebApplicationException wae) { - verifyFault(wae, detail); - } - } } -- To view, visit https://gerrit.ovirt.org/42141 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5953560657bc0e2c99ca8f5885821d6682b83fbf 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
