Fix some issues in OVSDB Southbound test

- Fix bridge delete URL.
- Remove redundant ovsdb disconnect commands.

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

diff --git a/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot b/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
index 380f8321878b15e6684d86cfac1b2d77b78e17a5..36ec4ed26c09538dde90f1fa698093c62526412d 100644 (file)
--- a/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
@@ -115,7 +115,7 @@ Config Topology Still Contains Bridge
 
 Delete the Bridge through rest call
     [Documentation]    This request will delete the bridge node from the config data store.
-    ${resp}    RequestsLibrary.Delete Request    session    ${SOUTHBOUND_CONFIG_API}%2Fbridge%2F${BRIDGE2}
+    ${resp}    RequestsLibrary.Delete Request    session    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2Fuuid%2F${ovsdb_uuid}%2Fbridge%2F${BRIDGE2}
     Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
 
 Get Operational Topology after Deletion of Bridge

diff --git a/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot b/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot
index 22b539015cb74aed87fa1c6d88a891f67b17f2a9..df227587a44eeca92a299e8ec70ec896894c8d63 100644 (file)
--- a/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot
@@ -78,6 +78,12 @@ Get Operational Topology with vxlan tunnel
     @{list}    Create List    vxlanport    ${TOOLS_SYSTEM_2_IP}    ${TOOLS_SYSTEM_IP}
     Wait Until Keyword Succeeds    8s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
+Delete Bridges from config datastore
+    [Documentation]    This request will delete the bridges from config data store.
+    [Tags]    Southbound
+    Delete Bridge From Ovsdb Node    ${TOOLS_SYSTEM_IP}    s2
+    Delete Bridge From Ovsdb Node    ${TOOLS_SYSTEM_2_IP}    s1
+
 Disconnect controller connection from the connected OVSDBs nodes
     [Documentation]    This request will disconnect the controller from the connected OVSDB node for clean startup for next suite.
     [Tags]    Southbound
@@ -109,10 +115,6 @@ Vxlan Extension Test Suite Setup
 
 Vxlan Extension Test Suite Teardown
     [Documentation]    Cleans up test environment, close existing sessions.
-    Delete Bridge From Ovsdb Node    ${TOOLS_SYSTEM_IP}    s2
-    Delete Bridge From Ovsdb Node    ${TOOLS_SYSTEM_2_IP}    s1
-    Disconnect From Ovsdb Node    ${TOOLS_SYSTEM_IP}
-    Disconnect From Ovsdb Node    ${TOOLS_SYSTEM_2_IP}
     Clean OVSDB Test Environment    ${TOOLS_SYSTEM_IP}
     Clean OVSDB Test Environment    ${TOOLS_SYSTEM_2_IP}
     ${resp}    RequestsLibrary.Get Request    session    ${CONFIG_TOPO_API}