Convert suites from ODL_VERSION to CompareStream

[integration/test.git] / csit / suites / tsdr / HBase / 020_FlowMetrics.robot

diff --git a/csit/suites/tsdr/HBase/020_FlowMetrics.robot b/csit/suites/tsdr/HBase/020_FlowMetrics.robot
index 5cd30daff12c20c428184236870d30374c4c11e5..30b03b61b84007cca8cced3d07948da5721e843e 100644 (file)
--- a/csit/suites/tsdr/HBase/020_FlowMetrics.robot
+++ b/csit/suites/tsdr/HBase/020_FlowMetrics.robot
@@ -6,6 +6,7 @@ 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
@@ -14,12 +15,10 @@ Variables         ../../../variables/Variables.py
 @{FLOW_METRICS}    PacketCount    ByteCount
 
 *** 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.
+    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
+    Init Variables Master
 
 Verification of TSDR FlowMetrics
     [Documentation]    Verify the TSDR FlowStats
@@ -35,6 +34,7 @@ Verification of FlowMetrics-PacketCount on HBase Client
     ${Line1}=    Get Line    ${output}    0
     Should Contain    ${Line1}    PacketCount
     Verify the Metrics Attributes on Hbase Client    PacketCount    ${node_connector}    ${flowstats}
+
 Verification of FlowMetrics-BytesCount on HBase Client
     [Documentation]    Verify the FlowStats-ByteCount on both Karaf Console and Hbase Client
     ${tsdr_cmd}=    Concatenate the String    ${TSDR_FLOWSTATS}    | grep ByteCount | head
@@ -44,7 +44,6 @@ Verification of FlowMetrics-BytesCount on HBase Client
     Verify the Metrics Attributes on Hbase Client    ByteCount    ${node_connector}    ${flowstats}
 
 *** Keywords ***
-
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FLOWSTATS
@@ -56,4 +55,3 @@ Init Variables Lithium
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FlowStats
     set Suite Variable    ${node_connector}    openflow:1_0
     set suite Variable    ${flowstats}    FlowMetrics
-