X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FDevstackUtils.robot;h=3f5ef5debb01158c257a92985bdf6fe08ce23fe6;hb=209170908d6fced1e88cb5edcf8259abca9702b0;hp=4357a26f6b9e3c435a7af92ac21a636321737e41;hpb=293646a0b064801271ff868cb2b5b7f321f89caa;p=integration%2Ftest.git diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot index 4357a26f6b..3f5ef5debb 100644 --- a/csit/libraries/DevstackUtils.robot +++ b/csit/libraries/DevstackUtils.robot @@ -16,6 +16,7 @@ ${OS_CMP1_IP} ${EMPTY} ${OS_CMP2_IP} ${EMPTY} @{OS_ALL_IPS} @{EMPTY} @{OS_CMP_IPS} @{EMPTY} +${OS_NODE_CNT} ${1} *** Keywords *** Open Connection @@ -50,7 +51,7 @@ Write Commands Until Prompt And Log 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} - ... OS_CMP_IPS: @{OS_CMP_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 @@ -71,6 +72,7 @@ Set Node Data For AllinOne Setup BuiltIn.Set Suite Variable ${OS_CMP1_CONN_ID} ${OS_CNTL_CONN_ID} BuiltIn.Set Suite Variable ${OS_CMP2_CONN_ID} ${OS_CNTL_CONN_ID} BuiltIn.Set Suite Variable @{OS_ALL_CONN_IDS} ${OS_CNTL_CONN_ID} + BuiltIn.Set Suite Variable @{OS_CMP_CONN_IDS} ${OS_CNTL_CONN_ID} Set Node Data For Control And Compute Node Setup [Documentation] Assign global variables for DevStack nodes where the control node is also the compute @@ -81,8 +83,9 @@ Set Node Data For Control And Compute Node Setup BuiltIn.Set Suite Variable ${OS_CMP1_CONN_ID} ${OS_CNTL_CONN_ID} DevstackUtils.Open Connection OS_CMP2_CONN_ID ${OS_COMPUTE_1_IP} BuiltIn.Set Suite Variable @{OS_ALL_CONN_IDS} ${OS_CNTL_CONN_ID} ${OS_CMP2_CONN_ID} + BuiltIn.Set Suite Variable @{OS_CMP_CONN_IDS} ${OS_CNTL_CONN_ID} ${OS_CMP2_CONN_ID} -Set Node Data For Control Only Node Setup +Set Node Data For Control And Two Compute Node Setup [Documentation] Assign global variables for DevStack nodes where the control node is different than the compute BuiltIn.Set Suite Variable ${OS_CMP1_IP} ${OS_COMPUTE_1_IP} BuiltIn.Set Suite Variable ${OS_CMP2_IP} ${OS_COMPUTE_2_IP} @@ -91,13 +94,16 @@ Set Node Data For Control Only Node Setup DevstackUtils.Open Connection OS_CMP1_CONN_ID ${OS_COMPUTE_1_IP} DevstackUtils.Open Connection OS_CMP2_CONN_ID ${OS_COMPUTE_2_IP} BuiltIn.Set Suite Variable @{OS_ALL_CONN_IDS} ${OS_CNTL_CONN_ID} ${OS_CMP1_CONN_ID} ${OS_CMP2_CONN_ID} + BuiltIn.Set Suite Variable @{OS_CMP_CONN_IDS} ${OS_CMP1_CONN_ID} ${OS_CMP2_CONN_ID} 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 ${NUM_OS_SYSTEM} == 1 DevstackUtils.Set Node Data For AllinOne Setup - ... ELSE IF ${NUM_OS_SYSTEM} == 2 DevstackUtils.Set Node Data For Control And Compute Node Setup - ... ELSE IF ${NUM_OS_SYSTEM} == 3 DevstackUtils.Set Node Data For Control Only Node Setup + 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 + ${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