Daniel Erez has uploaded a new change for review. Change subject: restapi: LUN disk creation - format is not required ......................................................................
restapi: LUN disk creation - format is not required 'format' is not applicable for DirectLUN disks, hence, removed from parameters validation. Change-Id: I35078fb62e5506a51e96d4c99223b8dadd29e5a2 Bug-Url: https://bugzilla.redhat.com/1083096 Signed-off-by: Daniel Erez <de...@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/BackendDisksResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/31677/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 75b38b6..6226bcd 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 @@ -698,7 +698,7 @@ disk.storage_domains.storage_domain--COLLECTION: {storage_domain.id|name: 'xs:string'} description: add a new disk to the virtual machine allocating space from the storage domain #the signature below is for direct-LUN disk, which doesn't require size, but requires the lun id, the lun type, and the lun connection-details. - - mandatoryArguments: {disk.interface: 'xs:string', disk.format: 'xs:string', disk.lun_storage.type: 'xs:string', + - mandatoryArguments: {disk.interface: 'xs:string', disk.lun_storage.type: 'xs:string', disk.lun_storage.logical_unit--COLLECTION: {logical_unit.id: 'xs:string', logical_unit.address: 'xs:string', logical_unit.port: 'xs:int', logical_unit.target: 'xs:string'}} optionalArguments: disk.alias: xs:string @@ -1195,7 +1195,7 @@ disk.storage_domains.storage_domain--COLLECTION: {storage_domain.id|name: 'xs:string'} description: add a new disk to the system with specified size, space will be allocated from the storage domain for the disk #the signature below is for direct-LUN disk, which doesn't require size, but requires the lun id, the lun type, and the lun connection-details. - - mandatoryArguments: {disk.interface: 'xs:string', disk.format: 'xs:string', disk.lun_storage.type: 'xs:string', + - mandatoryArguments: {disk.interface: 'xs:string', disk.lun_storage.type: 'xs:string', disk.lun_storage.logical_unit--COLLECTION: {logical_unit.id: 'xs:string', logical_unit.address: 'xs:string', logical_unit.port: 'xs:int', logical_unit.target: 'xs:string'}} optionalArguments: disk.alias: xs:string diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDisksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDisksResource.java index 9efeaf7..c362a14 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDisksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDisksResource.java @@ -48,7 +48,7 @@ } protected void validateDiskForCreation(Disk disk) { - validateParameters(disk, 2, "format", "interface"); + validateParameters(disk, 2, "interface"); if (DiskResourceUtils.isLunDisk(disk)) { validateParameters(disk.getLunStorage(), 3, "type"); // when creating a LUN disk, user must specify type. StorageType storageType = StorageType.fromValue(disk.getLunStorage().getType()); @@ -62,7 +62,7 @@ localize(Messages.INCOMPLETE_PARAMS_DETAIL_TEMPLATE, "LogicalUnit", "", "add"), Response.Status.BAD_REQUEST); } else { - validateParameters(disk, 2, "provisionedSize|size"); // Non lun disks require size + validateParameters(disk, 2, "provisionedSize|size", "format"); // Non lun disks require size and format } validateEnums(Disk.class, disk); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java index d21a048..1ad93fc 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java @@ -221,7 +221,7 @@ } protected void validateDiskForCreation(Disk disk) { - validateParameters(disk, 3, "format", "interface"); + validateParameters(disk, 3, "interface"); if (DiskResourceUtils.isLunDisk(disk)) { validateParameters(disk.getLunStorage(), 3, "type"); // when creating a LUN disk, user must specify type. StorageType storageType = StorageType.fromValue(disk.getLunStorage().getType()); @@ -235,7 +235,7 @@ localize(Messages.INCOMPLETE_PARAMS_DETAIL_TEMPLATE, "LogicalUnit", "", "add"), Response.Status.BAD_REQUEST); } else { - validateParameters(disk, 3, "provisionedSize|size"); // Non lun disks require size + validateParameters(disk, 3, "provisionedSize|size", "format"); // Non lun disks require size and format } validateEnums(Disk.class, disk); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java index 7cc468a..0373e66 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java @@ -416,7 +416,7 @@ fail("expected WebApplicationException on incomplete parameters"); } catch (WebApplicationException wae) { // Because of extra frame offset used current method name in test, while in real world used "add" method name - verifyIncompleteException(wae, "Disk", "testAddIncompleteParameters", "format", "interface"); + verifyIncompleteException(wae, "Disk", "testAddIncompleteParameters", "interface"); } } -- To view, visit http://gerrit.ovirt.org/31677 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I35078fb62e5506a51e96d4c99223b8dadd29e5a2 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
