Patch to solve the failure Issue of 2 robot tests

Change-Id: Iccc73947888d4e93bda302ff18906ee0d3680ff7
Signed-off-by: Chaudhry Muhammad Usama <chaudhryusama@gmail.com>
(cherry picked from commit 18cf748dbfb7c2c59713675d30ef0304eabaa67d)

diff --git a/test/csit/suites/ovsdb/Southbound_Domain/010__connection_manager.robot b/test/csit/suites/ovsdb/Southbound_Domain/010__connection_manager.robot
index 9a651b266d863a91af3de4607bd369a061de1739..a9386e60085ecb37f04076fea11dbc663a650015 100644 (file)
--- a/test/csit/suites/ovsdb/Southbound_Domain/010__connection_manager.robot
+++ b/test/csit/suites/ovsdb/Southbound_Domain/010__connection_manager.robot
@@ -12,7 +12,7 @@ Resource          ../../../libraries/Utils.txt
 ${OVSDB_PORT}     6644
 ${SOUTHBOUND_CONFIG_API}    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2F${MININET}:${OVSDB_PORT}
 ${OVSDB_CONFIG_DIR}    ${CURDIR}/../../../variables/ovsdb
-@{node_list}      ovsdb://${MININET}:${OVSDB_PORT}    ${MININET}    ${OVSDB_PORT}
+@{node_list}      ovsdb://${MININET}:${OVSDB_PORT}    ${MININET}    ${OVSDB_PORT}    true    br-int
 
 *** Test Cases ***
 Make the OVS instacne to listen for connection
@@ -31,19 +31,17 @@ Connect to OVSDB Node
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
-Get Config Topology
-    [Documentation]    This will fetch the configuration topology from configuration data store
-    [Tags]    Southbound
-    ${resp}    RequestsLibrary.Get    session    ${CONFIG_TOPO_API}
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
-    Should Contain    ${resp.content}    ${MININET}:${OVSDB_PORT}
-
 Get Operational Topology
     [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes
     [Tags]    Southbound
     Wait Until Keyword Succeeds    8s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${node_list}
 
+Delete the integration Bridge
+    [Documentation]    This request will delete the bridge node from the config data store.
+    [Tags]    Southbound
+    ${resp}    RequestsLibrary.Delete    session    ${SOUTHBOUND_CONFIG_API}%2Fbridge%2Fbr-int
+    Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
+
 Delete the OVSDB Node
     [Documentation]    This request will delete the OVSDB node
     [Tags]    Southbound

diff --git a/test/csit/suites/ovsdb/Southbound_Domain/020__configure_1_ovsdb_node.robot b/test/csit/suites/ovsdb/Southbound_Domain/020__configure_1_ovsdb_node.robot
index addc98027911b6a7475174ad744b98317eaba998..82b7527565b460aadf7475f5cf96bde4793996be 100644 (file)
--- a/test/csit/suites/ovsdb/Southbound_Domain/020__configure_1_ovsdb_node.robot
+++ b/test/csit/suites/ovsdb/Southbound_Domain/020__configure_1_ovsdb_node.robot
@@ -13,6 +13,7 @@ ${OVSDB_PORT}     6644
 ${BRIDGE}         br01
 ${SOUTHBOUND_CONFIG_API}    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2F${MININET}:${OVSDB_PORT}
 ${OVSDB_CONFIG_DIR}    ${CURDIR}/../../../variables/ovsdb
+@{node_list}      ovsdb://${MININET}:${OVSDB_PORT}    ${MININET}    ${OVSDB_PORT}    true    br-int
 
 *** Test Cases ***
 Make the OVS instacne to listen for connection
@@ -31,6 +32,11 @@ Connect to OVSDB Node
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
+Get Operational Topology
+    [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes
+    [Tags]    Southbound
+    Wait Until Keyword Succeeds    8s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${node_list}
+
 Create a Bridge
     [Documentation]    This will create bridge on the specified OVSDB node.
     [Tags]    Southbound
@@ -97,6 +103,12 @@ Get Operational Topology after Deletion of Bridge
     @{list}    Create List    ${BRIDGE}    vxlanport
     Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
+Delete the integration Bridge
+    [Documentation]    This request will delete the bridge node from the config data store.
+    [Tags]    Southbound
+    ${resp}    RequestsLibrary.Delete    session    ${SOUTHBOUND_CONFIG_API}%2Fbridge%2Fbr-int
+    Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
+
 Delete the OVSDB Node
     [Documentation]    This request will delete the OVSDB node
     [Tags]    Southbound

diff --git a/test/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot b/test/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
index 971a3542b587183863a6ef6034913fa3b6b37b39..454e1f02b5975dc5294a3c0f6c2b9067d73c48f6 100644 (file)
--- a/test/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
+++ b/test/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
@@ -35,6 +35,12 @@ Connect to OVSDB Node
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
+Delete the integration Bridge
+    [Documentation]    This request will delete the bridge node from the config data store.
+    [Tags]    Southbound
+    ${resp}    RequestsLibrary.Delete    session    ${SOUTHBOUND_CONFIG_API}%2Fbridge%2Fbr-int
+    Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
+
 Get Operational Topology
     [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes
     [Tags]    Southbound