OVSDB Southbound TestSuites Updated

[integration/test.git] / test / csit / suites / ovsdb / Southbound_Domain / 020__configure_1_ovsdb_node.robot

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 6b152db23912213981c879bc56b5f5c0e764d5b8..addc98027911b6a7475174ad744b98317eaba998 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
@@ -12,13 +12,18 @@ Resource          ../../../libraries/Utils.txt
 ${OVSDB_PORT}     6644
 ${BRIDGE}         br01
 ${SOUTHBOUND_CONFIG_API}    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2F${MININET}:${OVSDB_PORT}
-${FILE}           ${CURDIR}/../../../variables/ovsdb
+${OVSDB_CONFIG_DIR}    ${CURDIR}/../../../variables/ovsdb
 
 *** Test Cases ***
+Make the OVS instacne to listen for connection
+    [Tags]    Southbound
+    Run Command On Remote System    ${MININET}    sudo ovs-vsctl del-manager
+    Run Command On Remote System    ${MININET}    sudo ovs-vsctl set-manager ptcp:6644
+
 Connect to OVSDB Node
     [Documentation]    Initiate the connection to OVSDB node from controller
     [Tags]    Southbound
-    ${sample}    OperatingSystem.Get File    ${FILE}/connect.json
+    ${sample}    OperatingSystem.Get File    ${OVSDB_CONFIG_DIR}/connect.json
     ${sample1}    Replace String    ${sample}    127.0.0.1    ${MININET}
     ${body}    Replace String    ${sample1}    61644    ${OVSDB_PORT}
     Log    URL is ${SOUTHBOUND_CONFIG_API}
@@ -29,8 +34,8 @@ Connect to OVSDB Node
 Create a Bridge
     [Documentation]    This will create bridge on the specified OVSDB node.
     [Tags]    Southbound
-    ${sample}    OperatingSystem.Get File    ${FILE}/create_bridge.json
-    ${sample1}    Replace String    ${sample}    tcp:127.0.0.1:6630    tcp:${CONTROLLER}:6633
+    ${sample}    OperatingSystem.Get File    ${OVSDB_CONFIG_DIR}/create_bridge.json
+    ${sample1}    Replace String    ${sample}    tcp:127.0.0.1:6633    tcp:${CONTROLLER}:6633
     ${sample2}    Replace String    ${sample1}    127.0.0.1    ${MININET}
     ${sample3}    Replace String    ${sample2}    br01    ${BRIDGE}
     ${body}    Replace String    ${sample3}    61644    ${OVSDB_PORT}
@@ -51,12 +56,12 @@ Get Operational Topology with Bridge
     [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes to verify the bridge is added to the data store
     [Tags]    Southbound
     @{list}    Create List    ${BRIDGE}
-    Wait Until Keyword Succeeds    10s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${list}
+    Wait Until Keyword Succeeds    8s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
 Create Port and attach to a Bridge
     [Documentation]    This request will creates port/interface and attach it to the specific bridge
     [Tags]    Southbound
-    ${body}    OperatingSystem.Get File    ${FILE}/create_port.json
+    ${body}    OperatingSystem.Get File    ${OVSDB_CONFIG_DIR}/create_port.json
     Log    URL is ${SOUTHBOUND_CONFIG_API}%2Fbridge%2F${BRIDGE}/termination-point/vxlanport/
     ${resp}    RequestsLibrary.Put    session    ${SOUTHBOUND_CONFIG_API}%2Fbridge%2F${BRIDGE}/termination-point/vxlanport/    data=${body}
     Log    ${resp.content}
@@ -66,7 +71,7 @@ Get Operational Topology with Port
     [Documentation]    This request will fetch the operational topology after the Port is added to the bridge
     [Tags]    Southbound
     @{list}    Create List    ${BRIDGE}    vxlanport
-    Wait Until Keyword Succeeds    6s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${list}
+    Wait Until Keyword Succeeds    8s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
 Delete the Port
     [Documentation]    This request will delete the port node from the bridge node and data store.
@@ -78,7 +83,7 @@ Get Operational Topology after Deletion of Port
     [Documentation]    This request will fetch the operational topology after the Port is deleted
     [Tags]    Southbound
     @{list}    Create List    vxlanport
-    Wait Until Keyword Succeeds    6s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
+    Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
 Delete the Bridge
     [Documentation]    This request will delete the bridge node from the config data store.
@@ -90,7 +95,7 @@ Get Operational Topology after Deletion of Bridge
     [Documentation]    This request will fetch the operational topology after the Bridge is deleted
     [Tags]    Southbound
     @{list}    Create List    ${BRIDGE}    vxlanport
-    Wait Until Keyword Succeeds    6s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
+    Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
 Delete the OVSDB Node
     [Documentation]    This request will delete the OVSDB node
@@ -102,4 +107,4 @@ Get Operational Topology after Deletion of OVSDB Node
     [Documentation]    This request will fetch the operational topology after the OVSDB node is deleted
     [Tags]    Southbound
     @{list}    Create List    ovsdb://${MININET}:${OVSDB_PORT}    ${BRIDGE}    vxlanport
-    Wait Until Keyword Succeeds    6s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
+    Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}