X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Ftsdr%2FHSQLDB%2F010_InterfaceMetrics.robot;h=2c21fa9c2bbe5b393f58407dea3c30b3768a2b08;hb=f9d5d70fb7a288fc901eab04519d5b5246c56be6;hp=63e5d8a25a99439a42e120ffdc181e4ac225f83e;hpb=afa2ef553baf75b44aced4efec653787bfd4a61e;p=integration%2Ftest.git

diff --git a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
index 63e5d8a25a..2c21fa9c2b 100644
--- a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
@@ -13,18 +13,20 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 @{INTERFACE_METRICS}    TransmittedPackets    TransmittedBytes    TransmitErrors    TransmitDrops    ReceivedPackets    ReceivedBytes    ReceiveOverRunError
 ...               ReceiveFrameError    ReceiveErrors    ReceiveDrops    ReceiveCrcError    CollisionCount
-@{CATEGORY}       FLOWGROUPSTATS    FLOWMETERSTATS    FLOWSTATS    FLOWTABLESTATS    PORTSTATS    QUEUESTATS
-${TSDR_PORTSTATS}    tsdr:list PORTSTATS
 
 *** 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 HSQLDB Feature Installation
     [Documentation]    Install and Verify the TSDR HSQLDB Datastore and JDBC
     COMMENT    Install a Feature    odl-tsdr-hsqldb    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    60
     COMMENT    Install a Feature    odl-tsdr-openflow-statistics-collector    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    60
-    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    log:display | grep "Connecting to HSQLDB"    HSQLDB
-    Verify Feature Is Installed    odl-tsdr-hsqldb
+    Verify Feature Is Installed    ${HSQLDB_INSTALL}
     Verify Feature Is Installed    odl-tsdr-core
-    Verify Feature Is Installed    odl-tsdr-openflow-statistics-collector
 
 Verification TSDR Command exists in Help
     [Documentation]    Verify the TSDR List command on Help
@@ -41,3 +43,16 @@ Verify PortStats On Karaf console
     \    ${tsdr_cmd}=    Concatenate the String    ${TSDR_PORTSTATS}    | grep ${list} | head
     \    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    30
     \    Should Contain    ${output}    ${list}
+
+*** 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    ${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    ${TSDR_PORTSTATS}    tsdr:list PortStats
+    Set Suite Variable    ${HSQLDB_INSTALL}    odl-tsdr-HSQLDB