X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FDevstackUtils.robot;h=a8bb60107388b97cabb644b4432256bf41a9d10e;hb=f5be5440e8ef95263193ef4d26958198722e4e44;hp=224be725185065b16f21dfb696afc6c5cf035200;hpb=224730716d78f116044bc2e3050358d8fab091f8;p=integration%2Ftest.git

diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot
index 224be72518..a8bb601073 100644
--- a/csit/libraries/DevstackUtils.robot
+++ b/csit/libraries/DevstackUtils.robot
@@ -1,21 +1,25 @@
 *** Settings ***
-Documentation     General Utils library. This library has broad scope, it can be used by any robot system tests.
-Library           RequestsLibrary
-Library           SSHLibrary
-Resource          OpenStackOperations.robot
-Resource          ../variables/Variables.robot
+Documentation       General Utils library. This library has broad scope, it can be used by any robot system tests.
+
+Library             RequestsLibrary
+Library             SSHLibrary
+Resource            OpenStackOperations.robot
+Resource            ../variables/Variables.robot
+
 
 *** Variables ***
-${DEFAULT_DEVSTACK_PROMPT_TIMEOUT}    10s
-${DEVSTACK_SYSTEM_PASSWORD}    \    # set to empty, but provide for others to override if desired
-${OS_CNTL_CONN_ID}    None
-${OS_CMP1_CONN_ID}    None
-${OS_CMP2_CONN_ID}    None
-${OS_CNTL_IP}     ${EMPTY}
-${OS_CMP1_IP}     ${EMPTY}
-${OS_CMP2_IP}     ${EMPTY}
-@{OS_ALL_IPS}     @{EMPTY}
-@{OS_CMP_IPS}     @{EMPTY}
+${DEFAULT_DEVSTACK_PROMPT_TIMEOUT}      10s
+${DEVSTACK_SYSTEM_PASSWORD}             \    # set to empty, but provide for others to override if desired
+${OS_CNTL_CONN_ID}                      None
+${OS_CMP1_CONN_ID}                      None
+${OS_CMP2_CONN_ID}                      None
+${OS_CNTL_IP}                           ${EMPTY}
+${OS_CMP1_IP}                           ${EMPTY}
+${OS_CMP2_IP}                           ${EMPTY}
+@{OS_ALL_IPS}                           @{EMPTY}
+@{OS_CMP_IPS}                           @{EMPTY}
+${OS_NODE_CNT}                          ${1}
+
 
 *** Keywords ***
 Open Connection
@@ -23,34 +27,42 @@ Open Connection
     ${conn_id} =    SSHLibrary.Open Connection    ${ip}    prompt=${DEFAULT_LINUX_PROMPT}
     SSHKeywords.Flexible SSH Login    ${OS_USER}    ${DEVSTACK_SYSTEM_PASSWORD}
     BuiltIn.Set Suite Variable    \${${name}}    ${conn_id}
-    [Return]    ${conn_id}
+    RETURN    ${conn_id}
 
 Devstack Suite Setup
-    [Arguments]    ${odl_ip}=${ODL_SYSTEM_IP}
     [Documentation]    Open connections to the nodes
+    [Arguments]    ${odl_ip}=${ODL_SYSTEM_IP}
     SSHLibrary.Set Default Configuration    timeout=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT}
     DevstackUtils.Get DevStack Nodes Data
     RequestsLibrary.Create Session    session    http://${odl_ip}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 
 Write Commands Until Prompt
-    [Arguments]    ${cmd}    ${timeout}=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT}
     [Documentation]    quick wrapper for Write and Read Until Prompt Keywords to make test cases more readable
+    [Arguments]    ${cmd}    ${timeout}=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT}
     SSHLibrary.Set Client Configuration    timeout=${timeout}
     SSHLibrary.Read
     SSHLibrary.Write    ${cmd};echo Command Returns $?
     ${output} =    SSHLibrary.Read Until Prompt
-    [Return]    ${output}
+    RETURN    ${output}
 
 Write Commands Until Prompt And Log
-    [Arguments]    ${cmd}    ${timeout}=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT}
     [Documentation]    quick wrapper for Write and Read Until Prompt Keywords to make test cases more readable
+    [Arguments]    ${cmd}    ${timeout}=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT}
     ${output} =    DevstackUtils.Write Commands Until Prompt    ${cmd}    ${timeout}
     BuiltIn.Log    ${output}
-    [Return]    ${output}
+    RETURN    ${output}
 
 Log Devstack Nodes Data
-    ${output} =    BuiltIn.Catenate    SEPARATOR=\n    OS_CNTL_HOSTNAME: ${OS_CNTL_HOSTNAME} - OS_CNTL_IP: ${OS_CNTL_IP} - OS_CONTROL_NODE_IP: ${OS_CONTROL_NODE_IP}    OS_CMP1_HOSTNAME: ${OS_CMP1_HOSTNAME} - OS_CMP1_IP: ${OS_CMP1_IP} - OS_COMPUTE_1_IP: ${OS_COMPUTE_1_IP}    OS_CMP2_HOSTNAME: ${OS_CMP2_HOSTNAME} - OS_CMP2_IP: ${OS_CMP2_IP} - OS_COMPUTE_2_IP: ${OS_COMPUTE_2_IP}    OS_ALL_IPS: @{OS_ALL_IPS}
+    ${output} =    BuiltIn.Catenate
+    ...    SEPARATOR=\n
+    ...    OS_CNTL_HOSTNAME: ${OS_CNTL_HOSTNAME} - OS_CNTL_IP: ${OS_CNTL_IP} - OS_CONTROL_NODE_IP: ${OS_CONTROL_NODE_IP}
+    ...    OS_CMP1_HOSTNAME: ${OS_CMP1_HOSTNAME} - OS_CMP1_IP: ${OS_CMP1_IP} - OS_COMPUTE_1_IP: ${OS_COMPUTE_1_IP}
+    ...    OS_CMP2_HOSTNAME: ${OS_CMP2_HOSTNAME} - OS_CMP2_IP: ${OS_CMP2_IP} - OS_COMPUTE_2_IP: ${OS_COMPUTE_2_IP}
+    ...    OS_ALL_IPS: @{OS_ALL_IPS}
     ...    OS_CMP_IPS: @{OS_CMP_IPS}
+    ...    OS_NODE_CNT: ${OS_NODE_CNT}
+    ...    OS_ALL_CONN_IDS: @{OS_ALL_CONN_IDS}
+    ...    OS_CMP_CONN_IDS: @{OS_CMP_CONN_IDS}
     BuiltIn.Log    DevStack Nodes Data:\n${output}
 
 Get DevStack Hostnames
@@ -99,8 +111,14 @@ Get DevStack Nodes Data
     [Documentation]    Assign global variables for DevStack nodes
     BuiltIn.Set Suite Variable    ${OS_CNTL_IP}    ${OS_CONTROL_NODE_IP}
     DevstackUtils.Open Connection    OS_CNTL_CONN_ID    ${OS_CNTL_IP}
-    BuiltIn.Run Keyword If    "${OPENSTACK_TOPO}" == "1cmb-0ctl-0cmp"    DevstackUtils.Set Node Data For AllinOne Setup
-    ...    ELSE IF    "${OPENSTACK_TOPO}" == "1cmb-0ctl-1cmp"    DevstackUtils.Set Node Data For Control And Compute Node Setup
-    ...    ELSE IF    "${OPENSTACK_TOPO}" == "0cmb-1ctl-2cmp"    DevstackUtils.Set Node Data For Control And Two Compute Node Setup
+    IF    "${OPENSTACK_TOPO}" == "1cmb-0ctl-0cmp"
+        DevstackUtils.Set Node Data For AllinOne Setup
+    ELSE IF    "${OPENSTACK_TOPO}" == "1cmb-0ctl-1cmp"
+        DevstackUtils.Set Node Data For Control And Compute Node Setup
+    ELSE IF    "${OPENSTACK_TOPO}" == "0cmb-1ctl-2cmp"
+        DevstackUtils.Set Node Data For Control And Two Compute Node Setup
+    END
+    ${OS_NODE_CNT} =    BuiltIn.Get Length    ${OS_ALL_IPS}
+    BuiltIn.Set Suite Variable    ${OS_NODE_CNT}
     DevstackUtils.Get DevStack Hostnames
     DevstackUtils.Log Devstack Nodes Data