Daniel Erez has uploaded a new change for review. Change subject: restapi: wrong SDs on templates disks entities ......................................................................
restapi: wrong SDs on templates disks entities Removed deprecated logic from 'BackendReadOnlyDisksResource -> list' (used only by BackendTemplateDisksResource), which fetches storage domains using GetStorageDomainsByVmTemplateId and adds it to all disks in the collection. As a result, all disks contain all storage domains IDs - a correct behavior pre-MSD (back when we had a copy template action). Change-Id: Ica6787d39fbdec49250d4a3a385c9027e288c24e Bug-Url: https://bugzilla.redhat.com/1193079 Signed-off-by: Daniel Erez <de...@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResourceTest.java 2 files changed, 2 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/37820/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResource.java index 57c258dc..030e6ad 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResource.java @@ -4,8 +4,6 @@ import org.ovirt.engine.api.model.Disk; import org.ovirt.engine.api.model.Disks; -import org.ovirt.engine.api.model.StorageDomain; -import org.ovirt.engine.api.model.StorageDomains; import org.ovirt.engine.api.resource.ReadOnlyDevicesResource; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; @@ -23,21 +21,10 @@ @Override public Disks list() { IdQueryParameters queryParams = new IdQueryParameters(parentId); - List<org.ovirt.engine.core.common.businessentities.StorageDomain> storageDomains = getBackendCollection(org.ovirt.engine.core.common.businessentities.StorageDomain.class, VdcQueryType.GetStorageDomainsByVmTemplateId, queryParams); List<org.ovirt.engine.core.common.businessentities.Disk> backendCollection = getBackendCollection(queryType, queryParams); Disks disks = mapCollection(backendCollection, false); for (Disk disk : disks.getDisks()) { disk.setVm(null); - if (disk.isSetStorageDomains()) { - disk.getStorageDomains().getStorageDomains().clear(); - } else { - disk.setStorageDomains(new StorageDomains()); - } - for (org.ovirt.engine.core.common.businessentities.StorageDomain sd : storageDomains) { - StorageDomain storageDomain = new StorageDomain(); - storageDomain.setId(sd.getId().toString()); - disk.getStorageDomains().getStorageDomains().add(storageDomain); - } addLinks(disk); } return disks; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResourceTest.java index d327426..b8dd8de 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendReadOnlyDisksResourceTest.java @@ -1,6 +1,5 @@ package org.ovirt.engine.api.restapi.resource; -import java.util.ArrayList; import java.util.List; import javax.ws.rs.WebApplicationException; @@ -51,16 +50,14 @@ public void testList() throws Exception { UriInfo uriInfo = setUpUriExpectations(null); setUpEntityQueryExpectations(1, null); - setUpGetStorageDomainsQueryExpectations(1); control.replay(); collection.setUriInfo(uriInfo); List<Disk> disks = getCollection(); for (Disk disk : disks) { assertNotNull(disk.getStorageDomains()); List<StorageDomain> storageDomains = disk.getStorageDomains().getStorageDomains(); - assertEquals(storageDomains.size(), 2); - assertEquals(storageDomains.get(0).getId(), GUIDS[2].toString()); - assertEquals(storageDomains.get(1).getId(), GUIDS[3].toString()); + assertEquals(storageDomains.size(), 1); + assertEquals(storageDomains.get(0).getId(), GUIDS[0].toString()); } verifyCollection(disks); } @@ -71,7 +68,6 @@ UriInfo uriInfo = setUpUriExpectations(null); setUpEntityQueryExpectations(1, FAILURE); - setUpGetStorageDomainsQueryExpectations(1); control.replay(); collection.setUriInfo(uriInfo); try { @@ -90,7 +86,6 @@ Throwable t = new RuntimeException(FAILURE); setUpEntityQueryExpectations(1, t); - setUpGetStorageDomainsQueryExpectations(1); control.replay(); collection.setUriInfo(uriInfo); try { @@ -109,7 +104,6 @@ Throwable t = new RuntimeException(FAILURE); setUpEntityQueryExpectations(1, t); - setUpGetStorageDomainsQueryExpectations(1); control.replay(); collection.setUriInfo(uriInfo); try { @@ -121,27 +115,4 @@ locales.clear(); } } - - private int setUpGetStorageDomainsQueryExpectations(int times) { - while (times-- > 0) { - setUpEntityQueryExpectations(VdcQueryType.GetStorageDomainsByVmTemplateId, - IdQueryParameters.class, - new String[] { "Id" }, - new Object[] { PARENT_ID }, - getStorageDomains(), - null); - } - return times; - } - - protected List<org.ovirt.engine.core.common.businessentities.StorageDomain> getStorageDomains() { - List<org.ovirt.engine.core.common.businessentities.StorageDomain> storageDomains = new ArrayList<org.ovirt.engine.core.common.businessentities.StorageDomain>(); - org.ovirt.engine.core.common.businessentities.StorageDomain storageDomain = new org.ovirt.engine.core.common.businessentities.StorageDomain(); - storageDomain.setId(GUIDS[2]); - storageDomains.add(storageDomain); - storageDomain = new org.ovirt.engine.core.common.businessentities.StorageDomain(); - storageDomain.setId(GUIDS[3]); - storageDomains.add(storageDomain); - return storageDomains; - } } -- To view, visit http://gerrit.ovirt.org/37820 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica6787d39fbdec49250d4a3a385c9027e288c24e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
