diff options
| author |   Daniel Rose <dr695h@att.com> | 2017-07-27 20:23:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-07-27 20:23:07 +0000 |
| commit | 8d6913f1a512f6185b7dd00ca688f71cafebefff (patch) | |
| tree | 4eefa49340698a7818304eea2b606199e19c75fd /robot/resources/aai/aai_interface.robot | |
| parent | 41e03d2a96990ed8e2eb0e42f0a28deeb3981064 (diff) | |
| parent | bf5a3a3745c9669dd6eeea3d2ef5b3bbaa3e9f74 (diff) | |
Merge "[TEST-45] support injectable ips"
Diffstat (limited to 'robot/resources/aai/aai_interface.robot')
| -rw-r--r-- | robot/resources/aai/aai_interface.robot | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/robot/resources/aai/aai_interface.robot b/robot/resources/aai/aai_interface.robot index 49f98f0c..790fa66f 100644 --- a/robot/resources/aai/aai_interface.robot +++ b/robot/resources/aai/aai_interface.robot @@ -8,6 +8,8 @@ Resource ../global_properties.robot *** Variables *** ${AAI_HEALTH_PATH} /aai/util/echo?action=long ${VERSIONED_INDEX_PATH} /aai/v8 +${AAI_FRONTEND_ENDPOINT} ${GLOBAL_AAI_SERVER_PROTOCOL}://${GLOBAL_INJECTED_AAI1_IP_ADDR}:${GLOBAL_AAI_SERVER_PORT} + *** Keywords *** Run A&AI Health Check @@ -20,7 +22,7 @@ Run A&AI Get Request [Arguments] ${data_path} Disable Warnings ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${session}= Create Session aai ${GLOBAL_AAI_SERVER_URL} auth=${auth} + ${session}= Create Session aai ${AAI_FRONTEND_ENDPOINT} auth=${auth} ${uuid}= Generate UUID ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Get Request aai ${data_path} headers=${headers} @@ -32,7 +34,7 @@ Run A&AI Put Request [Arguments] ${data_path} ${data} Disable Warnings ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${session}= Create Session aai ${GLOBAL_AAI_SERVER_URL} auth=${auth} + ${session}= Create Session aai ${AAI_FRONTEND_ENDPOINT} auth=${auth} ${uuid}= Generate UUID ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Put Request aai ${data_path} data=${data} headers=${headers} @@ -44,7 +46,7 @@ Run A&AI Post Request [Arguments] ${data_path} ${data} Disable Warnings ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${session}= Create Session aai ${GLOBAL_AAI_SERVER_URL} auth=${auth} + ${session}= Create Session aai ${AAI_FRONTEND_ENDPOINT} auth=${auth} ${uuid}= Generate UUID ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Post Request aai ${data_path} data=${data} headers=${headers} @@ -56,7 +58,7 @@ Run A&AI Delete Request [Arguments] ${data_path} ${resource_version} Disable Warnings ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${session}= Create Session aai ${GLOBAL_AAI_SERVER_URL} auth=${auth} + ${session}= Create Session aai ${AAI_FRONTEND_ENDPOINT} auth=${auth} ${uuid}= Generate UUID ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Delete Request aai ${data_path}?resource-version=${resource_version} headers=${headers} |