X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FDevstackUtils.robot;h=fd595c9dd599812b02e0d75fc769cb2ec892d561;hb=737b6f1fbf7452dc76f1e728e320442358861ad0;hp=437c31e2c144438da24ef298ac6804503c66bd6e;hpb=59db963c1026a8ac1c91b6f9eb21f072ab207c12;p=integration%2Ftest.git diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot index 437c31e2c1..fd595c9dd5 100644 --- a/csit/libraries/DevstackUtils.robot +++ b/csit/libraries/DevstackUtils.robot @@ -173,7 +173,6 @@ Devstack Suite Setup 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 - Log ${cmd} SSHLibrary.Set Client Configuration timeout=${timeout} SSHLibrary.Read SSHLibrary.Write ${cmd};echo Command Returns $? @@ -188,18 +187,18 @@ Write Commands Until Prompt And Log [Return] ${output} Log Devstack Nodes Data - ${output} = BuiltIn.Catenate SEPARATOR=\n OS_CNTL_HN: ${OS_CNTL_HN} - OS_CNTL_IP: ${OS_CNTL_IP} - OS_CONTROL_NODE_IP: ${OS_CONTROL_NODE_IP} OS_CMP1_HN: ${OS_CMP1_HN} - OS_CMP1_IP: ${OS_CMP1_IP} - OS_COMPUTE_1_IP: ${OS_COMPUTE_1_IP} OS_CMP2_HN: ${OS_CMP2_HN} - 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} BuiltIn.Log DevStack Nodes Data:\n${output} Get DevStack Hostnames [Documentation] Assign hostname global variables for DevStack nodes - ${OS_CNTL_HN} = OpenStackOperations.Get Hypervisor Hostname From IP ${OS_CNTL_IP} - ${OS_CMP1_HN} = OpenStackOperations.Get Hypervisor Hostname From IP ${OS_CMP1_IP} - ${OS_CMP2_HN} = OpenStackOperations.Get Hypervisor Hostname From IP ${OS_CMP2_IP} - BuiltIn.Set Suite Variable ${OS_CNTL_HN} - BuiltIn.Set Suite Variable ${OS_CMP1_HN} - BuiltIn.Set Suite Variable ${OS_CMP2_HN} + ${OS_CNTL_HOSTNAME} = OpenStackOperations.Get Hypervisor Hostname From IP ${OS_CNTL_IP} + ${OS_CMP1_HOSTNAME} = OpenStackOperations.Get Hypervisor Hostname From IP ${OS_CMP1_IP} + ${OS_CMP2_HOSTNAME} = OpenStackOperations.Get Hypervisor Hostname From IP ${OS_CMP2_IP} + BuiltIn.Set Suite Variable ${OS_CNTL_HOSTNAME} + BuiltIn.Set Suite Variable ${OS_CMP1_HOSTNAME} + BuiltIn.Set Suite Variable ${OS_CMP2_HOSTNAME} Set Node Data For Control And Compute Node Setup [Documentation] Assign global variables for DevStack nodes where the control node is also the compute