Fixing mininet reads so that we always clear mininet

Change-Id: Ia782e0d7b9a1e896ebf5c6e2ca316d6f0541489a
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/test/csit/libraries/Utils.txt b/test/csit/libraries/Utils.txt
index 3610be8a0f859851d7a57584efacd80d04654155..68256440d6ad2f0136b3c64dbddd129e1384e6b1 100644 (file)
--- 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 023ae201d1ff6ead930e2be31cccab9a8eb2a168..e72ea503565702a78edab1f3e131c8d44ead0ab4 100644 (file)
--- 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 2f1d3dc950f34d216d4723cdb65d51d9216d2db6..f4b56b846d06a4e2570c6b70b6dba68ccb2e6d9f 100644 (file)
--- 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 a2f58f4a30a982d2029dd226a705f9a8904efb36..362257c157967fa05716e85263ac91ff74a3026e 100644 (file)
--- 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 a48347de242a1e35b1994d2f0defd3d829303bf6..35c41af88d05eb970a4751dab0712c1855a0723e 100644 (file)
--- 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 22872b948fba67d5086fb67c0b0752b36dc40a04..4f1658fd2b4fff4e4e4fbee52ee6280968164081 100644 (file)
--- 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 2f1d3dc950f34d216d4723cdb65d51d9216d2db6..f4b56b846d06a4e2570c6b70b6dba68ccb2e6d9f 100644 (file)
--- 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 5ed99db34d2b0e95a7f09cd7edff4e4411f1f29e..1aa62b2da4c3c9c05af3b48a374c43bacedca9f0 100644 (file)
--- 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