Upgrade RF syntax for v3.2 compatibility

[integration/test.git] / csit / suites / tsdr / HBase / 040_QueueMetrics.robot

diff --git a/csit/suites/tsdr/HBase/040_QueueMetrics.robot b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
index 99ac01901f57aa8f4a13c9408f86d9c4e34f65db..d95f09f62e7ef85dfc6f3f2761319ad33347abfc 100644 (file)
--- a/csit/suites/tsdr/HBase/040_QueueMetrics.robot
+++ b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
@@ -17,15 +17,15 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Init Variables
     [Documentation]    Initialize ODL version specific variables using resource CompareStream.
-    CompareStream.Run_Keyword_If_Less_Than_Beryllium    Init Variables Lithium
     Init Variables Master
 
 Verify the Queue Metrics attributes exist thru Karaf console
     [Documentation]    Verify the QueueMetrics attributes exist on Karaf Console
     Wait Until Keyword Succeeds    180s    1s    Verify the Metric is Collected?    ${TSDR_QUEUESTATS}    Transmitted
     ${output}=    Issue Command On Karaf Console    ${TSDR_QUEUESTATS}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    90
-    : FOR    ${list}    IN    @{QUEUE_METRICS}
-    \    Should Contain    ${output}    ${list}
+    FOR    ${list}    IN    @{QUEUE_METRICS}
+        Should Contain    ${output}    ${list}
+    END
 
 Verification of QueueMetrics-TransmittedPackets on Karaf Console
     [Documentation]    Verify the QueueMetrics has been updated thru tsdr:list command on karaf console
@@ -55,9 +55,3 @@ Init Variables Master
     Set Suite Variable    ${TSDR_QUEUESTATS}    tsdr:list QUEUESTATS
     set Suite Variable    ${node_connector}    Node:openflow:2
     set suite Variable    ${queuestats}    QUEUESTATS
-
-Init Variables Lithium
-    [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${TSDR_QUEUESTATS}    tsdr:list QueueStats
-    set Suite Variable    ${node_connector}    openflow:2
-    set suite Variable    ${queuestats}    QueueMetrics