From 96685d6b867fcde953fe4116d88829994f7c0bbc Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Thu, 28 Apr 2016 19:21:59 -0700 Subject: [PATCH] l2switch suite stabilization Add 1 sec sleep to avoid packet storm in the loop test. Remove bad checking in loop test, a port down can show discard. Add WUKS for all ping tests. Change-Id: I5879bb2a89a9cee0cd38d61ba1263c45d7e5b1cf Signed-off-by: Luis Gomez --- .../010__restconf_inv_addresses.robot | 10 +++++++--- .../Host_Tracking_OF13/010__restconf_topo_nodes.robot | 10 +++++++--- .../l2switch/Loop_Removal_OF13/010__loop_of_3.robot | 5 +++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot b/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot index 39be604fba..6347371de5 100644 --- a/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot +++ b/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot @@ -31,9 +31,7 @@ Check No Host Is Present Ping All [Documentation] Pingall, verify no packet loss - Write pingall - ${result} Read Until mininet> - Should Contain ${result} Results: 0% dropped + Wait Until Keyword Succeeds 10s 2s Ping All Works Good Check node 1 addresses [Documentation] Get the address observations for node 1 @@ -52,3 +50,9 @@ Check node 3 addresses @{list} Create List ${IP_1} ${IP_2} Wait Until Keyword Succeeds 10s 2s Check For Specific Number Of Elements At URI ${OPERATIONAL_NODES_API}/node/openflow:3 ${IP_3} 1 Wait Until Keyword Succeeds 10s 2s Check For Elements Not At URI ${OPERATIONAL_NODES_API}/node/openflow:3 ${list} + +*** Keywords *** +Ping All Works Good + Write pingall + ${result} Read Until mininet> + Should Contain ${result} Results: 0% dropped diff --git a/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot b/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot index 83c2581df1..e65e605613 100644 --- a/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot +++ b/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot @@ -39,9 +39,7 @@ Check No Host Is Present Ping All [Documentation] Pingall, verify no packet loss - Write pingall - ${result} Read Until mininet> - Should Contain ${result} Results: 0% dropped + Wait Until Keyword Succeeds 10s 2s Ping All Works Good Check Host Links [Documentation] Get the topology and check links @@ -96,3 +94,9 @@ Add Port Write pingall Read Until mininet> Wait Until Keyword Succeeds 10s 2s Check For Specific Number Of Elements At URI ${OPERATIONAL_TOPO_API} "node-id":"host:${MAC_1}" 1 + +*** Keywords *** +Ping All Works Good + Write pingall + ${result} Read Until mininet> + Should Contain ${result} Results: 0% dropped diff --git a/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot b/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot index 56a070a619..ce466788d0 100644 --- a/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot +++ b/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot @@ -36,6 +36,9 @@ Check Ports STP status Ping Test [Documentation] Ping h1 to h2, verify no packet loss or duplicates + # This sleep is needed because if the ping in the below WUKS is launched before the STP effectively removes the link, + # it produces a packet storm in mininet that makes the test unresponsive. + Sleep 1 Wait Until Keyword Succeeds 10s 2s Ping Works Good Link Down @@ -60,8 +63,6 @@ Remove Port [Documentation] Remove port s1-eth2 and verify ping works Write sh ovs-vsctl del-port s1 s1-eth2 Read Until mininet> - @{list} Create List ${DISCARD} - Wait Until Keyword Succeeds 10s 2s Check For Elements Not At URI ${OPERATIONAL_NODES_API} ${list} Wait Until Keyword Succeeds 10s 2s Ping Works Good Add Port -- 2.36.6