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 <tni...@redhat.com> --- 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 2 files changed, 2 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/37615/1 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 52e90a9..e61ed94 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 @@ -186,8 +186,6 @@ vm.placement_policy.host.id|name: xs:string 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..0f9539f 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,30 +483,16 @@ } } - 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); return performCreate(VdcActionType.AddVmFromScratch, params, new QueryIdResolver<Guid>(VdcQueryType.GetVmByVmId, IdQueryParameters.class)); - } - - public ArrayList<DiskImage> mapDisks(Disks disks) { - ArrayList<DiskImage> diskImages = null; - if (disks!=null && disks.isSetDisks()) { - diskImages = new ArrayList<DiskImage>(); - for (Disk disk : disks.getDisks()) { - DiskImage diskImage = (DiskImage)DiskMapper.map(disk, null); - diskImages.add(diskImage); - } - } - return diskImages; } protected VM addInlineDetails(Set<String> details, VM vm) { -- To view, visit http://gerrit.ovirt.org/37615 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9462f4c64b98d10f84789fe8360a83f1ba1065a5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
