X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Ftsdr%2FHBase%2F040_QueueMetrics.robot;h=bff172f01541e7eecc2fa65e6c650c2d3c0e157f;hb=885ab79b11b017e8e9039530afcb9ad8e214fb98;hp=5a14855ef4b338fc4218fa6e2cdc2cbeeb1c484c;hpb=59e81c38620fa1b61e15771191e35771450b9499;p=integration%2Ftest.git

diff --git a/csit/suites/tsdr/HBase/040_QueueMetrics.robot b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
index 5a14855ef4..bff172f015 100644
--- a/csit/suites/tsdr/HBase/040_QueueMetrics.robot
+++ b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
@@ -1,52 +1,62 @@
 *** Settings ***
-Documentation     Test suite for Hbase DataStore Queue Stats Verification
-Suite Setup       Run Keywords    Start Tsdr Suite    Configuration of Queue on Switch
-Suite Teardown    Stop Tsdr Suite
-Library           SSHLibrary
-Library           Collections
-Library           String
-Library           ../../../libraries/Common.py
-Resource          ../../../libraries/KarafKeywords.robot
-Resource          ../../../libraries/TsdrUtils.robot
-Variables         ../../../variables/Variables.py
+Documentation       Test suite for Hbase DataStore Queue Stats Verification
+
+Library             SSHLibrary
+Library             Collections
+Library             String
+Library             ../../../libraries/Common.py
+Resource            ../../../libraries/CompareStream.robot
+Resource            ../../../libraries/KarafKeywords.robot
+Resource            ../../../libraries/TsdrUtils.robot
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Run Keywords    Start Tsdr Suite    Configuration of Queue on Switch
+Suite Teardown      Stop Tsdr Suite
+
 
 *** Variables ***
 @{QUEUE_METRICS}    TransmittedPackets    TransmittedBytes    TransmissionErrors
-${TSDR_QUEUESTATS}    tsdr:list QueueStats
+
 
 *** Test Cases ***
+Init Variables
+    [Documentation]    Initialize ODL version specific variables using resource CompareStream.
+    Init Variables Master
+
 Verify the Queue Metrics attributes exist thru Karaf console
     [Documentation]    Verify the QueueMetrics attributes exist on Karaf Console
     Wait Until Keyword Succeeds    180s    1s    Verify the Metric is Collected?    ${TSDR_QUEUESTATS}    Transmitted
-    ${output}=    Issue Command On Karaf Console    ${TSDR_QUEUESTATS}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30
-    : FOR    ${list}    IN    @{QUEUE_METRICS}
-    \    Should Contain    ${output}    ${list}
+    ${output}=    Issue Command On Karaf Console    ${TSDR_QUEUESTATS}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    90
+    FOR    ${list}    IN    @{QUEUE_METRICS}
+        Should Contain    ${output}    ${list}
+    END
 
 Verification of QueueMetrics-TransmittedPackets on Karaf Console
     [Documentation]    Verify the QueueMetrics has been updated thru tsdr:list command on karaf console
     ${tsdr_cmd}=    Concatenate the String    ${TSDR_QUEUESTATS}    | grep TransmittedPackets | head
-    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    90
+    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    90
     Should Contain    ${output}    TransmittedPackets
 
 Verification of QueueMetrics-TransmittedPackets on HBase Client
     [Documentation]    Verify the QueueMetrics has been updated on HBase Datastore
-    ${query}=    Generate HBase Query    QueueMetrics    TransmittedPackets_openflow:1
-    ${out}=    Query the Data from HBaseClient    ${query}
-    Should Match Regexp    ${out}    (?mui)TransmittedPackets
+    Verify the Metrics Attributes on Hbase Client    TransmittedPackets    ${node_connector}    ${queuestats}
 
 Verification of QueueMetrics-TransmittedBytes on HBase Client
     [Documentation]    Verify the QueueMetrics has been updated on HBase Datastore
-    ${query}=    Generate HBase Query    QueueMetrics    TransmittedBytes_openflow:1
-    ${out}=    Query the Data from HBaseClient    ${query}
-    Should Match Regexp    ${out}    (?mui)TransmittedBytes
+    Verify the Metrics Attributes on Hbase Client    TransmittedBytes    ${node_connector}    ${queuestats}
 
 Verification of QueueMetrics-TransmissionErrors on HBase Client
     [Documentation]    Verify the QueueMetrics has been updated on HBase Datastore
-    ${query}=    Generate HBase Query    QueueMetrics    TransmissionErrors_openflow:1
-    ${out}=    Query the Data from HBaseClient    ${query}
-    Should Match Regexp    ${out}    (?mui)TransmissionErrors
+    Verify the Metrics Attributes on Hbase Client    TransmissionErrors    ${node_connector}    ${queuestats}
+
 
-*** Keyword ***
+*** Keywords ***
 Configuration of Queue on Switch
     [Documentation]    Queue configuration on openvswitch
     Configure the Queue on Switch    s2-eth2
+
+Init Variables Master
+    [Documentation]    Sets variables specific to latest(master) version
+    Set Suite Variable    ${TSDR_QUEUESTATS}    tsdr:list QUEUESTATS
+    set Suite Variable    ${node_connector}    Node:openflow:2
+    set suite Variable    ${queuestats}    QUEUESTATS