Mininet clean command to use "Execute Command" vs "Write"

"EC" executes and waits until complete. "Write" requires a "read until"

Signed-off-by: Kailash Khalasi <kailash.khalasi@gmail.com>
Change-Id: Id417f4bf6afa1dcdc89dcfac13357e0830691a4e

diff --git a/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot
index 71eb00236bca3dbcb06e3e497ccbbf880b7b6ca8..9540b89208fce2248b9923ecb7507363d0205342 100644 (file)
--- a/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot
+++ b/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot
@@ -17,12 +17,8 @@ Start Suite
     ${numnodes}    Num Of Nodes    ${TOPO_TREE_DEPTH}    ${TOPO_TREE_FANOUT}
     Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=${numnodes*3}
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Read Until    ${DEFAULT_LINUX_PROMPT}
-    Write    sudo mn -c
-    Read Until    ${DEFAULT_LINUX_PROMPT}
-    Read Until    ${DEFAULT_LINUX_PROMPT}
-    Read Until    ${DEFAULT_LINUX_PROMPT}
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
+    Execute Command    sudo mn -c
     Write    ${start}
     Read Until    mininet>
 

diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
index e57be6ab9055ebde0c18477a988d52996efadfd5..7e2db8610ff0324caef089fa1992c6624b07dcdf 100644 (file)
--- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
+++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
@@ -17,12 +17,8 @@ Start Suite
     ${numnodes}    Num Of Nodes    ${TOPO_TREE_DEPTH}    ${TOPO_TREE_FANOUT}
     Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=${numnodes*2}
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
-    Write    sudo mn -c
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
+    Execute Command    sudo mn -c
     Write    ${start}
     Read Until    mininet>
 

diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
index 150e71e3a3519881c10f6cd8257ef32118169ff4..53e3afc26917b4dd63de69226fee4a36855b28ba 100644 (file)
--- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
+++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
@@ -17,12 +17,8 @@ Start Suite
     ${numnodes}    Num Of Nodes    ${TOPO_TREE_DEPTH}    ${TOPO_TREE_FANOUT}
     Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=${numnodes*3}
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
-    Write    sudo mn -c
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
+    Execute Command    sudo mn -c
     Write    ${start}
     Read Until    mininet>
 

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot b/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
index bf5f46f1f7d3aca9667b1b584b8a266e94d780fc..236518561a3fd2f31867ee04e6e22473531431f8 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
@@ -45,9 +45,8 @@ Connect Switches
     Log    Starting mininet with ${swnr} switches
     Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=600
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Write    sudo mn -c
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
+    Execute Command    sudo mn -c
     Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot b/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
index b29b42e9984df86f20e073388daa19360e21f170..48d052720924964b5a8bbe41550e0b5d9f6654b9 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
@@ -45,9 +45,8 @@ Connect Switches
     Log    Starting mininet with ${swnr} switches
     Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=600
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Write    sudo mn -c
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
+    Execute Command    sudo mn -c
     Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot b/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
index 31e395e4540a5d6f1f4b86ce455df4af0a8e99bc..f03ce3c7d42e1af36dd5872b8848fe86f5e9b30d 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
@@ -45,9 +45,8 @@ Connect Switches
     Log    Starting mininet with ${swnr} switches
     Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=600
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Write    sudo mn -c
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
+    Execute Command    sudo mn -c
     Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot b/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
index d75b2443f3e9e1d4e6d4b6ef6b38ed01b2e6b95e..6a08d09496e33b253890ee2281755409a2c7fdf5 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
@@ -45,9 +45,8 @@ Connect Switches
     Log    Starting mininet with ${swnr} switches
     Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${TOOLS_SYSTEM_PROMPT}    timeout=600
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Write    sudo mn -c
-    Read Until    ${TOOLS_SYSTEM_PROMPT}
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
+    Execute Command    sudo mn -c
     Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}