Convert suites from ODL_VERSION to CompareStream

[integration/test.git] / csit / suites / tsdr / HSQLDB / 010_InterfaceMetrics.robot

diff --git a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
index 2c21fa9c2bbe5b393f58407dea3c30b3768a2b08..7d2aad3342038bede37c199978f49d7ec260a411 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.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
@@ -18,8 +19,8 @@ Variables         ../../../variables/Variables.py
 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
+    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
+    Init Variables Master
 
 Verification of TSDR HSQLDB Feature Installation
     [Documentation]    Install and Verify the TSDR HSQLDB Datastore and JDBC
@@ -47,12 +48,13 @@ Verify PortStats On Karaf console
 *** Keywords ***
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
-    Set Suite Variable    @{CATEGORY}       FLOWGROUPSTATS    FLOWMETERSTATS    FLOWSTATS    FLOWTABLESTATS    PORTSTATS    QUEUESTATS
+    Set Suite Variable    @{CATEGORY}    FLOWGROUPSTATS    FLOWMETERSTATS    FLOWSTATS    FLOWTABLESTATS    PORTSTATS
+    ...    QUEUESTATS
     Set Suite Variable    ${TSDR_PORTSTATS}    tsdr:list PORTSTATS
     Set Suite Variable    ${HSQLDB_INSTALL}    odl-tsdr-hsqldb
 
 Init Variables Lithium
     [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    @{CATEGORY}       FlowStats    FlowTableStats    PortStats    QueueStats
+    Set Suite Variable    @{CATEGORY}    FlowStats    FlowTableStats    PortStats    QueueStats
     Set Suite Variable    ${TSDR_PORTSTATS}    tsdr:list PortStats
     Set Suite Variable    ${HSQLDB_INSTALL}    odl-tsdr-HSQLDB