Upgrade RF syntax for v3.2 compatibility

[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..a53a4d1dc966b3209febc2e25a13f52007f23299 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
@@ -17,9 +18,7 @@ Variables         ../../../variables/Variables.py
 *** 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
+    Init Variables Master
 
 Verification of TSDR HSQLDB Feature Installation
     [Documentation]    Install and Verify the TSDR HSQLDB Datastore and JDBC
@@ -33,26 +32,23 @@ Verification TSDR Command exists in Help
     ${output}=    Issue Command On Karaf Console    tsdr\t
     Should Contain    ${output}    tsdr:list
     ${output}=    Issue Command On Karaf Console    tsdr:list\t\t
-    : FOR    ${list}    IN    @{CATEGORY}
-    \    Should Contain    ${output}    ${list}
+    FOR    ${list}    IN    @{CATEGORY}
+        Should Contain    ${output}    ${list}
+    END
     Wait Until Keyword Succeeds    60s    1s    Verify the Metric is Collected?    ${TSDR_PORTSTATS}    openflow
 
 Verify PortStats On Karaf console
     [Documentation]    Verify the InterfaceMetrics(PortStats),attributes using ${TSDR_PORTSTATS}
-    : FOR    ${list}    IN    @{INTERFACE_METRICS}
-    \    ${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}
+    FOR    ${list}    IN    @{INTERFACE_METRICS}
+        ${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}
+    END
 
 *** 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    ${TSDR_PORTSTATS}    tsdr:list PortStats
-    Set Suite Variable    ${HSQLDB_INSTALL}    odl-tsdr-HSQLDB