Maor Lipchuk has uploaded a new change for review. Change subject: restapi: Change field name import to import_existing ......................................................................
restapi: Change field name import to import_existing Changing the import field to import_existing so it will be suitable with the test infra structure Change-Id: I28c4c72624a295938e4adbb76abbc20f7300286b Bug-Url: https://bugzilla.redhat.com/1179246 Signed-off-by: Maor Lipchuk <[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.yaml M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/36939/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 732c1d8..ebe7255 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 @@ -2762,7 +2762,7 @@ <xs:element name="committed" type="xs:long" minOccurs="0"/> <xs:element name="storage_format" type="xs:string" minOccurs="0"/> <xs:element name="wipe_after_delete" type="xs:boolean" minOccurs="0"/> - <xs:element name="import" type="xs:boolean" minOccurs="0"/> + <xs:element name="import_existing" type="xs:boolean" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> 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 b384f23..06b6a8f 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 @@ -1564,7 +1564,7 @@ optionalArguments: {storagedomain.name: 'xs:string', storagedomain.comment: 'xs:string', storagedomain.storage.override_luns: 'xs:boolean', storagedomain.storage_format: 'xs:string', storagedomain.wipe_after_delete: 'xs:boolean'} description: add a new storage domain to the system using a direct lun - mandatoryArguments: {storagedomain.host.id|name: 'xs:string', - storagedomain.type: 'xs:string', storagedomain.storage.type: 'xs:string', storagedomain.import: 'xs:boolean'} + storagedomain.type: 'xs:string', storagedomain.storage.type: 'xs:string', storagedomain.import_existing: 'xs:boolean'} optionalArguments: {storagedomain.storage.address: 'xs:string', storagedomain.format: 'xs:boolean', storagedomain.comment: 'xs:string'} description: Import an existing block storage domain to the system using the targets already connected to the host - mandatoryArguments: {storagedomain.host.id|name: 'xs:string', diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java index b7c9ff3..587785f 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java @@ -273,7 +273,7 @@ switch (entity.getStorageType()) { case ISCSI: case FCP: - if (storageDomain.isSetImport() && storageDomain.isImport()) { + if (storageDomain.isSetImportExisting() && storageDomain.isImportExisting()) { resp = addExistingSAN(storageDomain, entity.getStorageType(), hostId); } else { resp = addSAN(storageDomain, entity.getStorageType(), entity, hostId); -- To view, visit http://gerrit.ovirt.org/36939 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28c4c72624a295938e4adbb76abbc20f7300286b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
