X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Ftsdr%2FHBase%2F030_FlowTableMetrics.robot;h=8781d0f5c52340b5f8bfaee2b1a38106e7d8e9eb;hb=64fa60b9810a6884acb1712e1f7533577cbc0d64;hp=6d17b712905a1f197b8a408c15ddabd53be492b9;hpb=5fafb689f48239f8e0c61fd61c88d8a3627158ee;p=integration%2Ftest.git

diff --git a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
index 6d17b71290..8781d0f5c5 100644
--- a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
@@ -14,11 +14,17 @@ Variables         ../../../variables/Variables.py
 ${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
+
 Verification of TSDR FlowTableMetrics
     [Documentation]    Verify the TSDR FlowTableMetrics
-    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_FLOWTABLE_STATS}    MN
+    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_FLOWTABLE_STATS}    openflow
     ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWTABLE_STATS}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    30
-    Should Contain    ${output}    MN
+    Should Contain    ${output}    openflow
 
 Verification of FlowTableMetrics on Karaf Console
     [Documentation]    Verify the FlowTableMetrics has been updated thru tsdr:list command on karaf console
@@ -28,14 +34,25 @@ Verification of FlowTableMetrics on Karaf Console
 
 Verification of FlowTableMetrics-ActiveFlows on HBase Client
     [Documentation]    Verify the FlowTableMetrics has been updated on HBase Datastore
-    Verify the Metrics Attributes on Hbase Client    ActiveFlows    Node:openflow:1,Table:0    FLOWTABLESTATS
+    Verify the Metrics Attributes on Hbase Client    ActiveFlows    ${node_connector}    ${flowtablestats}
 
 Verification of FlowTableMetrics-PacketMatch on HBase Client
     [Documentation]    Verify the FlowTableMetrics has been updated on HBase Datastore
-    Verify the Metrics Attributes on Hbase Client    PacketMatch    Node:openflow:1,Table:0    FLOWTABLESTATS
-
+    Verify the Metrics Attributes on Hbase Client    PacketMatch    ${node_connector}    ${flowtablestats}
 
 Verification of FlowTableMetrics-PacketLookup on HBase Client
     [Documentation]    Verify the FlowTableMetrics has been updated on HBase Datastore
-    Verify the Metrics Attributes on Hbase Client    PacketLookup    Node:openflow:1,Table:0    FLOWTABLESTATS
-
+    Verify the Metrics Attributes on Hbase Client    PacketLookup    ${node_connector}    ${flowtablestats}
+
+*** Keywords ***
+Init Variables Master
+    [Documentation]    Sets variables specific to latest(master) version
+    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