Tal Nisan has uploaded a new change for review. Change subject: restapi: Remove add vm storage domain and disks options ......................................................................
restapi: Remove add vm storage domain and disks options Change-Id: I9462f4c64b98d10f84789fe8360a83f1ba1065a5 Bug-Url: https://bugzilla.redhat.com/1082977 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java 3 files changed, 4 insertions(+), 65 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/37615/4 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml index bbe9fe2..96138dc 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml @@ -187,7 +187,6 @@ vm.origin: xs:string vm.os.kernel: xs:string vm.disks.clone: xs:boolean - vm.disks.disk--COLLECTION: {disk.id: 'xs:string', storage_domains.storage_domain--COLLECTION: {storage_domain.id: 'xs:string'}} vm.tunnel_migration: xs:boolean vm.migration_downtime: xs:int vm.virtio_scsi.enabled: xs:boolean diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java index 9b0a65d..b97a029 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java @@ -171,7 +171,7 @@ if (vm.isSetDisks() && vm.getDisks().isSetClone() && vm.getDisks().isClone()) { response = cloneVmFromTemplate(staticVm, vm, templateEntity, instanceTypeEntity, cluster); } else if (Guid.Empty.equals(templateId)) { - response = addVmFromScratch(staticVm, vm, storageDomainId, instanceTypeEntity, cluster); + response = addVmFromScratch(staticVm, vm, instanceTypeEntity, cluster); } else { response = addVm(staticVm, vm, storageDomainId, templateEntity, instanceTypeEntity, cluster); } @@ -483,12 +483,10 @@ } } - protected Response addVmFromScratch(VmStatic staticVm, VM vm, Guid storageDomainId, InstanceType instanceType, VDSGroup cluster) { + protected Response addVmFromScratch(VmStatic staticVm, VM vm, InstanceType instanceType, VDSGroup cluster) { AddVmParameters params = new AddVmParameters(staticVm); - params.setDiskInfoList(mapDisks(vm.getDisks())); params.setVmPayload(getPayload(vm)); params.setMakeCreatorExplicitOwner(shouldMakeCreatorExplicitOwner()); - params.setStorageDomainId(storageDomainId); addDevicesToParams(params, vm, null, instanceType, staticVm.getOsId(), cluster); DisplayHelper.setGraphicsToParams(vm.getDisplay(), params); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java index ee23f9f..381fa9d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java @@ -348,12 +348,10 @@ new Object[]{GUIDS[0]}, getTemplateEntity(0)); - Disks disks = new Disks(); - disks.getDisks().add(new Disk()); setUpCreationExpectations(VdcActionType.AddVmFromScratch, AddVmParameters.class, - new String[]{"StorageDomainId", "DiskInfoList"}, - new Object[]{Guid.Empty, mapDisks(disks)}, + new String[]{"StorageDomainId"}, + new Object[]{Guid.Empty}, true, true, GUIDS[0], @@ -369,68 +367,12 @@ model.getCluster().setId(GUIDS[1].toString()); model.setTemplate(new Template()); model.getTemplate().setId(DEFAULT_TEMPLATE_ID); - model.setDisks(disks); Response response = collection.add(model); assertEquals(201, response.getStatus()); assertTrue(response.getEntity() instanceof VM); verifyModel((VM) response.getEntity(), 0); assertNull(((VM) response.getEntity()).getCreationStatus()); - } - - @Test - public void testAddFromScratchWithStorageDomain() throws Exception { - setUriInfo(setUpBasicUriExpectations()); - setUpHttpHeaderExpectations("Expect", "201-created"); - setUpGetPayloadExpectations(2, 0); - setUpGetBallooningExpectations(2, 0); - setUpGetConsoleExpectations(new int[]{0, 0}); - setUpGetVmOvfExpectations(new int[]{0, 0}); - setUpGetVirtioScsiExpectations(new int[]{0, 0}); - setUpGetSoundcardExpectations(new int[]{0, 0}); - setUpGetRngDeviceExpectations(new int[]{0, 0}); - setUpGetCertuficateExpectations(2, 0); - setUpEntityQueryExpectations(VdcQueryType.GetVmByVmId, - IdQueryParameters.class, - new String[] { "Id" }, - new Object[] { GUIDS[0] }, - getEntity(0)); - setUpEntityQueryExpectations(VdcQueryType.GetVdsGroupByVdsGroupId, - IdQueryParameters.class, - new String[] { "Id" }, - new Object[] { GUIDS[1] }, - getVdsGroupEntity()); - setUpEntityQueryExpectations(VdcQueryType.GetVmTemplate, - GetVmTemplateParameters.class, - new String[] { "Id" }, - new Object[] { GUIDS[0] }, - getTemplateEntity(0)); - setUpCreationExpectations(VdcActionType.AddVmFromScratch, - AddVmParameters.class, - new String[] { "StorageDomainId" }, - new Object[] { GUIDS[1] }, - true, - true, - GUIDS[0], - asList(GUIDS[1]), - asList(new AsyncTaskStatus(AsyncTaskStatusEnum.finished)), - VdcQueryType.GetVmByVmId, - IdQueryParameters.class, - new String[] { "Id" }, - new Object[] { GUIDS[0] }, - getEntity(0)); - VM model = getModel(0); - addStorageDomainToModel(model); - model.setCluster(new Cluster()); - model.getCluster().setId(GUIDS[1].toString()); - model.setTemplate(new Template()); - model.getTemplate().setId(DEFAULT_TEMPLATE_ID); - - Response response = collection.add(model); - assertEquals(201, response.getStatus()); - assertTrue(response.getEntity() instanceof VM); - verifyModel((VM) response.getEntity(), 0); - assertNull(((VM)response.getEntity()).getCreationStatus()); } @Test -- To view, visit https://gerrit.ovirt.org/37615 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9462f4c64b98d10f84789fe8360a83f1ba1065a5 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> Gerrit-Reviewer: Allon Mureinik <[email protected]> Gerrit-Reviewer: Juan Hernandez <[email protected]> Gerrit-Reviewer: Liron Aravot <[email protected]> Gerrit-Reviewer: Tal Nisan <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
