Update RESTCONF statistics to remove namespace

Change-Id: I5fe3047da52740faf20905b0d56f2c19c2bb0703
Signed-off-by: Christopher O'Shea <christopher.o.shea@ericsson.com>

diff --git a/test/csit/suites/base-of13/010__MD_SAL_NSF/020__restconf_statistics.txt b/test/csit/suites/base-of13/010__MD_SAL_NSF/020__restconf_statistics.txt
index bb4ea2167a9b7989e434ffb8a2fbc3603a5d403a..17c33c0f9407678d1aac73dea1e54bd23057d403 100644 (file)
--- a/test/csit/suites/base-of13/010__MD_SAL_NSF/020__restconf_statistics.txt
+++ b/test/csit/suites/base-of13/010__MD_SAL_NSF/020__restconf_statistics.txt
@@ -15,19 +15,19 @@ Get Stats for node 1
     [Documentation]    Get the stats for a node
         ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:1
         Should Be Equal As Strings   ${resp.status_code}    200
-        Should Contain     ${resp.content}      opendaylight-port-statistics
-        Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+        Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+        Should Contain     ${resp.content}      flow-table-statistics
 
 Get Stats for node 2
     [Documentation]    Get the stats for a node
         ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:2
         Should Be Equal As Strings   ${resp.status_code}    200
-        Should Contain     ${resp.content}      opendaylight-port-statistics
-        Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+        Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+        Should Contain     ${resp.content}      flow-table-statistics
 
 Get Stats for node 3
     [Documentation]    Get the stats for a node
        ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:3
        Should Be Equal As Strings   ${resp.status_code}    200
-       Should Contain     ${resp.content}      opendaylight-port-statistics
-       Should Contain     ${resp.content}      opendaylight-flow-table-statistics    
+       Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+       Should Contain     ${resp.content}      flow-table-statistics    

diff --git a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt
index bb4ea2167a9b7989e434ffb8a2fbc3603a5d403a..17c33c0f9407678d1aac73dea1e54bd23057d403 100644 (file)
--- a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt
+++ b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt
@@ -15,19 +15,19 @@ Get Stats for node 1
     [Documentation]    Get the stats for a node
         ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:1
         Should Be Equal As Strings   ${resp.status_code}    200
-        Should Contain     ${resp.content}      opendaylight-port-statistics
-        Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+        Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+        Should Contain     ${resp.content}      flow-table-statistics
 
 Get Stats for node 2
     [Documentation]    Get the stats for a node
         ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:2
         Should Be Equal As Strings   ${resp.status_code}    200
-        Should Contain     ${resp.content}      opendaylight-port-statistics
-        Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+        Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+        Should Contain     ${resp.content}      flow-table-statistics
 
 Get Stats for node 3
     [Documentation]    Get the stats for a node
        ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:3
        Should Be Equal As Strings   ${resp.status_code}    200
-       Should Contain     ${resp.content}      opendaylight-port-statistics
-       Should Contain     ${resp.content}      opendaylight-flow-table-statistics    
+       Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+       Should Contain     ${resp.content}      flow-table-statistics    

diff --git a/test/csit/suites/base-of13/080__Inventory_Performance/010__restconf_inventory.txt b/test/csit/suites/base-of13/080__Inventory_Performance/010__restconf_inventory.txt
index 45b98ea65633d8080602dfc4ec18bcb4b097fc66..058b0302845f5f9ba3bf08916bcd03f41f18e34b 100644 (file)
--- a/test/csit/suites/base-of13/080__Inventory_Performance/010__restconf_inventory.txt
+++ b/test/csit/suites/base-of13/080__Inventory_Performance/010__restconf_inventory.txt
@@ -47,8 +47,8 @@ Get Stats for a node
     :FOR    ${IND}  IN RANGE    1   ${numnodes+1}
     \   ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:${IND}
     \   Should Be Equal As Strings   ${resp.status_code}    200
-    \   Should Contain     ${resp.content}      opendaylight-port-statistics
-    \   Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+    \   Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+    \   Should Contain     ${resp.content}      flow-table-statistics
 
 *** Keywords ***
 Check conn loop

diff --git a/test/csit/suites/karaf-all/010__MD_SAL_NSF/020__restconf_statistics.txt b/test/csit/suites/karaf-all/010__MD_SAL_NSF/020__restconf_statistics.txt
index bb4ea2167a9b7989e434ffb8a2fbc3603a5d403a..17c33c0f9407678d1aac73dea1e54bd23057d403 100644 (file)
--- a/test/csit/suites/karaf-all/010__MD_SAL_NSF/020__restconf_statistics.txt
+++ b/test/csit/suites/karaf-all/010__MD_SAL_NSF/020__restconf_statistics.txt
@@ -15,19 +15,19 @@ Get Stats for node 1
     [Documentation]    Get the stats for a node
         ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:1
         Should Be Equal As Strings   ${resp.status_code}    200
-        Should Contain     ${resp.content}      opendaylight-port-statistics
-        Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+        Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+        Should Contain     ${resp.content}      flow-table-statistics
 
 Get Stats for node 2
     [Documentation]    Get the stats for a node
         ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:2
         Should Be Equal As Strings   ${resp.status_code}    200
-        Should Contain     ${resp.content}      opendaylight-port-statistics
-        Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+        Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+        Should Contain     ${resp.content}      flow-table-statistics
 
 Get Stats for node 3
     [Documentation]    Get the stats for a node
        ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:3
        Should Be Equal As Strings   ${resp.status_code}    200
-       Should Contain     ${resp.content}      opendaylight-port-statistics
-       Should Contain     ${resp.content}      opendaylight-flow-table-statistics    
+       Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+       Should Contain     ${resp.content}      flow-table-statistics    

diff --git a/test/csit/suites/karaf-all/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt b/test/csit/suites/karaf-all/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt
index bb4ea2167a9b7989e434ffb8a2fbc3603a5d403a..63f2886efeaf5b5c318620bfaaf4b1315ad347cc 100644 (file)
--- a/test/csit/suites/karaf-all/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt
+++ b/test/csit/suites/karaf-all/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt
@@ -15,19 +15,19 @@ Get Stats for node 1
     [Documentation]    Get the stats for a node
         ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:1
         Should Be Equal As Strings   ${resp.status_code}    200
-        Should Contain     ${resp.content}      opendaylight-port-statistics
-        Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+        Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+        Should Contain     ${resp.content}      flow-table-statistics
 
 Get Stats for node 2
     [Documentation]    Get the stats for a node
         ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:2
         Should Be Equal As Strings   ${resp.status_code}    200
-        Should Contain     ${resp.content}      opendaylight-port-statistics
-        Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+        Should Contain     ${resp.content}      flow-capable-node-connector-statistics
+        Should Contain     ${resp.content}      flow-table-statistics
 
 Get Stats for node 3
     [Documentation]    Get the stats for a node
        ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:3
        Should Be Equal As Strings   ${resp.status_code}    200
-       Should Contain     ${resp.content}      opendaylight-port-statistics
-       Should Contain     ${resp.content}      opendaylight-flow-table-statistics    
+       Should Contain     ${resp.content}      flow-capable-node-connector-statistics  
+       Should Contain     ${resp.content}      flow-table-statistics    

diff --git a/test/csit/suites/karaf-all/080__Inventory_Performance/010__restconf_inventory.txt b/test/csit/suites/karaf-all/080__Inventory_Performance/010__restconf_inventory.txt
index 45b98ea65633d8080602dfc4ec18bcb4b097fc66..e2c038aa373bedcce0f6f5a1465ed50dab59e181 100644 (file)
--- a/test/csit/suites/karaf-all/080__Inventory_Performance/010__restconf_inventory.txt
+++ b/test/csit/suites/karaf-all/080__Inventory_Performance/010__restconf_inventory.txt
@@ -47,8 +47,8 @@ Get Stats for a node
     :FOR    ${IND}  IN RANGE    1   ${numnodes+1}
     \   ${resp}    Get    session    ${REST_CONTEXT}/node/openflow:${IND}
     \   Should Be Equal As Strings   ${resp.status_code}    200
-    \   Should Contain     ${resp.content}      opendaylight-port-statistics
-    \   Should Contain     ${resp.content}      opendaylight-flow-table-statistics
+    \   Should Contain     ${resp.content}      flow-capable-node-connector-statistics 
+    \   Should Contain     ${resp.content}      flow-table-statistics
 
 *** Keywords ***
 Check conn loop