Michael Pasternak has uploaded a new change for review. Change subject: restapi: add alias property to disk and deprecate name ......................................................................
restapi: add alias property to disk and deprecate name https://bugzilla.redhat.com/show_bug.cgi?id=859897 Change-Id: Ia93d9abd29e51239f64ae1b43306d44f10ae7af5 Signed-off-by: Michael Pasternak <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java 3 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/8326/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index d127bdd..7f46a16 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -2163,6 +2163,8 @@ <xs:complexContent> <xs:extension base="BaseDevice"> <xs:sequence> + <!-- name is deprecated, use alias instead. --> + <xs:element name="alias" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="image_id" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element ref="storage_domains" minOccurs="0" maxOccurs="1"/> <xs:element name="size" type="xs:long" minOccurs="0"/> <!-- Deprecated, replaced by 'provisioned_size' --> diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml index 60e957b..b40c4bb 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml @@ -310,7 +310,8 @@ signatures: - mandatoryArguments: {provisioned_size: 'xs:int', disk.interface: 'xs:string', disk.format: 'xs:string'} optionalArguments: - disk.name: xs:string + disk.name: xs:string #deprecated, use alias instead + disk.alias: xs:string disk.size: xs:int #deprecated, replaced by 'provisioned_size' disk.sparse: xs:boolean disk.bootable: xs:boolean @@ -635,7 +636,8 @@ signatures: - mandatoryArguments: {provisioned_size: 'xs:int', disk.interface: 'xs:string', disk.format: 'xs:string'} optionalArguments: - disk.name: xs:string + disk.name: xs:string #deprecated, use alias instead + disk.alias: xs:string disk.size: xs:int #deprecated, replaced by 'provisioned_size' disk.sparse: xs:boolean disk.bootable: xs:boolean diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java index 24dd4e2..ff73937 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java @@ -32,8 +32,12 @@ engineDisk = new DiskImage(); } } + // name is depreciated, use alias instead. if (disk.isSetName()) { engineDisk.setDiskAlias(disk.getName()); + } + if (disk.isSetAlias()) { + engineDisk.setDiskAlias(disk.getAlias()); } if (disk.isSetId()) { engineDisk.setId(new Guid(disk.getId())); @@ -116,7 +120,9 @@ @Mapping(from = org.ovirt.engine.core.common.businessentities.Disk.class, to = Disk.class) public static Disk map(org.ovirt.engine.core.common.businessentities.Disk entity, Disk template) { Disk model = template != null ? template : new Disk(); + // name is depreciated, use alias instead. model.setName(entity.getDiskAlias()); + model.setAlias(entity.getDiskAlias()); if (entity.getId() != null) { model.setId(entity.getId().toString()); } -- To view, visit http://gerrit.ovirt.org/8326 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia93d9abd29e51239f64ae1b43306d44f10ae7af5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
