From 65015abb3c851b3ef10a71fb38f7bd68402a656a Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Fri, 16 Jan 2015 10:41:16 -0800 Subject: [PATCH] Fixing mininet reads so that we always clear mininet Change-Id: Ia782e0d7b9a1e896ebf5c6e2ca316d6f0541489a Signed-off-by: Luis Gomez --- test/csit/libraries/Utils.txt | 2 ++ .../Inventory_Scalability_OF10/__init__.txt | 3 +++ .../Inventory_Scalability_OF13/__init__.txt | 3 +++ .../l2switch/Address_Tracking_OF13/__init__.txt | 9 ++++++--- .../l2switch/Flow_Programming_OF13/__init__.txt | 9 ++++++--- .../suites/l2switch/Host_Tracking_OF13/__init__.txt | 11 +++++++++-- .../l2switch/Inventory_Scalability_OF13/__init__.txt | 3 +++ .../suites/l2switch/Loop_Removal_OF13/__init__.txt | 9 ++++++--- 8 files changed, 38 insertions(+), 11 deletions(-) diff --git a/test/csit/libraries/Utils.txt b/test/csit/libraries/Utils.txt index 3610be8a0f..68256440d6 100644 --- a/test/csit/libraries/Utils.txt +++ b/test/csit/libraries/Utils.txt @@ -17,6 +17,8 @@ Start Suite Read Until > Write sudo mn -c Read Until > + Read Until > + Read Until > Write ${start} Read Until mininet> Sleep 6 diff --git a/test/csit/suites/controller/Inventory_Scalability_OF10/__init__.txt b/test/csit/suites/controller/Inventory_Scalability_OF10/__init__.txt index 023ae201d1..e72ea50356 100644 --- a/test/csit/suites/controller/Inventory_Scalability_OF10/__init__.txt +++ b/test/csit/suites/controller/Inventory_Scalability_OF10/__init__.txt @@ -18,8 +18,11 @@ Start Suite Open Connection ${MININET} prompt=> timeout=${numnodes*2} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 + Read Until > Write sudo mn -c Read Until > + Read Until > + Read Until > Write ${start} Read Until mininet> diff --git a/test/csit/suites/controller/Inventory_Scalability_OF13/__init__.txt b/test/csit/suites/controller/Inventory_Scalability_OF13/__init__.txt index 2f1d3dc950..f4b56b846d 100644 --- a/test/csit/suites/controller/Inventory_Scalability_OF13/__init__.txt +++ b/test/csit/suites/controller/Inventory_Scalability_OF13/__init__.txt @@ -18,8 +18,11 @@ Start Suite Open Connection ${MININET} prompt=> timeout=${numnodes*2} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 + Read Until > Write sudo mn -c Read Until > + Read Until > + Read Until > Write ${start} Read Until mininet> diff --git a/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt b/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt index a2f58f4a30..362257c157 100644 --- a/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.txt @@ -13,14 +13,17 @@ Start Suite Open Connection ${MININET} prompt=> timeout=20 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 + Read Until > Write sudo mn -c - Read Until > + Read Until > + Read Until > + Read Until > Write ${start} - Read Until mininet> + Read Until mininet> Sleep 30 Stop Suite Log Stop mininet Read Write exit - Read Until > + Read Until > Close Connection diff --git a/test/csit/suites/l2switch/Flow_Programming_OF13/__init__.txt b/test/csit/suites/l2switch/Flow_Programming_OF13/__init__.txt index a48347de24..35c41af88d 100644 --- a/test/csit/suites/l2switch/Flow_Programming_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Flow_Programming_OF13/__init__.txt @@ -13,14 +13,17 @@ Start Suite Open Connection ${MININET} prompt=> timeout=10 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 + Read Until > Write sudo mn -c - Read Until > + Read Until > + Read Until > + Read Until > Write ${start} - Read Until mininet> + Read Until mininet> Sleep 15 Stop Suite Log Stop mininet Read Write exit - Read Until > + Read Until > Close All Connections diff --git a/test/csit/suites/l2switch/Host_Tracking_OF13/__init__.txt b/test/csit/suites/l2switch/Host_Tracking_OF13/__init__.txt index 22872b948f..4f1658fd2b 100644 --- a/test/csit/suites/l2switch/Host_Tracking_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Host_Tracking_OF13/__init__.txt @@ -13,10 +13,17 @@ Start Suite Open Connection ${MININET} prompt=> timeout=20 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 + Read Until > Write sudo mn -c - Read Until > + Read Until > + Read Until > + Read Until > Write ${start} - Read Until mininet> + Read Until mininet> Sleep 30 Stop Suite + Log Stop mininet + Read + Write exit + Read Until > Close Connection diff --git a/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.txt b/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.txt index 2f1d3dc950..f4b56b846d 100644 --- a/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.txt @@ -18,8 +18,11 @@ Start Suite Open Connection ${MININET} prompt=> timeout=${numnodes*2} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 + Read Until > Write sudo mn -c Read Until > + Read Until > + Read Until > Write ${start} Read Until mininet> diff --git a/test/csit/suites/l2switch/Loop_Removal_OF13/__init__.txt b/test/csit/suites/l2switch/Loop_Removal_OF13/__init__.txt index 5ed99db34d..1aa62b2da4 100644 --- a/test/csit/suites/l2switch/Loop_Removal_OF13/__init__.txt +++ b/test/csit/suites/l2switch/Loop_Removal_OF13/__init__.txt @@ -14,16 +14,19 @@ Start Suite Open Connection ${MININET} prompt=> timeout=10 Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any Write sudo ovs-vsctl set-manager ptcp:6644 + Read Until > Write sudo mn -c - Read Until > + Read Until > + Read Until > + Read Until > Put File ${CURDIR}/../topologies/customtopo.py Write ${start} - Read Until mininet> + Read Until mininet> Sleep 10 Stop Suite Log Stop mininet Read Write exit - Read Until > + Read Until > Read Close Connection -- 2.36.6