Fix overlapping INDEX_PATH etc

Issue-ID: INT-896
Change-Id: I3981bf4d75616d8105c7131cef62441974483f17
Signed-off-by: Brian Freeman <bf1936@att.com>

3 files changed, 17 insertions, 20 deletions

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()}
diff --git a/robot/resources/aai/create_vnfc.robot b/robot/resources/aai/create_vnfc.robot
index f140406d..359c62d5 100644
--- a/robot/resources/aai/create_vnfc.robot
+++ b/robot/resources/aai/create_vnfc.robot
@@ -8,17 +8,15 @@ Library    Collections
 
 
 *** Variables ***
-${INDEX_PATH}     /aai/v14
-${ROOT_PATH}      /network/vnfcs/vnfc
+${VNFC_ROOT_PATH}      /network/vnfcs/vnfc
 
-${SYSTEM USER}    robot-ete
 ${AAI_ADD_VNFC_BODY}=    robot/assets/templates/aai/add_vnfc_body.template
 
 *** Keywords ***
 Create VNFC If Not Exists
     [Documentation]    Creates VNFC in A&AI if it doesn't exist
     [Arguments]    ${vnfc_name}    ${vnfc_nc}    ${vnfc_func}
-    ${get_resp}=    Run A&AI Get Request     ${INDEX_PATH}${ROOT_PATH}/${vnfc_name}
+    ${get_resp}=    Run A&AI Get Request     ${GLOBAL_AAI_INDEX_PATH}${VNFC_ROOT_PATH}/${vnfc_name}
     Return From Keyword If    '${get_resp.status_code}' == '200'
     Create VNFC    ${vnfc_name}    ${vnfc_nc}    ${vnfc_func}
 
@@ -27,26 +25,26 @@ Create VNFC
     [Arguments]    ${vnfc_name}    ${vnfc_nc}    ${vnfc_func}
     ${arguments}=    Create Dictionary     vnfc_name=${vnfc_name}    vnfc_nc=${vnfc_nc}    vnfc_func=${vnfc_func}
     ${data}=    Fill JSON Template File    ${AAI_ADD_VNFC_BODY}    ${arguments}
-    ${put_resp}=    Run A&AI Put Request     ${INDEX_PATH}${ROOT_PATH}/${vnfc_name}    ${data}
+    ${put_resp}=    Run A&AI Put Request     ${GLOBAL_AAI_INDEX_PATH}${VNFC_ROOT_PATH}/${vnfc_name}    ${data}
     ${status_string}=    Convert To String    ${put_resp.status_code}
     Should Match Regexp    ${status_string}     ^(201|200)$
 
 Delete VNFC If Exists
     [Documentation]    Removes VNFC from AAI if it exists
     [Arguments]    ${vnfc_name}
-    ${get_resp}=    Run A&AI Get Request     ${INDEX_PATH}${ROOT_PATH}/${vnfc_name}
+    ${get_resp}=    Run A&AI Get Request     ${GLOBAL_AAI_INDEX_PATH}${VNFC_ROOT_PATH}/${vnfc_name}
     Run Keyword If    '${get_resp.status_code}' == '200'    Delete VNFC    ${vnfc_name}    ${get_resp.json()}
 
 Delete VNFC
     [Documentation]    Removes VNFC from AAI
     [Arguments]    ${vnfc_name}    ${json}
     ${resource_version}=   Catenate   ${json['resource-version']}
-    ${put_resp}=    Run A&AI Delete Request    ${INDEX_PATH}${ROOT_PATH}/${vnfc_name}    ${resource_version}
+    ${put_resp}=    Run A&AI Delete Request    ${GLOBAL_AAI_INDEX_PATH}${VNFC_ROOT_PATH}/${vnfc_name}    ${resource_version}
     Should Be Equal As Strings  ${put_resp.status_code}         204
 
 Get VNFC
     [Documentation]    Return VNFC
     [Arguments]    ${vnfc_name}
-    ${resp}=    Run A&AI Get Request     ${INDEX_PATH}${ROOT_PATH}/${vnfc_name}
+    ${resp}=    Run A&AI Get Request     ${GLOBAL_AAI_INDEX_PATH}${VNFC_ROOT_PATH}/${vnfc_name}
     Should Be Equal As Strings  ${resp.status_code}     200
-    [Return]  ${resp.json()}
\ No newline at end of file
+    [Return]  ${resp.json()}
diff --git a/robot/resources/global_properties.robot b/robot/resources/global_properties.robot
index 5246fe9e..609e9b21 100644
--- a/robot/resources/global_properties.robot
+++ b/robot/resources/global_properties.robot
@@ -30,6 +30,7 @@ ${GLOBAL_VID_UI_TIMEOUT_MEDIUM}    60s
 ${GLOBAL_VID_UI_TIMEOUT_LONG}    120s
 ${GLOBAL_VM_PRIVATE_KEY}   ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pvt
 ${GLOBAL_ONAP_PRIVATE_KEY}   ${EXECDIR}/robot/assets/keys/onap_dev.pvt
+${GLOBAL_AAI_INDEX_PATH}    /aai/v14
 ${GLOBAL_AAI_ZONE_ID}    nova1
 ${GLOBAL_AAI_ZONE_NAME}    nova
 ${GLOBAL_AAI_DESIGN_TYPE}    integration
@@ -39,4 +40,4 @@ ${GLOBAL_HV_VES_SERVER_PORT}     6061
 ${GLOBAL_DNS_VES_NAME}      dcae-ves-collector
 ${GLOBAL_VES_SERVER_PORT}        8080
 ${GLOBAL_DNS_MESSAGE_ROUTER_KAFKA_NAME}  message-router-kafka
-${GLOBAL_MESSAGE_ROUTER_KAFKA_PORT}  9092
\ No newline at end of file
+${GLOBAL_MESSAGE_ROUTER_KAFKA_PORT}  9092