From bd818f4631cc37f5c94cec29b44e405eb7eec750 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Mon, 2 Dec 2013 20:22:21 -0800 Subject: [PATCH] Delete flows at the end Change-Id: Ia51681acb90c7404a8adc0a7a678ebc71574dd8b Signed-off-by: Luis Gomez --- test/csit/suites/base/030__arp_handler.txt | 13 +++++++------ .../suites/base/035__forwarding_manager.txt | 10 +++++++++- test/csit/suites/base/050__OVSDB_plugin.txt | 19 ++++++++++++++----- test/csit/suites/base/__init__.txt | 2 ++ 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/test/csit/suites/base/030__arp_handler.txt b/test/csit/suites/base/030__arp_handler.txt index f2d113d3ca..db4797f7fa 100644 --- a/test/csit/suites/base/030__arp_handler.txt +++ b/test/csit/suites/base/030__arp_handler.txt @@ -38,12 +38,6 @@ List hosts Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} 10.0.0.1 Should Contain ${resp.content} 10.0.0.4 -Remove flows - [Documentation] Remove flows generated by simple fwd - [Tags] Get - Write dpctl del-flows - Sleep 1 - Read Add a subnet [Documentation] Add a subnet, list to validate the result. [Tags] add @@ -66,3 +60,10 @@ Remove a subnet ${result} To JSON ${resp.content} ${content} Get From Dictionary ${result} ${key} List Should Not Contain Value ${content} ${body} +Remove flows + [Documentation] Remove flows generated by simple fwd + [Tags] Get + Write dpctl del-flows + Sleep 1 + Read + diff --git a/test/csit/suites/base/035__forwarding_manager.txt b/test/csit/suites/base/035__forwarding_manager.txt index d69a7b99aa..fba7b4541c 100644 --- a/test/csit/suites/base/035__forwarding_manager.txt +++ b/test/csit/suites/base/035__forwarding_manager.txt @@ -2,6 +2,7 @@ Documentation Test suite for the forwarding manager module. Suite Setup Create Session session http://${CONTROLLER}:8080 auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions +Library SSHLibrary Library Collections Library ../../libraries/RequestsLibrary.py Library ../../libraries/Common.py @@ -25,7 +26,7 @@ Add a static route ${result} To JSON ${resp.content} ${content} Get From Dictionary ${result} ${key} List Should Contain Value ${content} ${body} - + Sleep 2 Remove a static route [Documentation] Remove a static route, list to validate the result. [Tags] remove @@ -38,3 +39,10 @@ Remove a static route ${result} To JSON ${resp.content} ${content} Get From Dictionary ${result} ${key} List Should Not Contain Value ${content} ${body} +Remove flows + [Documentation] Remove flows generated by simple fwd + [Tags] Get + Write dpctl del-flows + Sleep 1 + Read + diff --git a/test/csit/suites/base/050__OVSDB_plugin.txt b/test/csit/suites/base/050__OVSDB_plugin.txt index cc5152d61a..08925ff2bd 100644 --- a/test/csit/suites/base/050__OVSDB_plugin.txt +++ b/test/csit/suites/base/050__OVSDB_plugin.txt @@ -69,12 +69,14 @@ Add s4 ports ${resp} Post session ${REST_CONTEXT_BD}/port/OVS/MININET/s3/s3-eth3 ... data={"type":"patch", "CUSTOM":{"peer":"s4-eth2"}} Should Be Equal As Strings ${resp.status_code} 201 -Remove flows - [Documentation] Remove flows generated by simple fwd +Ping h1 to h4 + [Documentation] Ping h1 to h4, verify no packet loss [Tags] Get - Write dpctl del-flows - Sleep 1 - Read + Sleep 20 + Write h1 ping -c 3 h4 + Sleep 6 + ${result} Read + Should Contain ${result} 64 bytes Delete s4 ports [Documentation] Delete s4 connected ports [Tags] delete @@ -117,3 +119,10 @@ Disconnect mininet ${result} To JSON ${resp.content} ${content} Get From Dictionary ${result} ${key} List Should Not Contain Value ${content} ${body} +Remove flows + [Documentation] Remove flows generated by simple fwd + [Tags] Get + Write dpctl del-flows + Sleep 1 + Read + diff --git a/test/csit/suites/base/__init__.txt b/test/csit/suites/base/__init__.txt index f0c0a85dc1..fdc9606881 100644 --- a/test/csit/suites/base/__init__.txt +++ b/test/csit/suites/base/__init__.txt @@ -17,6 +17,8 @@ Start Suite Sleep 2 Write ${start} Sleep 65 + Write dpctl del-flows + Sleep 1 Read Stop Suite Log Stop the test on the base edition -- 2.36.6