Improved Sw mgr test for OF13 - 2nd try

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

diff --git a/test/csit/suites/base-of13/025__switch_Manager.txt b/test/csit/suites/base-of13/015__switch_Manager.txt
similarity index 83%
rename from test/csit/suites/base-of13/025__switch_Manager.txt
rename to test/csit/suites/base-of13/015__switch_Manager.txt
index 1462861ac408fac62ef7dee03c36890fa80c4e40..07133b922487f0b1570564438a1bf1a9d168e832 100644 (file)
--- a/test/csit/suites/base-of13/025__switch_Manager.txt
+++ b/test/csit/suites/base-of13/015__switch_Manager.txt
@@ -13,6 +13,7 @@ Library           ../../libraries/Topologynew.py
 ${REST_CONTEXT}    /controller/nb/v2/switchmanager
 
 *** Test Cases ***
+
 List all nodes
     [Documentation]    List all nodes and their properties in the network.
     [Tags]    list_info
@@ -23,9 +24,29 @@ List all nodes
     ${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    openflow:2    MD_SAL
+Check node 1 connectors 
+    [Documentation]    List node connectors and verify all connectors are there
+    [Tags]    list_info
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:1
+    Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
+    Should Contain     ${resp.content}    openflow:1:1
+    Should Contain     ${resp.content}    openflow:1:2
+Check node 2 connectors               
+    [Documentation]    List node connectors and verify all connectors are there                      
+    [Tags]    list_info
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:2
+    Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
+    Should Contain     ${resp.content}    openflow:2:1              
+    Should Contain     ${resp.content}    openflow:2:2  
+    Should Contain     ${resp.content}    openflow:2:3
+Check node 3 connectors               
+    [Documentation]    List node connectors and verify all connectors are there                      
+    [Tags]    list_info
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:3
+    Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
+    Should Contain     ${resp.content}    openflow:3:1              
+    Should Contain     ${resp.content}    openflow:3:2  
+    Should Contain     ${resp.content}    openflow:3:3
 Add property to node
     [Documentation]    Add a property to node
     Add property to node    MD_SAL    openflow:2    description     Switch2

diff --git a/test/csit/suites/base-of13/015__topology_manager.txt b/test/csit/suites/base-of13/025__topology_manager.txt
similarity index 100%
rename from test/csit/suites/base-of13/015__topology_manager.txt
rename to test/csit/suites/base-of13/025__topology_manager.txt

diff --git a/test/csit/suites/base-of13/125__switch_Manager.txt b/test/csit/suites/base-of13/115__switch_Manager.txt
similarity index 83%
rename from test/csit/suites/base-of13/125__switch_Manager.txt
rename to test/csit/suites/base-of13/115__switch_Manager.txt
index 1462861ac408fac62ef7dee03c36890fa80c4e40..07133b922487f0b1570564438a1bf1a9d168e832 100644 (file)
--- a/test/csit/suites/base-of13/125__switch_Manager.txt
+++ b/test/csit/suites/base-of13/115__switch_Manager.txt
@@ -13,6 +13,7 @@ Library           ../../libraries/Topologynew.py
 ${REST_CONTEXT}    /controller/nb/v2/switchmanager
 
 *** Test Cases ***
+
 List all nodes
     [Documentation]    List all nodes and their properties in the network.
     [Tags]    list_info
@@ -23,9 +24,29 @@ List all nodes
     ${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    openflow:2    MD_SAL
+Check node 1 connectors 
+    [Documentation]    List node connectors and verify all connectors are there
+    [Tags]    list_info
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:1
+    Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
+    Should Contain     ${resp.content}    openflow:1:1
+    Should Contain     ${resp.content}    openflow:1:2
+Check node 2 connectors               
+    [Documentation]    List node connectors and verify all connectors are there                      
+    [Tags]    list_info
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:2
+    Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
+    Should Contain     ${resp.content}    openflow:2:1              
+    Should Contain     ${resp.content}    openflow:2:2  
+    Should Contain     ${resp.content}    openflow:2:3
+Check node 3 connectors               
+    [Documentation]    List node connectors and verify all connectors are there                      
+    [Tags]    list_info
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:3
+    Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
+    Should Contain     ${resp.content}    openflow:3:1              
+    Should Contain     ${resp.content}    openflow:3:2  
+    Should Contain     ${resp.content}    openflow:3:3
 Add property to node
     [Documentation]    Add a property to node
     Add property to node    MD_SAL    openflow:2    description     Switch2

diff --git a/test/csit/suites/base-of13/115__topology_manager.txt b/test/csit/suites/base-of13/125__topology_manager.txt
similarity index 100%
rename from test/csit/suites/base-of13/115__topology_manager.txt
rename to test/csit/suites/base-of13/125__topology_manager.txt