From: Luis Gomez Date: Thu, 11 Sep 2014 05:53:43 +0000 (+0000) Subject: Merge "Update RESTCONF statistics to remove namespace" X-Git-Tag: release/helium~39 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ab572743974277f66a136d4900b506414a10c9ac;hp=fcc6c675915bbad251e428c7063c8b23d61f7f03;p=integration.git Merge "Update RESTCONF statistics to remove namespace" --- 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 bb4ea216..17c33c0f 100644 --- 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 bb4ea216..17c33c0f 100644 --- 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 45b98ea6..058b0302 100644 --- 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 bb4ea216..17c33c0f 100644 --- 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 bb4ea216..63f2886e 100644 --- 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 45b98ea6..e2c038aa 100644 --- 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