From 9caf525e09ac06417cce66e906deaffe262baadd Mon Sep 17 00:00:00 2001 From: Chaudhry Muhammad Usama Date: Tue, 23 Jun 2015 10:48:39 -0700 Subject: [PATCH] Cleaning the ovsdb node completely for other test Change-Id: I5dacf7c50bc048e58417fa60b0a9e4cb447cbf9c Signed-off-by: Chaudhry Muhammad Usama (cherry picked from commit 80149c003fcb84843a077466a7c01478cfbb60a2) --- .../010__configure_1_ovsdb_node.robot | 25 +++++++++++++++++++ .../020__connection_manager.robot | 3 +-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/test/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot b/test/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot index 05cbe137..0eb81ad5 100644 --- a/test/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot +++ b/test/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot @@ -148,6 +148,31 @@ Get Config Topology after reconnect Should Be Equal As Strings ${resp.status_code} 200 Response status code error Should Contain ${resp.content} br-int +Create integration Bridge + [Documentation] This will create bridge on the specified OVSDB node. + [Tags] Southbound + ${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 br-int + ${body} Replace String ${sample3} 61644 ${OVSDB_PORT} + Log URL is ${SOUTHBOUND_CONFIG_API}%2Fbridge%2F${BRIDGE} + ${resp} RequestsLibrary.Put session ${SOUTHBOUND_CONFIG_API}%2Fbridge%2Fbr-int data=${body} + 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 after Deletion of integration Bridge + [Documentation] This request will fetch the operational topology after the Bridge is deleted + [Tags] Southbound + @{list} Create List br-int + Wait Until Keyword Succeeds 8s 2s Check For Elements Not At URI ${OPERATIONAL_TOPO_API} ${list} + Again Delete the OVSDB Node [Documentation] This request will delete the OVSDB node [Tags] Southbound diff --git a/test/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot b/test/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot index 8faca3ff..31f7365a 100644 --- a/test/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot +++ b/test/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot @@ -10,7 +10,7 @@ Resource ../../../libraries/Utils.txt *** Variables *** ${OVSDB_PORT} 6634 -${SOUTHBOUND_CONFIG_API} ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2F${MININET}:6634 +${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} br-int @@ -18,7 +18,6 @@ ${OVSDB_CONFIG_DIR} ${CURDIR}/../../../variables/ovsdb Connecting an OVS instance to the controller [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 set-manager tcp:${CONTROLLER}:6640 Get Operational Topology to verify the ovs instance is connected to the controller -- 2.36.6