From: Luis Gomez Date: Sat, 7 Jun 2014 00:11:29 +0000 (-0700) Subject: Test Case Reorganization Part 2 X-Git-Tag: release/helium~73 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3b73117b06426d001a576458e696d18a27e5149b;p=integration%2Ftest.git Test Case Reorganization Part 2 Change-Id: If9ac8a3b7c38f9c7b337a59d5e41b871eeadc222 Signed-off-by: Luis Gomez --- diff --git a/test/csit/suites/base-of13/010__MD_SAL_NSF/__init__.txt b/test/csit/suites/base-of13/010__MD_SAL_NSF/__init__.txt index bd0aabc4d5..7cbfbf18e3 100644 --- a/test/csit/suites/base-of13/010__MD_SAL_NSF/__init__.txt +++ b/test/csit/suites/base-of13/010__MD_SAL_NSF/__init__.txt @@ -9,7 +9,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 ** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 @@ -19,7 +19,7 @@ Start Suite Sleep 30 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/__init__.txt b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/__init__.txt index 6d246504ea..019b0883b6 100644 --- a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/__init__.txt +++ b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/__init__.txt @@ -9,7 +9,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 @@ -19,7 +19,7 @@ Start Suite Sleep 30 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt index 0149c3546e..30cd4eb793 100644 --- a/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt +++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt @@ -1,5 +1,5 @@ *** Settings *** -Documentation Test suite for the Switch Manager +Documentation Test suite for Switch Manager Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${CONTROLLER}:8080 auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/__init__.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/__init__.txt index 30de25b658..29d6ca5748 100644 --- a/test/csit/suites/base-of13/030__AD_SAL_NSF/__init__.txt +++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/__init__.txt @@ -9,7 +9,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 ** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 @@ -19,7 +19,7 @@ Start Suite Sleep 30 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/__init__.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/__init__.txt index d75c464b1d..b2ca3487c3 100644 --- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/__init__.txt +++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/__init__.txt @@ -9,7 +9,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 @@ -19,7 +19,7 @@ Start Suite Sleep 30 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base-of13/050__AD_SAL_Apps/__init__.txt b/test/csit/suites/base-of13/050__AD_SAL_Apps/__init__.txt index 5a2056b061..0c6c07592e 100644 --- a/test/csit/suites/base-of13/050__AD_SAL_Apps/__init__.txt +++ b/test/csit/suites/base-of13/050__AD_SAL_Apps/__init__.txt @@ -9,7 +9,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 ** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 @@ -19,7 +19,7 @@ Start Suite Sleep 30 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/__init__.txt b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/__init__.txt index 42d377dd04..5882daa213 100644 --- a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/__init__.txt +++ b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/__init__.txt @@ -9,7 +9,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 @@ -19,7 +19,7 @@ Start Suite Sleep 30 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base-of13/070__Flows_OF13/__init__.txt b/test/csit/suites/base-of13/070__Flows_OF13/__init__.txt index 42354a8433..de519bbb0b 100644 --- a/test/csit/suites/base-of13/070__Flows_OF13/__init__.txt +++ b/test/csit/suites/base-of13/070__Flows_OF13/__init__.txt @@ -9,7 +9,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 @@ -19,7 +19,7 @@ Start Suite Sleep 20 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base-of13/080__OVSDB/__init__.txt b/test/csit/suites/base-of13/080__OVSDB/__init__.txt index 020d13358d..31c9137a28 100644 --- a/test/csit/suites/base-of13/080__OVSDB/__init__.txt +++ b/test/csit/suites/base-of13/080__OVSDB/__init__.txt @@ -9,7 +9,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 ** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 @@ -19,7 +19,7 @@ Start Suite Sleep 20 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base-of13/090__OVSDB_OF13/__init__.txt b/test/csit/suites/base-of13/090__OVSDB_OF13/__init__.txt index cd8ba66a82..98abe73cf9 100644 --- a/test/csit/suites/base-of13/090__OVSDB_OF13/__init__.txt +++ b/test/csit/suites/base-of13/090__OVSDB_OF13/__init__.txt @@ -9,7 +9,7 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 @@ -19,7 +19,7 @@ Start Suite Sleep 20 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base/015__switch_Manager.txt b/test/csit/suites/base/010__AD_SAL_NSF/010__switch_manager.txt similarity index 77% rename from test/csit/suites/base/015__switch_Manager.txt rename to test/csit/suites/base/010__AD_SAL_NSF/010__switch_manager.txt index 55fb8c74d6..be2f4c5911 100644 --- a/test/csit/suites/base/015__switch_Manager.txt +++ b/test/csit/suites/base/010__AD_SAL_NSF/010__switch_manager.txt @@ -1,13 +1,13 @@ *** Settings *** -Documentation Test suite for the switch manager bundle. +Documentation Test suite for Switch Manager Suite Setup Create Session ${ODL_CONTROLLER_SESSION} http://${CONTROLLER}:8080 auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary -Library ../../libraries/Common.py -Library ../../libraries/SwitchManager.py -Variables ../../variables/Variables.py -Library ../../libraries/Topology.py +Library ../../../libraries/Common.py +Library ../../../libraries/SwitchManager.py +Variables ../../../variables/Variables.py +Library ../../../libraries/Topology.py *** Variables *** ${REST_CONTEXT} /controller/nb/v2/switchmanager @@ -18,22 +18,42 @@ List all nodes [Tags] list_info Log ${TOPO_TREE_LEVEL} ${topo_nodes} Get Nodes From Topology ${TOPO_TREE_LEVEL} - ${resp} Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes + ${resp} Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${jsondata}= To JSON ${resp.content} ${nodes} Extract All Nodes ${jsondata} List Should Contain Sublist ${nodes} ${topo_nodes} -Get a node - [Documentation] Get a node - Get node 00:00:00:00:00:00:00:02 OF +Check node 1 connectors + [Documentation] List node connectors and verify all connectors are there + [Tags] list_info + ${resp} Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01 + Should Be Equal As Strings ${resp.status_code} 200 Response status code error + Should Contain ${resp.content} s1-eth1 + Should Contain ${resp.content} s1-eth2 +Check node 2 connectors + [Documentation] List node connectors and verify all connectors are there + [Tags] list_info + ${resp} Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:02 + Should Be Equal As Strings ${resp.status_code} 200 Response status code error + Should Contain ${resp.content} s2-eth1 + Should Contain ${resp.content} s2-eth2 + Should Contain ${resp.content} s2-eth3 +Check node 3 connectors + [Documentation] List node connectors and verify all connectors are there + [Tags] list_info + ${resp} Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:03 + Should Be Equal As Strings ${resp.status_code} 200 Response status code error + Should Contain ${resp.content} s3-eth1 + Should Contain ${resp.content} s3-eth2 + Should Contain ${resp.content} s3-eth3 Add property to node [Documentation] Add a property to node Add property to node OF 00:00:00:00:00:00:00:02 description Switch2 Node property should exist OF 00:00:00:00:00:00:00:02 description Switch2 -Remove property from node - [Documentation] Remove a property from node - Remove property from node OF 00:00:00:00:00:00:00:02 description - Node property should not exist OF 00:00:00:00:00:00:00:02 description Switch2 +#Remove property from node +# [Documentation] Remove a property from node +# Remove property from node OF 00:00:00:00:00:00:00:02 description +# Node property should not exist OF 00:00:00:00:00:00:00:02 description Switch2 Add property to nodeconnector [Documentation] Add a property to nodeconnector Add property to nodeconnector OF 00:00:00:00:00:00:00:02 OF 2 bandwidth 1000 diff --git a/test/csit/suites/base/010__statistics_manager.txt b/test/csit/suites/base/010__AD_SAL_NSF/020__statistics_manager.txt similarity index 88% rename from test/csit/suites/base/010__statistics_manager.txt rename to test/csit/suites/base/010__AD_SAL_NSF/020__statistics_manager.txt index 49d2e83914..adc6d9ce23 100644 --- a/test/csit/suites/base/010__statistics_manager.txt +++ b/test/csit/suites/base/010__AD_SAL_NSF/020__statistics_manager.txt @@ -1,11 +1,11 @@ *** Settings *** -Documentation Test suite for the statistics manager module +Documentation Test suite for Statistics Manager Suite Setup Create Session session http://${CONTROLLER}:8080 auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections -Library ../../libraries/RequestsLibrary.py -Library ../../libraries/Common.py -Variables ../../variables/Variables.py +Library ../../../libraries/RequestsLibrary.py +Library ../../../libraries/Common.py +Variables ../../../variables/Variables.py *** Variables *** ${node1} "00:00:00:00:00:00:00:01" diff --git a/test/csit/suites/base/005__topology_manager.txt b/test/csit/suites/base/010__AD_SAL_NSF/030__topology_manager.txt similarity index 94% rename from test/csit/suites/base/005__topology_manager.txt rename to test/csit/suites/base/010__AD_SAL_NSF/030__topology_manager.txt index 076d5e44ee..58a4d08c0a 100644 --- a/test/csit/suites/base/005__topology_manager.txt +++ b/test/csit/suites/base/010__AD_SAL_NSF/030__topology_manager.txt @@ -3,9 +3,9 @@ Documentation Test suite for Topology Manager Suite Setup Create Session session http://${CONTROLLER}:8080 auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections -Library ../../libraries/RequestsLibrary.py -Library ../../libraries/Common.py -Variables ../../variables/Variables.py +Library ../../../libraries/RequestsLibrary.py +Library ../../../libraries/Common.py +Variables ../../../variables/Variables.py *** Variables *** ${node1} "00:00:00:00:00:00:00:01" diff --git a/test/csit/suites/base/020__forwarding_rules_manager.txt b/test/csit/suites/base/010__AD_SAL_NSF/040__flow_programmer.txt similarity index 93% rename from test/csit/suites/base/020__forwarding_rules_manager.txt rename to test/csit/suites/base/010__AD_SAL_NSF/040__flow_programmer.txt index 390949a4cd..6b748625a2 100644 --- a/test/csit/suites/base/020__forwarding_rules_manager.txt +++ b/test/csit/suites/base/010__AD_SAL_NSF/040__flow_programmer.txt @@ -1,11 +1,11 @@ *** Settings *** -Documentation Test suite for the forwarding rule manager module. +Documentation Test suite for Flow Programmer Suite Setup Create Session session http://${CONTROLLER}:8080 auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections -Library ../../libraries/RequestsLibrary.py -Library ../../libraries/Common.py -Variables ../../variables/Variables.py +Library ../../../libraries/RequestsLibrary.py +Library ../../../libraries/Common.py +Variables ../../../variables/Variables.py *** Variables *** ${name} flow1 diff --git a/test/csit/suites/base/__init__.txt b/test/csit/suites/base/010__AD_SAL_NSF/__init__.txt similarity index 76% rename from test/csit/suites/base/__init__.txt rename to test/csit/suites/base/010__AD_SAL_NSF/__init__.txt index 1f057da7c1..8c56b003cc 100644 --- a/test/csit/suites/base/__init__.txt +++ b/test/csit/suites/base/010__AD_SAL_NSF/__init__.txt @@ -1,5 +1,5 @@ *** Settings *** -Documentation Test suite for the OpenDaylight base edition +Documentation Test suite for AD-SAL NSF Suite Setup Start Suite Suite Teardown Stop Suite Library SSHLibrary @@ -9,17 +9,17 @@ ${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 *** Keywords *** Start Suite - Log Start the test on the base edition + Log Start mininet Open Connection ${MININET} prompt=> Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 Write sudo mn -c Sleep 2 Write ${start} - Sleep 70 + Sleep 10 Read Stop Suite - Log Stop the test on the base edition + Log Stop mininet Read Write exit Sleep 4 diff --git a/test/csit/suites/base/025__host_tracker.txt b/test/csit/suites/base/020__AD_SAL_Apps/010__host_tracker.txt similarity index 93% rename from test/csit/suites/base/025__host_tracker.txt rename to test/csit/suites/base/020__AD_SAL_Apps/010__host_tracker.txt index 34856e3f2a..851aaf1da9 100644 --- a/test/csit/suites/base/025__host_tracker.txt +++ b/test/csit/suites/base/020__AD_SAL_Apps/010__host_tracker.txt @@ -1,11 +1,11 @@ *** Settings *** -Documentation Test suite for the host tracker module. +Documentation Test suite for Host Tracker Suite Setup Create Session session http://${CONTROLLER}:8080 auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library Collections -Library ../../libraries/RequestsLibrary.py -Library ../../libraries/Common.py -Variables ../../variables/Variables.py +Library ../../../libraries/RequestsLibrary.py +Library ../../../libraries/Common.py +Variables ../../../variables/Variables.py *** Variables *** ${name} 10.0.1.4 diff --git a/test/csit/suites/base/035__forwarding_manager.txt b/test/csit/suites/base/020__AD_SAL_Apps/020__static_route.txt similarity index 74% rename from test/csit/suites/base/035__forwarding_manager.txt rename to test/csit/suites/base/020__AD_SAL_Apps/020__static_route.txt index 68cd444093..8c21cf1f9d 100644 --- a/test/csit/suites/base/035__forwarding_manager.txt +++ b/test/csit/suites/base/020__AD_SAL_Apps/020__static_route.txt @@ -1,12 +1,12 @@ *** Settings *** -Documentation Test suite for the forwarding manager module. +Documentation Test suite for Static Route 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 -Variables ../../variables/Variables.py +Library ../../../libraries/RequestsLibrary.py +Library ../../../libraries/Common.py +Variables ../../../variables/Variables.py *** Variables *** ${name} test_route1 @@ -27,7 +27,15 @@ Add a static route ${result} To JSON ${resp.content} ${content} Get From Dictionary ${result} ${key} List Should Contain Value ${content} ${body} - Sleep 5 + Sleep 10 +# This works locally but NOT in OpenDaylight +#Check flow in flow stats +# [Documentation] Show flow stats and validate result +# [Tags] get +# ${resp} Get session ${REST_CONTEXT_ST}/${CONTAINER}/flow +# Should Be Equal As Strings ${resp.status_code} 200 +# Log ${resp.content} +# Should Contain X Times ${resp.content} 10.0.0.2 3 Remove a static route [Documentation] Remove a static route, list to validate the result. [Tags] remove diff --git a/test/csit/suites/base/030__arp_handler.txt b/test/csit/suites/base/020__AD_SAL_Apps/030__subnet_gateway.txt similarity index 92% rename from test/csit/suites/base/030__arp_handler.txt rename to test/csit/suites/base/020__AD_SAL_Apps/030__subnet_gateway.txt index 210ec44441..8ad5385aac 100644 --- a/test/csit/suites/base/030__arp_handler.txt +++ b/test/csit/suites/base/020__AD_SAL_Apps/030__subnet_gateway.txt @@ -1,12 +1,12 @@ *** Settings *** -Documentation Test suite for the arp handler module. +Documentation Test suite for Subnet Gateway 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 -Variables ../../variables/Variables.py +Library ../../../libraries/RequestsLibrary.py +Library ../../../libraries/Common.py +Variables ../../../variables/Variables.py *** Variables *** ${name} test diff --git a/test/csit/suites/base/020__AD_SAL_Apps/__init__.txt b/test/csit/suites/base/020__AD_SAL_Apps/__init__.txt new file mode 100644 index 0000000000..310cb945b0 --- /dev/null +++ b/test/csit/suites/base/020__AD_SAL_Apps/__init__.txt @@ -0,0 +1,27 @@ +*** Settings *** +Documentation Test suite for AD-SAL Applications +Suite Setup Start Suite +Suite Teardown Stop Suite +Library SSHLibrary + +*** Variables *** +${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 + +*** Keywords *** +Start Suite + Log Start mininet + Open Connection ${MININET} prompt=> + Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any + Write sudo ovs-vsctl set-manager ptcp:6644 + Write sudo mn -c + Sleep 2 + Write ${start} + Sleep 10 + Read +Stop Suite + Log Stop mininet + Read + Write exit + Sleep 4 + Read + Close Connection diff --git a/test/csit/suites/base/050__OVSDB_plugin.txt b/test/csit/suites/base/030__OVSDB/010_bridge_domain.txt similarity index 94% rename from test/csit/suites/base/050__OVSDB_plugin.txt rename to test/csit/suites/base/030__OVSDB/010_bridge_domain.txt index dee106179b..faf8f1cfe4 100644 --- a/test/csit/suites/base/050__OVSDB_plugin.txt +++ b/test/csit/suites/base/030__OVSDB/010_bridge_domain.txt @@ -1,13 +1,13 @@ *** Settings *** -Documentation Test suite for OVSDB plugin +Documentation Test suite for Bridge Domain 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 -Library ../../libraries/Topology.py -Variables ../../variables/Variables.py +Library ../../../libraries/RequestsLibrary.py +Library ../../../libraries/Common.py +Library ../../../libraries/Topology.py +Variables ../../../variables/Variables.py *** Variables *** ${key} node @@ -73,10 +73,10 @@ Ping h1 to h4 [Documentation] Ping h1 to h4, verify no packet loss [Tags] ovsdb Sleep 5 - Write h1 ping -w 40 h4 - Sleep 40 - Write h4 ping -w 40 h1 - Sleep 40 + Write h1 ping -w 6 h4 + Sleep 6 + Write h4 ping -w 6 h1 + Sleep 6 ${result} Read Should Contain ${result} 64 bytes Delete s4 ports diff --git a/test/csit/suites/base/030__OVSDB/__init__.txt b/test/csit/suites/base/030__OVSDB/__init__.txt new file mode 100644 index 0000000000..182db102cc --- /dev/null +++ b/test/csit/suites/base/030__OVSDB/__init__.txt @@ -0,0 +1,27 @@ +*** Settings *** +Documentation Test suite for OVSDB +Suite Setup Start Suite +Suite Teardown Stop Suite +Library SSHLibrary + +*** Variables *** +${start}= sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 + +*** Keywords *** +Start Suite + Log Start mininet + Open Connection ${MININET} prompt=> + Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any + Write sudo ovs-vsctl set-manager ptcp:6644 + Write sudo mn -c + Sleep 2 + Write ${start} + Sleep 10 + Read +Stop Suite + Log Stop mininet + Read + Write exit + Sleep 4 + Read + Close Connection