From 0789aef836c7629ad4d5957453dc8670303c09aa Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Mon, 15 Apr 2019 16:57:18 -0500 Subject: Update for v3 KEYSTONE SO config Issue-ID: INT-1026 Change-Id: I18f521030683f2b8ee7a42d837c49e630dc1cfbb Signed-off-by: Brian Freeman --- robot/resources/so/create_cloud_config.robot | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'robot/resources/so') diff --git a/robot/resources/so/create_cloud_config.robot b/robot/resources/so/create_cloud_config.robot index be578127..8762d415 100644 --- a/robot/resources/so/create_cloud_config.robot +++ b/robot/resources/so/create_cloud_config.robot @@ -12,6 +12,7 @@ ${CLOUD_CONFIG_PATH} /cloudSite ${SYSTEM USER} robot-ete ${SO_ADD_CLOUD_CONFIG}= robot/assets/templates/so/create_cloud_config.template +${SO_ADD_CLOUD_CONFIG_V3}= robot/assets/templates/so/cloud_config_v3.template *** Keywords *** Create Cloud Configuration @@ -24,6 +25,17 @@ Create Cloud Configuration ${get_resp}= Run Keyword If '${get_resp.status_code}'=='404' Update Cloud Configuration ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} Should Be Equal As Strings ${get_resp.status_code} 200 + +Create Cloud Configuration v3 + [Documentation] Creates a cloud configuration in SO, so it knows how to talk to an openstack cloud + [Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} ${project_domain_name} ${user_domain_Name} + ${arguments}= Create Dictionary site_name=${site_name} region_id=${region_id} clli=${clli} identity_id=${identity_id} identity_url=${identity_url} mso_id=${mso_id} mso_pass=${mso_pass} admin_tenant=${admin_tenant} member_role=${member_role} identity_server_type=${identity_server_type} authentication_type=${authentication_type} project_domain_name=${project_domain_name} user_domain_name=${user_domain_name} + Log ${arguments} + ${data}= Fill JSON Template File ${SO_ADD_CLOUD_CONFIG_V3} ${arguments} + ${get_resp}= Run SO Catalog Post request ${CLOUD_CONFIG_PATH} ${data} + ${status_string}= Convert To String ${get_resp.status_code} + Should Match Regexp ${status_string} ^(201|200)$ + Update Cloud Configuration [Documentation] Updates a cloud configuration in SO [Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} -- cgit 1.2.3-korg