aboutsummaryrefslogtreecommitdiffstats
path: root/robot/resources
diff options
context:
space:
mode:
authorDaniel Rose <dr695h@att.com>2017-10-02 15:58:40 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-02 15:58:40 +0000
commit362453d5480a89c6c5354fbe36577f41656ae862 (patch)
tree7bf025347de4ea15f4c7302efd48d2a4096884a6 /robot/resources
parent1f48bb90ce418174fa40d547490ee930b5d6765e (diff)
parent176d1da82606601252cfaa78358b84ad4e9c42d1 (diff)
Merge "Update to reference SO IP adderess rather than MSO"
Diffstat (limited to 'robot/resources')
-rw-r--r--robot/resources/mso_interface.robot8
1 files changed, 4 insertions, 4 deletions
diff --git a/robot/resources/mso_interface.robot b/robot/resources/mso_interface.robot
index cff5936b..6bc62296 100644
--- a/robot/resources/mso_interface.robot
+++ b/robot/resources/mso_interface.robot
@@ -1,14 +1,14 @@
*** Settings ***
Documentation The main interface for interacting with MSO. It handles low level stuff like managing the http request library and MSO required fields
Library RequestsLibrary
-Library UUID
+Library UUID
Library OperatingSystem
Library Collections
Resource global_properties.robot
Resource ../resources/json_templater.robot
*** Variables ***
${MSO_HEALTH_CHECK_PATH} /ecomp/mso/infra/globalhealthcheck
-${MSO_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_MSO_IP_ADDR}:${GLOBAL_MSO_SERVER_PORT}
+${MSO_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_SERVER_PORT}
*** Keywords ***
Run MSO Health Check
@@ -31,7 +31,7 @@ Run MSO Get Request
${resp}= Get Request mso ${data_path} headers=${headers}
Log Received response from mso ${resp.text}
[Return] ${resp}
-
+
Poll MSO Get Request
[Documentation] Runs an MSO get request until a certain status is received. valid values are COMPLETE
[Arguments] ${data_path} ${status}
@@ -44,7 +44,7 @@ Poll MSO Get Request
:FOR ${i} IN RANGE 20
\ ${resp}= Get Request mso ${data_path} headers=${headers}
\ Should Not Contain ${resp.text} FAILED
- \ Log ${resp.json()['request']['requestStatus']['requestState']}
+ \ Log ${resp.json()['request']['requestStatus']['requestState']}
\ ${exit_loop}= Evaluate "${resp.json()['request']['requestStatus']['requestState']}" == "${status}"
\ Exit For Loop If ${exit_loop}
\ Sleep 15s