From 293646a0b064801271ff868cb2b5b7f321f89caa Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Tue, 24 Jul 2018 17:23:27 -0400 Subject: [PATCH 1/1] Update l2 tests for combo nodes This update ensures that the l2 tests sill pass for the single node combo setup. Each patch in this series will correspond to a specific suite and ensure it passes for both the combo node and the standard control and two compute setups. JIRA: NETVIRT-1370 Depends-On: I8cfda38708575646095ae2878d64fb68b4359f03 Change-Id: I7dd0fb79f61586731f260d09639ebbca443c57f8 Signed-off-by: Sam Hague --- csit/libraries/DataModels.robot | 5 ++--- csit/libraries/DevstackUtils.robot | 18 ++++++++++++++---- csit/libraries/OpenStackOperations.robot | 15 ++++++--------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/csit/libraries/DataModels.robot b/csit/libraries/DataModels.robot index ba89d376ff..51fab3c575 100644 --- a/csit/libraries/DataModels.robot +++ b/csit/libraries/DataModels.robot @@ -31,6 +31,5 @@ Verify No Ingress Dispatcher Non-Default Flow Entries Verify Flows Are Cleaned Up On All OpenStack Nodes [Documentation] Verify flows are cleaned up from all OpenStack nodes - Run Keyword And Continue On Failure Verify No Ingress Dispatcher Non-Default Flow Entries ${OS_CONTROL_NODE_IP} - Run Keyword And Continue On Failure Verify No Ingress Dispatcher Non-Default Flow Entries ${OS_COMPUTE_1_IP} - Run Keyword And Continue On Failure Verify No Ingress Dispatcher Non-Default Flow Entries ${OS_COMPUTE_2_IP} + : FOR ${ip} IN @{OS_ALL_IPS} + \ Run Keyword And Continue On Failure Verify No Ingress Dispatcher Non-Default Flow Entries ${ip} diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot index 6af68b7a4f..4357a26f6b 100644 --- a/csit/libraries/DevstackUtils.robot +++ b/csit/libraries/DevstackUtils.robot @@ -28,12 +28,9 @@ Open Connection Devstack Suite Setup [Arguments] ${odl_ip}=${ODL_SYSTEM_IP} [Documentation] Open connections to the nodes + 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} - SSHLibrary.Set Default Configuration timeout=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT} - BuiltIn.Run Keyword If 0 < ${NUM_OS_SYSTEM} DevstackUtils.Open Connection OS_CNTL_CONN_ID ${OS_CONTROL_NODE_IP} - BuiltIn.Run Keyword If 1 < ${NUM_OS_SYSTEM} DevstackUtils.Open Connection OS_CMP1_CONN_ID ${OS_COMPUTE_1_IP} - BuiltIn.Run Keyword If 2 < ${NUM_OS_SYSTEM} DevstackUtils.Open Connection OS_CMP2_CONN_ID ${OS_COMPUTE_2_IP} Write Commands Until Prompt [Arguments] ${cmd} ${timeout}=${DEFAULT_DEVSTACK_PROMPT_TIMEOUT} @@ -67,7 +64,13 @@ Get DevStack Hostnames Set Node Data For AllinOne Setup [Documentation] Assign global variables for DevStack nodes where the Control Node enables Compute service also. + BuiltIn.Set Suite Variable ${OS_CMP1_IP} ${OS_CNTL_IP} + BuiltIn.Set Suite Variable ${OS_CMP2_IP} ${OS_CNTL_IP} BuiltIn.Set Suite Variable @{OS_ALL_IPS} ${OS_CNTL_IP} + BuiltIn.Set Suite Variable @{OS_CMP_IPS} ${OS_CNTL_IP} + 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} Set Node Data For Control And Compute Node Setup [Documentation] Assign global variables for DevStack nodes where the control node is also the compute @@ -75,6 +78,9 @@ Set Node Data For Control And Compute Node Setup BuiltIn.Set Suite Variable ${OS_CMP2_IP} ${OS_COMPUTE_1_IP} BuiltIn.Set Suite Variable @{OS_ALL_IPS} ${OS_CNTL_IP} ${OS_CMP2_IP} BuiltIn.Set Suite Variable @{OS_CMP_IPS} ${OS_CMP1_IP} ${OS_CMP2_IP} + 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} Set Node Data For Control Only Node Setup [Documentation] Assign global variables for DevStack nodes where the control node is different than the compute @@ -82,10 +88,14 @@ Set Node Data For Control Only Node Setup BuiltIn.Set Suite Variable ${OS_CMP2_IP} ${OS_COMPUTE_2_IP} BuiltIn.Set Suite Variable @{OS_ALL_IPS} ${OS_CNTL_IP} ${OS_CMP1_IP} ${OS_CMP2_IP} BuiltIn.Set Suite Variable @{OS_CMP_IPS} ${OS_CMP1_IP} ${OS_CMP2_IP} + 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} 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 diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index 1d6051e8fa..9fc431d06f 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -544,9 +544,8 @@ Get ControlNode Connection Get OvsDebugInfo [Documentation] Get the OvsConfig and Flow entries from all Openstack nodes - BuiltIn.Run Keyword If 0 < ${NUM_OS_SYSTEM} OpenStackOperations.Get DumpFlows And Ovsconfig ${OS_CNTL_CONN_ID} - BuiltIn.Run Keyword If 1 < ${NUM_OS_SYSTEM} OpenStackOperations.Get DumpFlows And Ovsconfig ${OS_CMP1_CONN_ID} - BuiltIn.Run Keyword If 2 < ${NUM_OS_SYSTEM} OpenStackOperations.Get DumpFlows And Ovsconfig ${OS_CMP2_CONN_ID} + : FOR ${conn_id} IN @{OS_ALL_CONN_IDS} + \ OpenStackOperations.Get DumpFlows And Ovsconfig ${conn_id} Get Test Teardown Debugs [Arguments] ${test_name}=${SUITE_NAME}.${TEST_NAME} @@ -1036,15 +1035,13 @@ Is Feature Installed Add OVS Logging On All OpenStack Nodes [Documentation] Add higher levels of OVS logging to all the OpenStack nodes - BuiltIn.Run Keyword If 0 < ${NUM_OS_SYSTEM} OVSDB.Add OVS Logging ${OS_CNTL_CONN_ID} - BuiltIn.Run Keyword If 1 < ${NUM_OS_SYSTEM} OVSDB.Add OVS Logging ${OS_CMP1_CONN_ID} - BuiltIn.Run Keyword If 2 < ${NUM_OS_SYSTEM} OVSDB.Add OVS Logging ${OS_CMP2_CONN_ID} + : FOR ${conn_id} IN @{OS_ALL_CONN_IDS} + \ OVSDB.Add OVS Logging ${conn_id} Reset OVS Logging On All OpenStack Nodes [Documentation] Reset the OVS logging to all the OpenStack nodes - BuiltIn.Run Keyword If 0 < ${NUM_OS_SYSTEM} OVSDB.Reset OVS Logging ${OS_CNTL_CONN_ID} - BuiltIn.Run Keyword If 1 < ${NUM_OS_SYSTEM} OVSDB.Reset OVS Logging ${OS_CMP1_CONN_ID} - BuiltIn.Run Keyword If 2 < ${NUM_OS_SYSTEM} OVSDB.Reset OVS Logging ${OS_CMP2_CONN_ID} + : FOR ${conn_id} IN @{OS_ALL_CONN_IDS} + \ OVSDB.Reset OVS Logging ${conn_id} Start Packet Capture On Nodes [Arguments] ${tag} ${filter} @{ips} -- 2.36.6