Update version of chrome driver, etc.

Issue-ID: TEST-72
Change-Id: Id07b727837e2880ff89d4cfdac5c25160efba1e5
Signed-off-by: Jerry Flood <jf9860@att.com>

diff --git a/robot/assets/templates/web/index.html.template b/robot/assets/templates/web/index.html.template
index 029471c..460705f 100644 (file)
--- a/robot/assets/templates/web/index.html.template
+++ b/robot/assets/templates/web/index.html.template
@@ -103,6 +103,8 @@ GLOBAL_INJECTED_CLAMP_IP_ADDR = "${clamp}"
 GLOBAL_INJECTED_VM_FLAVOR = "${GLOBAL_INJECTED_VM_FLAVOR}"
 GLOBAL_INJECTED_VM_IMAGE_NAME = "${GLOBAL_INJECTED_VM_IMAGE_NAME}"
 GLOBAL_INJECTED_PUBLIC_NET_ID = "${GLOBAL_INJECTED_PUBLIC_NET_ID}"
+GLOBAL_INJECTED_CLOUD_ENV = "${GLOBAL_INJECTED_CLOUD_ENV}"
+GLOBAL_INJECTED_SCRIPT_VERSION = "${GLOBAL_INJECTED_SCRIPT_VERSION}"
 
     </pre>
 

diff --git a/robot/resources/vid/vid_interface.robot b/robot/resources/vid/vid_interface.robot
index d8bd553..525a09e 100644 (file)
--- a/robot/resources/vid/vid_interface.robot
+++ b/robot/resources/vid/vid_interface.robot
@@ -108,7 +108,8 @@ Get Model UUID from VID
     Go To     ${VID_ENDPOINT}${VID_ENV}/rest/models/services
     ${resp}=   Get Text   xpath=//body/pre
     ${json}=   To Json    ${resp}
-    :for   ${dict}  in  @{json}
+    ${list}=   Get From Dictionary   ${json}   services
+    :for   ${dict}  in  @{list}
     \    ${uuid}=   Get From DIctionary   ${dict}   uuid
     \    ${inv}=   Get From DIctionary   ${dict}    invariantUUID
     \    Return From Keyword If   "${invariantUUID}" == "${inv}"   ${uuid}

diff --git a/setup.sh b/setup.sh
index d89fd02..f116f27 100644 (file)
--- a/setup.sh
+++ b/setup.sh
@@ -73,7 +73,7 @@ cd $path
 #
 # Get the appropriate chromedriver. Default to linux64
 #
-CHROMEDRIVER_URL=http://chromedriver.storage.googleapis.com/2.27
+CHROMEDRIVER_URL=http://chromedriver.storage.googleapis.com/2.33
 CHROMEDRIVER_ZIP=chromedriver_linux64.zip
 
 # Handle mac and windows