summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry Flood <jf9860@att.com>2017-05-24 08:52:39 -0400
committerJerry Flood <jf9860@att.com>2017-05-24 08:54:29 -0400
commit5db693b3e00f736dd99b08b658fcc242f9f87d7f (patch)
tree7259b7f1971eb45a843b40135fd76861b5027018
parent171c8656f968e695becc888eeefb55157277daa9 (diff)
Udating VID URL for release 1.1
Issue: TEST-32 Change-Id: Icea767e213916d2db31bc079872ef15afbbc845a Signed-off-by: Jerry Flood <jf9860@att.com>
-rw-r--r--robot/resources/dcae_interface.robot24
-rw-r--r--robot/resources/vid/vid_interface.robot2
2 files changed, 13 insertions, 13 deletions
diff --git a/robot/resources/dcae_interface.robot b/robot/resources/dcae_interface.robot
index ea57611e..e023a7e6 100644
--- a/robot/resources/dcae_interface.robot
+++ b/robot/resources/dcae_interface.robot
@@ -1,7 +1,7 @@
*** Settings ***
Documentation The main interface for interacting with DCAE. It handles low level stuff like managing the http request library and DCAE required fields
Library RequestsLibrary
-Library UUID
+Library UUID
Library OperatingSystem
Library Collections
Resource global_properties.robot
@@ -23,35 +23,35 @@ Run DCAE Health Check
Log Received response from dcae ${resp.json()}
Should Be Equal As Strings ${resp.status_code} 200
Check DCAE Results ${resp.json()}
-
+
Check DCAE Results
[Documentation] Parse DCAE JSON response and make sure all rows have healthTestStatus=GREEN
[Arguments] ${json}
@{rows}= Get From Dictionary ${json['returns']} rows
@{headers}= Get From Dictionary ${json['returns']} columns
-
+
# Retrieve column names from headers
${columns}= Create List
:for ${header} in @{headers}
- \ ${colName}= Get From Dictionary ${header} colName
+ \ ${colName}= Get From Dictionary ${header} colName
\ Append To List ${columns} ${colName}
-
- # Process each row making sure status=GREEN
+
+ # Process each row making sure status=GREEN
:for ${row} in @{rows}
\ ${cells}= Get From Dictionary ${row} cells
- \ ${dict}= Make A Dictionary ${cells} ${columns}
+ \ ${dict}= Make A Dictionary ${cells} ${columns}
\ Dictionary Should Contain Item ${dict} healthTestStatus GREEN
-
+
Make A Dictionary
[Documentation] Given a list of column names and a list of dictionaries, map columname=value
[Arguments] ${columns} ${names} ${valuename}=value
${dict}= Create Dictionary
- ${collength}= Get Length ${columns}
- ${namelength}= Get Length ${names}
+ ${collength}= Get Length ${columns}
+ ${namelength}= Get Length ${names}
:for ${index} in range 0 ${collength}
\ ${name}= Evaluate ${names}[${index}]
\ ${valued}= Evaluate ${columns}[${index}]
\ ${value}= Get From Dictionary ${valued} ${valueName}
- \ Set To Dictionary ${dict} ${name} ${value}
- [Return] ${dict} \ No newline at end of file
+ \ Set To Dictionary ${dict} ${name} ${value}
+ [Return] ${dict} \ No newline at end of file
diff --git a/robot/resources/vid/vid_interface.robot b/robot/resources/vid/vid_interface.robot
index 1a450711..cb625d47 100644
--- a/robot/resources/vid/vid_interface.robot
+++ b/robot/resources/vid/vid_interface.robot
@@ -11,7 +11,7 @@ Resource ../browser_setup.robot
*** Variables ***
${VID_ENV} /vid
${VID_LOGIN_URL} ${GLOBAL_VID_SERVER}${VID_ENV}/login_external.htm
-${VID_HEALTHCHECK_PATH} ${VID_ENV}/api/users
+${VID_HEALTHCHECK_PATH} ${VID_ENV}/api/v2/users
${VID_HOME_URL} ${GLOBAL_VID_SERVER}${VID_ENV}/vidhome.htm
*** Keywords ***