Introduce a Clean up OVS utility to use in Robot.

Change-Id: If2925ba1d9ea2eacdec6e7f76bdd0241ddf8b66a
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>

diff --git a/test/csit/libraries/Utils.txt b/test/csit/libraries/Utils.txt
index a893292a461125b8650f19fa175e32acf112903d..df47af1eaab92c938dcb7bf2eec045f55fcfc828 100644 (file)
--- a/test/csit/libraries/Utils.txt
+++ b/test/csit/libraries/Utils.txt
@@ -95,6 +95,15 @@ Clean Mininet System
     Run Command On Remote System    ${mininet_system}   sudo mn -c
     Run Command On Remote System    ${mininet_system}   sudo ps -elf | egrep 'usr/local/bin/mn' | egrep python | awk '{print "sudo kill -9",$4}' | sh
 
+Clean Up Ovs
+    [Arguments]     ${mininet_system}=${MININET}
+    [Documentation]    Cleans up the OVS instance and remove any existing common known bridges.
+    ${output}=    Run Command On Remote System    ${mininet_system}    sudo ovs-vsctl list-br
+    Log    ${output}
+    : FOR    ${i}    IN    ${output}
+    \    Run Command On Remote System    ${mininet_system}    sudo ovs-vsctl --if-exists del-br ${i}
+    Run Command On Remote System    ${mininet_system}    sudo ovs-vsctl del-manager
+
 Extract Value From Content
     [Arguments]    ${content}    ${index}    ${strip}=nostrip
     [Documentation]    Will take the given response content and return the value at the given index as a string

diff --git a/test/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot b/test/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot
index f487211aaf49aef2a1364fc8508b2a912fc8325b..21372c8cba1072621cb7983f6e15c8f72d5df467 100644 (file)
--- a/test/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot
+++ b/test/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot
@@ -34,9 +34,7 @@ ${PING_NOT_CONTAIN}    Destination Host Unreachable
 Make the OVS instance to listen for connection
     [Documentation]    Connect OVS to ODL
     [Tags]    OVSDB netvirt
-    Run Command On Remote System    ${MININET}    sudo ovs-vsctl --if-exists del-port br-int
-    Run Command On Remote System    ${MININET}    sudo ovs-vsctl --if-exists del-br br-int
-    Run Command On Remote System    ${MININET}    sudo ovs-vsctl del-manager
+    Clean Up Ovs   ${MININET}
     Run Command On Remote System    ${MININET}    sudo ovs-vsctl set-manager tcp:${CONTROLLER}:${OVSDB_PORT}
     ${output}    Run Command On Remote System    ${MININET}    sudo ovs-vsctl show
     ${pingresult}   Run Command On Remote System    ${MININET}    ping ${CONTROLLER} -c 4