From a44f3eeed80b3ebfb3952f8a8b806745279ab675 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Tue, 19 Feb 2019 13:47:04 -0500 Subject: Fix overlapping INDEX_PATH etc Issue-ID: INT-896 Change-Id: I3981bf4d75616d8105c7131cef62441974483f17 Signed-off-by: Brian Freeman --- robot/resources/aai/create_availability_zone.robot | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'robot/resources/aai/create_availability_zone.robot') diff --git a/robot/resources/aai/create_availability_zone.robot b/robot/resources/aai/create_availability_zone.robot index 3d6176b6..d8b6111e 100644 --- a/robot/resources/aai/create_availability_zone.robot +++ b/robot/resources/aai/create_availability_zone.robot @@ -8,18 +8,16 @@ Library Collections *** Variables *** -${INDEX_PATH} /aai/v14 -${ROOT_PATH} /cloud-infrastructure/cloud-regions/cloud-region -${ZONE_PATH} /availability-zones/availability-zone +${AZ_ROOT_PATH} /cloud-infrastructure/cloud-regions/cloud-region +${AZ_ZONE_PATH} /availability-zones/availability-zone -${SYSTEM USER} robot-ete ${AAI_ADD_AVAILABILITY_ZONE_BODY}= robot/assets/templates/aai/add_availability_zone_body.template *** Keywords *** Create Availability Zone If Not Exists [Documentation] Creates availability zone in A&AI if it doesn't exist [Arguments] ${cloud-owner} ${cloud-region-id} ${availability_zone_name}=${GLOBAL_AAI_AVAILABILITY_ZONE_NAME} - ${get_resp}= Run A&AI Get Request ${INDEX_PATH}${ROOT_PATH}/${cloud-owner}/${cloud-region-id}${ZONE_PATH}/${availability_zone_name} + ${get_resp}= Run A&AI Get Request ${GLOBAL_AAI_INDEX_PATH}${AZ_ROOT_PATH}/${cloud-owner}/${cloud-region-id}${AZ_ZONE_PATH}/${availability_zone_name} Return From Keyword If '${get_resp.status_code}' == '200' Create Availability Zone ${availability_zone_name} ${cloud-owner} ${cloud-region-id} @@ -28,25 +26,25 @@ Create Availability Zone [Arguments] ${availability_zone_name} ${cloud-owner} ${cloud-region-id} ${arguments}= Create Dictionary availability_zone_name=${availability_zone_name} ${data}= Fill JSON Template File ${AAI_ADD_AVAILABILITY_ZONE_BODY} ${arguments} - ${put_resp}= Run A&AI Put Request ${INDEX_PATH}${ROOT_PATH}/${cloud-owner}/${cloud-region-id}${ZONE_PATH}/${availability_zone_name} ${data} + ${put_resp}= Run A&AI Put Request ${GLOBAL_AAI_INDEX_PATH}${AZ_ROOT_PATH}/${cloud-owner}/${cloud-region-id}${AZ_ZONE_PATH}/${availability_zone_name} ${data} ${status_string}= Convert To String ${put_resp.status_code} Should Match Regexp ${status_string} ^(201|200)$ Delete Availability Zone If Exists [Documentation] Removes availability zone [Arguments] ${cloud-owner} ${cloud-region-id} ${availability_zone_name}=${GLOBAL_AAI_AVAILABILITY_ZONE_NAME} - ${get_resp}= Run A&AI Get Request ${INDEX_PATH}${ROOT_PATH}/${cloud-owner}/${cloud-region-id}${ZONE_PATH}/${availability_zone_name} + ${get_resp}= Run A&AI Get Request ${GLOBAL_AAI_INDEX_PATH}${AZ_ROOT_PATH}/${cloud-owner}/${cloud-region-id}${AZ_ZONE_PATH}/${availability_zone_name} Run Keyword If '${get_resp.status_code}' == '200' Delete Availability Zone ${availability_zone_name} ${cloud-owner} ${cloud-region-id} ${get_resp.json()} Delete Availability Zone [Arguments] ${availability_zone_name} ${cloud-owner} ${cloud-region-id} ${json} ${resource_version}= Catenate ${json['resource-version']} - ${put_resp}= Run A&AI Delete Request ${INDEX_PATH}${ROOT_PATH}/${cloud-owner}/${cloud-region-id}${ZONE_PATH}/${availability_zone_name} ${resource_version} + ${put_resp}= Run A&AI Delete Request ${GLOBAL_AAI_INDEX_PATH}${AZ_ROOT_PATH}/${cloud-owner}/${cloud-region-id}${AZ_ZONE_PATH}/${availability_zone_name} ${resource_version} Should Be Equal As Strings ${put_resp.status_code} 204 Get Availability Zone [Documentation] Return availability zone [Arguments] ${availability_zone_name} ${cloud-owner} ${cloud-region-id} - ${resp}= Run A&AI Get Request ${INDEX_PATH}${ROOT_PATH}/${cloud-owner}/${cloud-region-id}${ZONE_PATH}/${availability_zone_name} + ${resp}= Run A&AI Get Request ${GLOBAL_AAI_INDEX_PATH}${AZ_ROOT_PATH}/${cloud-owner}/${cloud-region-id}${AZ_ZONE_PATH}/${availability_zone_name} Should Be Equal As Strings ${resp.status_code} 200 - [Return] ${resp.json()} \ No newline at end of file + [Return] ${resp.json()} -- cgit 1.2.3-korg