Changed the order of the testsuites and added operational check after each operation

[integration/test.git] / test / csit / suites / ovsdb / Southbound_Domain / 030__configure_exit_ovsdb_node.robot

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 454e1f02b5975dc5294a3c0f6c2b9067d73c48f6..88bdf5fa80aab5b0c0b41a0a7e47572ad2402ae3 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
@@ -9,7 +9,7 @@ Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.txt
 
 *** Variables ***
-${OVSDB_PORT}     6644
+${OVSDB_PORT}     6634
 ${BRIDGE}         br-s1
 ${SOUTHBOUND_CONFIG_API}    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2F${MININET}:${OVSDB_PORT}
 ${OVSDB_CONFIG_DIR}    ${CURDIR}/../../../variables/ovsdb
@@ -20,9 +20,10 @@ Create a Topology in OVSDB node
     [Documentation]    Create topology in OVSDB and ready it for further tests
     [Tags]    Southbound
     Run Command On Remote System    ${MININET}    sudo ovs-vsctl del-manager
+    Run Command On Remote System    ${MININET}    sudo ovs-vsctl del-br br-int
     Run Command On Remote System    ${MININET}    sudo ovs-vsctl add-br ${BRIDGE}
     Run Command On Remote System    ${MININET}    sudo ovs-vsctl add-port ${BRIDGE} vx1 -- set Interface vx1 type=vxlan options:remote_ip=192.168.1.11
-    Run Command On Remote System    ${MININET}    sudo ovs-vsctl set-manager ptcp:6644
+    Run Command On Remote System    ${MININET}    sudo ovs-vsctl set-manager ptcp:6634
 
 Connect to OVSDB Node
     [Documentation]    Initiate the connection to OVSDB node from controller
@@ -35,12 +36,6 @@ 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
@@ -51,6 +46,18 @@ Get Config Topology without Bridge
     [Tags]    Southbound
     Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${CONFIG_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
+
+Get Operational Topology after deletion of integration bridge
+    [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes
+    [Tags]    Southbound
+    @{list}    Create List    br-int
+    Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
+
 Create bridge of already added bridge
     [Documentation]    This will add bridge to the config datastore
     [Tags]    Southbound
@@ -64,6 +71,12 @@ Create bridge of already added bridge
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
+Get Config Topology with Bridge
+    [Documentation]    This will fetch the configuration topology from configuration data store to verify the bridge is added to the data store
+    [Tags]    Southbound
+    @{list}    Create List    br-s1
+    Wait Until Keyword Succeeds    8s    2s    Check For Elements At URI    ${CONFIG_TOPO_API}    ${list}
+
 Create Port of already added port in OVSDB
     [Documentation]    This will add port/interface to the config datastore
     [Tags]    Southbound
@@ -75,7 +88,7 @@ Create Port of already added port in OVSDB
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
-Get Config Topology with Bridge
+Get Config Topology with Bridge and Port
     [Documentation]    This will fetch the configuration topology from configuration data store to verify the bridge is added to the data store
     [Tags]    Southbound
     Wait Until Keyword Succeeds    8s    2s    Check For Elements At URI    ${CONFIG_TOPO_API}    ${node_list}
@@ -91,6 +104,12 @@ Modify the destination IP of Port
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
+Get Operational Topology with modified Port
+    [Documentation]    This request will fetch the operational topology after the Port is added to the bridge
+    [Tags]    Southbound
+    @{list}    Create List    ${BRIDGE}    vx1    10.0.0.19
+    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
@@ -103,7 +122,7 @@ Create Port and attach to a Bridge
 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    vx1    10.0.0.19
+    @{list}    Create List    ${BRIDGE}    vxlanport
     Wait Until Keyword Succeeds    8s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
 Delete the Port1
@@ -112,16 +131,22 @@ Delete the Port1
     ${resp}    RequestsLibrary.Delete    session    ${SOUTHBOUND_CONFIG_API}%2Fbridge%2F${BRIDGE}/termination-point/vx1/
     Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
 
+Get Operational Topology after deletion of Port1
+    [Documentation]    This request will fetch the operational topology after the Port is added to the bridge
+    [Tags]    Southbound
+    @{list}    Create List    vx1
+    Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
+
 Delete the Port2
     [Documentation]    This request will delete the port node from the bridge node and data store.
     [Tags]    Southbound
     ${resp}    RequestsLibrary.Delete    session    ${SOUTHBOUND_CONFIG_API}%2Fbridge%2F${BRIDGE}/termination-point/vxlanport/
     Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
 
-Get Operational Topology after Deletion of Port
+Get Operational Topology after Deletion of Port2
     [Documentation]    This request will fetch the operational topology after the Port is deleted
     [Tags]    Southbound
-    @{list}    Create List    vxlanport    vx1
+    @{list}    Create List    vxlanport
     Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
 Delete the Bridge