Topology Mgr stability test 2

Change-Id: If5fd0427a4cd991005b71eea27d0a6c5769b722b
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>

diff --git a/test/csit/suites/base/005__switch_Manager.txt b/test/csit/suites/base/005__switch_Manager.txt
deleted file mode 100644 (file)
index 55fb8c7..0000000
--- a/test/csit/suites/base/005__switch_Manager.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-*** Settings ***
-Documentation     Test suite for the switch manager bundle.
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:8080    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           RequestsLibrary
-Library           ../../libraries/Common.py
-Library           ../../libraries/SwitchManager.py
-Variables         ../../variables/Variables.py
-Library           ../../libraries/Topology.py
-
-*** Variables ***
-${REST_CONTEXT}    /controller/nb/v2/switchmanager
-
-*** Test Cases ***
-List all nodes
-    [Documentation]    List all nodes and their properties in the network.
-    [Tags]    list_info
-    Log    ${TOPO_TREE_LEVEL}
-    ${topo_nodes}    Get Nodes From Topology    ${TOPO_TREE_LEVEL}
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
-    ${jsondata}=    To JSON    ${resp.content}
-    ${nodes}    Extract All Nodes    ${jsondata}
-    List Should Contain Sublist   ${nodes}    ${topo_nodes}
-Get a node
-    [Documentation]    Get a node
-    Get node    00:00:00:00:00:00:00:02    OF
-Add property to node
-    [Documentation]    Add a property to node
-    Add property to node    OF    00:00:00:00:00:00:00:02    description     Switch2
-    Node property should exist    OF    00:00:00:00:00:00:00:02    description    Switch2
-Remove property from node
-    [Documentation]    Remove a property from node
-    Remove property from node    OF    00:00:00:00:00:00:00:02    description
-    Node property should not exist    OF    00:00:00:00:00:00:00:02     description    Switch2
-Add property to nodeconnector
-    [Documentation]    Add a property to nodeconnector
-    Add property to nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    1000
-    Nodeconnector property should exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
-
-Remove property from nodeconnector
-    [Documentation]    Remove a property from nodeconnector
-    Remove property from nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth
-    Nodeconnector property should not exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
-
-*** Keywords ***
-Get node
-    [Arguments]    ${node_id}    ${node_type}
-    [Documentation]    Get a specific node
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
-    ${content}    Extract All Nodes    ${result}
-    Log    ${content}
-    List Should Contain Value    ${content}    ${node}
-
-Add property to node
-    [Arguments]    ${node_type}    ${node_id}    ${property}    ${value}
-    [Documentation]    Add property to node
-    ${resp}    Put    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}/${value}
-    Should Be Equal As Strings    ${resp.status_code}    201    Response status code error
-
-Remove property from node
-    [Arguments]    ${node_type}    ${node_id}    ${property}
-    [Documentation]    Remove property from node
-    ${resp}    Delete    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}
-    Should Be Equal As Strings    ${resp.status_code}    204    Response status code error
-
-Add property to nodeconnector
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}    ${value}
-    [Documentation]    Add property to nodeconnector
-    ${resp}    Put    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}/${value}
-    Should Be Equal As Strings    ${resp.status_code}    201    Response status code error
-
-Remove property from nodeconnector
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}
-    [Documentation]    Remove property from nodeconnector
-    ${resp}    Delete    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}
-    Should Be Equal As Strings    ${resp.status_code}    204    Response status code error
-
-Node property should exist
-    [Arguments]    ${node_type}    ${node_id}    ${property}    ${value}
-    [Documentation]    Property of node should exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${nodes}    Extract All Nodes    ${result}
-    ${property_values}    Extract Node Property Values    ${result}    ${property}
-    ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
-    ${property_value}    Create Dictionary    value    ${value}
-    Log    ${property_value}
-    List Should Contain Value    ${nodes}    ${node}
-    List Should Contain Value    ${property_values}    ${property_value}
-
-Node property should not exist
-    [Arguments]    ${node_type}    ${node_id}    ${property}    ${value}
-    [Documentation]    Property of node should not exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${nodes}    Extract All Nodes    ${result}
-    ${properties}    Extract Node Property Values    ${result}    ${property}
-    ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
-    ${property}    Create Dictionary    value    ${value}
-    Log    ${property}
-    List Should Contain Value    ${nodes}    ${node}
-    List Should Not Contain Value    ${properties}    ${property}
-
-Nodeconnector property should exist
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}    ${value}
-    [Documentation]    Property of nodeconnector should exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${property_values}    Extract Nodeconnector Property Values    ${result}    ${property}
-    Log    ${property_values}
-    ${property_value}    Create Dictionary    value    ${value}
-    List Should Contain Value    ${property_values}    ${property_value}
-
-Nodeconnector property should not exist
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}    ${value}
-    [Documentation]    Property of nodeconnector should not exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${property_values}    Extract Nodeconnector Property Values    ${result}    ${property}
-    Log    ${property_values}
-    ${property_value}    Create Dictionary    value    ${value}
-    List Should not Contain Value    ${property_values}    ${property_value}
-
-List all nodeconnectors of node
-    [Arguments]    ${node_type}    ${node_id}
-    [Documentation]    List all nodeconnectors and properties of node

diff --git a/test/csit/suites/base/015__topology_manager.txt b/test/csit/suites/base/015__topology_manager.txt
deleted file mode 100644 (file)
index e9ae23a..0000000
--- a/test/csit/suites/base/015__topology_manager.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-*** Settings ***
-Documentation     Test suite for Topology Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:8080   auth=${AUTH}   headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           ../../libraries/RequestsLibrary.py
-Library           ../../libraries/Common.py
-Variables         ../../variables/Variables.py
-
-*** Variables ***
-${nodeconn1}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:01"},"id":"1"}
-${nodeconn2}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:01"},"id":"2"}
-${nodeconn3}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:02"},"id":"3"}
-${nodeconn4}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:03"},"id":"3"}
-${name}           test_userlink1
-${key}            userLinks
-${REST_CONTEXT}    /controller/nb/v2/topology
-
-*** Test Cases ***
-Get Topology
-    [Documentation]    Get Topology and validate the result.
-    [Tags]    get
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
-    Log    ${resp.content}
-    Should Contain X Times  ${resp.content}   ${nodeconn1}   2
-    Should Contain X Times  ${resp.content}   ${nodeconn2}   2
-    Should Contain X Times  ${resp.content}   ${nodeconn3}   2
-    Should Contain X Times  ${resp.content}   ${nodeconn4}   2
-Add a userlink
-    [Documentation]    Add a userlink, list to validate the result.
-    [Tags]    add
-    ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
-    ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}    data=${body}
-    Should Be Equal As Strings    ${resp.status_code}    201    Response status code error
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Contain Value    ${content}    ${body}
-
-Remove a userlink
-    [Documentation]    Remove a userlink, list to validate the result.
-    [Tags]    remove
-    ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
-    ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}
-    Should Be Equal As Strings    ${resp.status_code}    204    Response status code error
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Not Contain Value    ${content}    ${body}

diff --git a/test/csit/suites/sp/005__switch_Manager.txt b/test/csit/suites/sp/005__switch_Manager.txt
deleted file mode 100644 (file)
index 55fb8c7..0000000
--- a/test/csit/suites/sp/005__switch_Manager.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-*** Settings ***
-Documentation     Test suite for the switch manager bundle.
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:8080    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           RequestsLibrary
-Library           ../../libraries/Common.py
-Library           ../../libraries/SwitchManager.py
-Variables         ../../variables/Variables.py
-Library           ../../libraries/Topology.py
-
-*** Variables ***
-${REST_CONTEXT}    /controller/nb/v2/switchmanager
-
-*** Test Cases ***
-List all nodes
-    [Documentation]    List all nodes and their properties in the network.
-    [Tags]    list_info
-    Log    ${TOPO_TREE_LEVEL}
-    ${topo_nodes}    Get Nodes From Topology    ${TOPO_TREE_LEVEL}
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
-    ${jsondata}=    To JSON    ${resp.content}
-    ${nodes}    Extract All Nodes    ${jsondata}
-    List Should Contain Sublist   ${nodes}    ${topo_nodes}
-Get a node
-    [Documentation]    Get a node
-    Get node    00:00:00:00:00:00:00:02    OF
-Add property to node
-    [Documentation]    Add a property to node
-    Add property to node    OF    00:00:00:00:00:00:00:02    description     Switch2
-    Node property should exist    OF    00:00:00:00:00:00:00:02    description    Switch2
-Remove property from node
-    [Documentation]    Remove a property from node
-    Remove property from node    OF    00:00:00:00:00:00:00:02    description
-    Node property should not exist    OF    00:00:00:00:00:00:00:02     description    Switch2
-Add property to nodeconnector
-    [Documentation]    Add a property to nodeconnector
-    Add property to nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    1000
-    Nodeconnector property should exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
-
-Remove property from nodeconnector
-    [Documentation]    Remove a property from nodeconnector
-    Remove property from nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth
-    Nodeconnector property should not exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
-
-*** Keywords ***
-Get node
-    [Arguments]    ${node_id}    ${node_type}
-    [Documentation]    Get a specific node
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
-    ${content}    Extract All Nodes    ${result}
-    Log    ${content}
-    List Should Contain Value    ${content}    ${node}
-
-Add property to node
-    [Arguments]    ${node_type}    ${node_id}    ${property}    ${value}
-    [Documentation]    Add property to node
-    ${resp}    Put    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}/${value}
-    Should Be Equal As Strings    ${resp.status_code}    201    Response status code error
-
-Remove property from node
-    [Arguments]    ${node_type}    ${node_id}    ${property}
-    [Documentation]    Remove property from node
-    ${resp}    Delete    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}
-    Should Be Equal As Strings    ${resp.status_code}    204    Response status code error
-
-Add property to nodeconnector
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}    ${value}
-    [Documentation]    Add property to nodeconnector
-    ${resp}    Put    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}/${value}
-    Should Be Equal As Strings    ${resp.status_code}    201    Response status code error
-
-Remove property from nodeconnector
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}
-    [Documentation]    Remove property from nodeconnector
-    ${resp}    Delete    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}
-    Should Be Equal As Strings    ${resp.status_code}    204    Response status code error
-
-Node property should exist
-    [Arguments]    ${node_type}    ${node_id}    ${property}    ${value}
-    [Documentation]    Property of node should exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${nodes}    Extract All Nodes    ${result}
-    ${property_values}    Extract Node Property Values    ${result}    ${property}
-    ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
-    ${property_value}    Create Dictionary    value    ${value}
-    Log    ${property_value}
-    List Should Contain Value    ${nodes}    ${node}
-    List Should Contain Value    ${property_values}    ${property_value}
-
-Node property should not exist
-    [Arguments]    ${node_type}    ${node_id}    ${property}    ${value}
-    [Documentation]    Property of node should not exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${nodes}    Extract All Nodes    ${result}
-    ${properties}    Extract Node Property Values    ${result}    ${property}
-    ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
-    ${property}    Create Dictionary    value    ${value}
-    Log    ${property}
-    List Should Contain Value    ${nodes}    ${node}
-    List Should Not Contain Value    ${properties}    ${property}
-
-Nodeconnector property should exist
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}    ${value}
-    [Documentation]    Property of nodeconnector should exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${property_values}    Extract Nodeconnector Property Values    ${result}    ${property}
-    Log    ${property_values}
-    ${property_value}    Create Dictionary    value    ${value}
-    List Should Contain Value    ${property_values}    ${property_value}
-
-Nodeconnector property should not exist
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}    ${value}
-    [Documentation]    Property of nodeconnector should not exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${property_values}    Extract Nodeconnector Property Values    ${result}    ${property}
-    Log    ${property_values}
-    ${property_value}    Create Dictionary    value    ${value}
-    List Should not Contain Value    ${property_values}    ${property_value}
-
-List all nodeconnectors of node
-    [Arguments]    ${node_type}    ${node_id}
-    [Documentation]    List all nodeconnectors and properties of node

diff --git a/test/csit/suites/sp/015__topology_manager.txt b/test/csit/suites/sp/015__topology_manager.txt
deleted file mode 100644 (file)
index e9ae23a..0000000
--- a/test/csit/suites/sp/015__topology_manager.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-*** Settings ***
-Documentation     Test suite for Topology Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:8080   auth=${AUTH}   headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           ../../libraries/RequestsLibrary.py
-Library           ../../libraries/Common.py
-Variables         ../../variables/Variables.py
-
-*** Variables ***
-${nodeconn1}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:01"},"id":"1"}
-${nodeconn2}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:01"},"id":"2"}
-${nodeconn3}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:02"},"id":"3"}
-${nodeconn4}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:03"},"id":"3"}
-${name}           test_userlink1
-${key}            userLinks
-${REST_CONTEXT}    /controller/nb/v2/topology
-
-*** Test Cases ***
-Get Topology
-    [Documentation]    Get Topology and validate the result.
-    [Tags]    get
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
-    Log    ${resp.content}
-    Should Contain X Times  ${resp.content}   ${nodeconn1}   2
-    Should Contain X Times  ${resp.content}   ${nodeconn2}   2
-    Should Contain X Times  ${resp.content}   ${nodeconn3}   2
-    Should Contain X Times  ${resp.content}   ${nodeconn4}   2
-Add a userlink
-    [Documentation]    Add a userlink, list to validate the result.
-    [Tags]    add
-    ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
-    ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}    data=${body}
-    Should Be Equal As Strings    ${resp.status_code}    201    Response status code error
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Contain Value    ${content}    ${body}
-
-Remove a userlink
-    [Documentation]    Remove a userlink, list to validate the result.
-    [Tags]    remove
-    ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
-    ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}
-    Should Be Equal As Strings    ${resp.status_code}    204    Response status code error
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Not Contain Value    ${content}    ${body}

diff --git a/test/csit/suites/vtn/005__switch_Manager.txt b/test/csit/suites/vtn/005__switch_Manager.txt
deleted file mode 100644 (file)
index 55fb8c7..0000000
--- a/test/csit/suites/vtn/005__switch_Manager.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-*** Settings ***
-Documentation     Test suite for the switch manager bundle.
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:8080    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           RequestsLibrary
-Library           ../../libraries/Common.py
-Library           ../../libraries/SwitchManager.py
-Variables         ../../variables/Variables.py
-Library           ../../libraries/Topology.py
-
-*** Variables ***
-${REST_CONTEXT}    /controller/nb/v2/switchmanager
-
-*** Test Cases ***
-List all nodes
-    [Documentation]    List all nodes and their properties in the network.
-    [Tags]    list_info
-    Log    ${TOPO_TREE_LEVEL}
-    ${topo_nodes}    Get Nodes From Topology    ${TOPO_TREE_LEVEL}
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
-    ${jsondata}=    To JSON    ${resp.content}
-    ${nodes}    Extract All Nodes    ${jsondata}
-    List Should Contain Sublist   ${nodes}    ${topo_nodes}
-Get a node
-    [Documentation]    Get a node
-    Get node    00:00:00:00:00:00:00:02    OF
-Add property to node
-    [Documentation]    Add a property to node
-    Add property to node    OF    00:00:00:00:00:00:00:02    description     Switch2
-    Node property should exist    OF    00:00:00:00:00:00:00:02    description    Switch2
-Remove property from node
-    [Documentation]    Remove a property from node
-    Remove property from node    OF    00:00:00:00:00:00:00:02    description
-    Node property should not exist    OF    00:00:00:00:00:00:00:02     description    Switch2
-Add property to nodeconnector
-    [Documentation]    Add a property to nodeconnector
-    Add property to nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    1000
-    Nodeconnector property should exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
-
-Remove property from nodeconnector
-    [Documentation]    Remove a property from nodeconnector
-    Remove property from nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth
-    Nodeconnector property should not exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
-
-*** Keywords ***
-Get node
-    [Arguments]    ${node_id}    ${node_type}
-    [Documentation]    Get a specific node
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
-    ${content}    Extract All Nodes    ${result}
-    Log    ${content}
-    List Should Contain Value    ${content}    ${node}
-
-Add property to node
-    [Arguments]    ${node_type}    ${node_id}    ${property}    ${value}
-    [Documentation]    Add property to node
-    ${resp}    Put    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}/${value}
-    Should Be Equal As Strings    ${resp.status_code}    201    Response status code error
-
-Remove property from node
-    [Arguments]    ${node_type}    ${node_id}    ${property}
-    [Documentation]    Remove property from node
-    ${resp}    Delete    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}/property/${property}
-    Should Be Equal As Strings    ${resp.status_code}    204    Response status code error
-
-Add property to nodeconnector
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}    ${value}
-    [Documentation]    Add property to nodeconnector
-    ${resp}    Put    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}/${value}
-    Should Be Equal As Strings    ${resp.status_code}    201    Response status code error
-
-Remove property from nodeconnector
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}
-    [Documentation]    Remove property from nodeconnector
-    ${resp}    Delete    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodeconnector/${node_type}/${node_id}/${nc_type}/${nc_id}/property/${property}
-    Should Be Equal As Strings    ${resp.status_code}    204    Response status code error
-
-Node property should exist
-    [Arguments]    ${node_type}    ${node_id}    ${property}    ${value}
-    [Documentation]    Property of node should exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${nodes}    Extract All Nodes    ${result}
-    ${property_values}    Extract Node Property Values    ${result}    ${property}
-    ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
-    ${property_value}    Create Dictionary    value    ${value}
-    Log    ${property_value}
-    List Should Contain Value    ${nodes}    ${node}
-    List Should Contain Value    ${property_values}    ${property_value}
-
-Node property should not exist
-    [Arguments]    ${node_type}    ${node_id}    ${property}    ${value}
-    [Documentation]    Property of node should not exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${nodes}    Extract All Nodes    ${result}
-    ${properties}    Extract Node Property Values    ${result}    ${property}
-    ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
-    ${property}    Create Dictionary    value    ${value}
-    Log    ${property}
-    List Should Contain Value    ${nodes}    ${node}
-    List Should Not Contain Value    ${properties}    ${property}
-
-Nodeconnector property should exist
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}    ${value}
-    [Documentation]    Property of nodeconnector should exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${property_values}    Extract Nodeconnector Property Values    ${result}    ${property}
-    Log    ${property_values}
-    ${property_value}    Create Dictionary    value    ${value}
-    List Should Contain Value    ${property_values}    ${property_value}
-
-Nodeconnector property should not exist
-    [Arguments]    ${node_type}    ${node_id}    ${nc_type}    ${nc_id}    ${property}    ${value}
-    [Documentation]    Property of nodeconnector should not exist
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/node/${node_type}/${node_id}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    TO JSON    ${resp.content}
-    Log    ${result}
-    ${property_values}    Extract Nodeconnector Property Values    ${result}    ${property}
-    Log    ${property_values}
-    ${property_value}    Create Dictionary    value    ${value}
-    List Should not Contain Value    ${property_values}    ${property_value}
-
-List all nodeconnectors of node
-    [Arguments]    ${node_type}    ${node_id}
-    [Documentation]    List all nodeconnectors and properties of node

diff --git a/test/csit/suites/vtn/015__topology_manager.txt b/test/csit/suites/vtn/015__topology_manager.txt
deleted file mode 100644 (file)
index e9ae23a..0000000
--- a/test/csit/suites/vtn/015__topology_manager.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-*** Settings ***
-Documentation     Test suite for Topology Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:8080   auth=${AUTH}   headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           ../../libraries/RequestsLibrary.py
-Library           ../../libraries/Common.py
-Variables         ../../variables/Variables.py
-
-*** Variables ***
-${nodeconn1}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:01"},"id":"1"}
-${nodeconn2}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:01"},"id":"2"}
-${nodeconn3}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:02"},"id":"3"}
-${nodeconn4}   NodeConnector":{"type":"OF","node":{"type":"OF","id":"00:00:00:00:00:00:00:03"},"id":"3"}
-${name}           test_userlink1
-${key}            userLinks
-${REST_CONTEXT}    /controller/nb/v2/topology
-
-*** Test Cases ***
-Get Topology
-    [Documentation]    Get Topology and validate the result.
-    [Tags]    get
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}
-    Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
-    Log    ${resp.content}
-    Should Contain X Times  ${resp.content}   ${nodeconn1}   2
-    Should Contain X Times  ${resp.content}   ${nodeconn2}   2
-    Should Contain X Times  ${resp.content}   ${nodeconn3}   2
-    Should Contain X Times  ${resp.content}   ${nodeconn4}   2
-Add a userlink
-    [Documentation]    Add a userlink, list to validate the result.
-    [Tags]    add
-    ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
-    ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}    data=${body}
-    Should Be Equal As Strings    ${resp.status_code}    201    Response status code error
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Contain Value    ${content}    ${body}
-
-Remove a userlink
-    [Documentation]    Remove a userlink, list to validate the result.
-    [Tags]    remove
-    ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
-    ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}
-    Should Be Equal As Strings    ${resp.status_code}    204    Response status code error
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
-    Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Not Contain Value    ${content}    ${body}