Daniel Erez has uploaded a new change for review. Change subject: restapi: added auth_url element to external provider ......................................................................
restapi: added auth_url element to external provider Added missing 'auth_url' to external provider: * Added 'auth_url' element to 'ExternalProvider' type in api.xsd. * Updated OpenStackImageProviderMapper/OpenStackNetworkProviderMapper. * Updated rsdl_metadata accordingly. Change-Id: I05125d426bb22949237fcc5b57293d835b6d34c5 Bug-Url: https://bugzilla.redhat.com/1202339 Signed-off-by: Daniel Erez <[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/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageProviderMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkProviderMapper.java 4 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/38949/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 b035ec74..bfe24f2 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 @@ -5089,6 +5089,7 @@ <xs:element name="requires_authentication" type="xs:boolean" minOccurs="0" maxOccurs="1"/> <xs:element name="username" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="auth_url" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element ref="properties" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:extension> 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 e151ead..1a7d5c9 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 @@ -6369,6 +6369,7 @@ external_host_provider.requires_authentication: xs:boolean external_host_provider.username: xs:string external_host_provider.password: xs:string + external_host_provider.auth_url: xs:string description: update the specified external host provider in the system urlparams: {} headers: @@ -6388,6 +6389,7 @@ external_host_provider.requires_authentication: xs:boolean external_host_provider.username: xs:string external_host_provider.password: xs:string + external_host_provider.auth_url: xs:string description: add a new external host provider to the system urlparams: {} headers: diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageProviderMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageProviderMapper.java index f454824..2aef398 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageProviderMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageProviderMapper.java @@ -56,6 +56,9 @@ if (model.isSetPassword()) { entity.setPassword(model.getPassword()); } + if (model.isSetAuthUrl()) { + entity.setAuthUrl(model.getAuthUrl()); + } if (model.isSetProperties()) { Map<String, String> map = new HashMap<>(); for (Property property : model.getProperties().getProperties()) { @@ -87,6 +90,9 @@ if (entity.getUrl() != null) { model.setUrl(entity.getUrl()); } + if (entity.getAuthUrl() != null) { + model.setAuthUrl(entity.getAuthUrl()); + } model.setRequiresAuthentication(entity.isRequiringAuthentication()); if (entity.getUsername() != null) { model.setUsername(entity.getUsername()); diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkProviderMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkProviderMapper.java index edbecc4..688290f 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkProviderMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkProviderMapper.java @@ -61,6 +61,9 @@ if (model.isSetPassword()) { entity.setPassword(model.getPassword()); } + if (model.isSetAuthUrl()) { + entity.setAuthUrl(model.getAuthUrl()); + } if (model.isSetProperties()) { Map<String, String> map = new HashMap<>(); for (Property property : model.getProperties().getProperties()) { @@ -98,6 +101,9 @@ if (entity.getUrl() != null) { model.setUrl(entity.getUrl()); } + if (entity.getAuthUrl() != null) { + model.setAuthUrl(entity.getAuthUrl()); + } model.setRequiresAuthentication(entity.isRequiringAuthentication()); if (entity.getUsername() != null) { model.setUsername(entity.getUsername()); -- To view, visit https://gerrit.ovirt.org/38949 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05125d426bb22949237fcc5b57293d835b6d34c5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
