Fix python3 cluster suites

[integration/test.git] / csit / suites / tsdr / HBase / 030_FlowTableMetrics.robot

diff --git a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
index 8781d0f5c52340b5f8bfaee2b1a38106e7d8e9eb..5a2922fd307055a9a0015c64ca21be8696715e26 100644 (file)
--- a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/HBase/030_FlowTableMetrics.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
@@ -15,10 +16,8 @@ ${TSDR_FLOWTABLE_STATS}    tsdr:list FLOWTABLESTATS
 
 *** 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
 
 Verification of TSDR FlowTableMetrics
     [Documentation]    Verify the TSDR FlowTableMetrics
@@ -50,9 +49,3 @@ Init Variables Master
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FLOWTABLESTATS
     set Suite Variable    ${node_connector}    Node:openflow:1,Table:0
     set suite Variable    ${flowtablestats}    FLOWTABLESTATS
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FlowTableStats
-    set Suite Variable    ${node_connector}    openflow:1_0
-    set suite Variable    ${flowtablestats}    FlowTableMetrics