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=219c322566492f1a2cf930983dceca3297bceb1f;hpb=f9d5d70fb7a288fc901eab04519d5b5246c56be6;p=integration%2Ftest.git

diff --git a/csit/suites/tsdr/HBase/040_QueueMetrics.robot b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
index 219c322566..bff172f015 100644
--- a/csit/suites/tsdr/HBase/040_QueueMetrics.robot
+++ b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
@@ -1,32 +1,35 @@
 *** 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
 
-*** Test Cases ***
 
+*** Test Cases ***
 Init Variables
-    [Documentation]    Initialize ODL version specific variables
-    log    ${ODL_VERSION}
-    Run Keyword If    '${ODL_VERSION}' == 'stable-lithium'    Init Variables Lithium
-    ...    ELSE    Init Variables Master
+    [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}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    90
-    : FOR    ${list}    IN    @{QUEUE_METRICS}
-    \    Should Contain    ${output}    ${list}
+    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
@@ -46,22 +49,14 @@ Verification of QueueMetrics-TransmissionErrors on HBase Client
     [Documentation]    Verify the QueueMetrics has been updated on HBase Datastore
     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
 
-*** Keywords ***
-
 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
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${TSDR_QUEUESTATS}    tsdr:list QueueStats
-    set Suite Variable    ${node_connector}    openflow:2
-    set suite Variable    ${queuestats}    QueueMetrics
-