X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Ftsdr%2FH2%2F030_FlowTableMetrics.robot;h=7924c1778c05c0c8523c9274faeea59d3f4ca08d;hb=6d45e41ed14c1a1480f016c27c3bdf580b3a0ede;hp=bfe718458b43db926e73b36e4fd4fac2bf17e120;hpb=59e81c38620fa1b61e15771191e35771450b9499;p=integration%2Ftest.git

diff --git a/csit/suites/tsdr/H2/030_FlowTableMetrics.robot b/csit/suites/tsdr/H2/030_FlowTableMetrics.robot
index bfe718458b..7924c1778c 100644
--- a/csit/suites/tsdr/H2/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/H2/030_FlowTableMetrics.robot
@@ -1,29 +1,44 @@
 *** Settings ***
-Documentation     Test suite for H2 DataStore Flow Table Metrics Verification
-Suite Setup       Start Tsdr Suite
-Suite Teardown    Stop Tsdr Suite
-Library           SSHLibrary
-Library           Collections
-Library           String
-Library           ../../../libraries/Common.py
-Resource          ../../../libraries/KarafKeywords.robot
-Resource          ../../../libraries/TsdrUtils.robot
-Variables         ../../../variables/Variables.py
+Documentation       Test suite for H2 DataStore Flow Table Metrics Verification
+
+Library             SSHLibrary
+Library             Collections
+Library             String
+Library             ../../../libraries/Common.py
+Resource            ../../../libraries/KarafKeywords.robot
+Resource            ../../../libraries/TsdrUtils.robot
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Start Tsdr Suite
+Suite Teardown      Stop Tsdr Suite
+
 
 *** Variables ***
-@{FLOWTABLE_METRICS}    ActiveFlows    PacketLookup    PacketMatch
-${TSDR_FLOWTABLE_STATS}    tsdr:list FlowTableStats
+@{FLOWTABLE_METRICS}        ActiveFlows    PacketLookup    PacketMatch
+${TSDR_FLOWTABLE_STATS}     tsdr:list FlowTableStats
+
 
 *** Test Cases ***
 Verification of TSDR FlowTableStats
     [Documentation]    Verify the TSDR FlowiTableStats
-    Wait Until Keyword Succeeds    60s    1s    Verify the Metric is Collected?    ${TSDR_FLOWTABLE_STATS}| grep ActiveFlow    FLOWTABLESTATS
-    ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWTABLE_STATS}| grep openflow:1 | head    ${CONTROLLER}    ${KARAF_SHELL_PORT}    180
-    : FOR    ${list}    IN    @{FLOWTABLE_METRICS}
-    \    Should Contain    ${output}    ${list}
+    Wait Until Keyword Succeeds
+    ...    60s
+    ...    1s
+    ...    Verify the Metric is Collected?
+    ...    ${TSDR_FLOWTABLE_STATS}| grep ActiveFlow
+    ...    FLOWTABLESTATS
+    ${output}=    Issue Command On Karaf Console
+    ...    ${TSDR_FLOWTABLE_STATS}| grep openflow:1 | head
+    ...    ${ODL_SYSTEM_IP}
+    ...    ${KARAF_SHELL_PORT}
+    ...    180
+    FOR    ${list}    IN    @{FLOWTABLE_METRICS}
+        Should Contain    ${output}    ${list}
+    END
 
 Verify FlowTableStats-Attributes on H2 Datastore using JDBC Client
     [Documentation]    Verify the PortStats,attributes on H2 Datastore using JDBC Client
-    : FOR    ${list}    IN    @{FLOWTABLE_METRICS}
-    \    ${output}=    Query Metrics on H2 Datastore    FLOWTABLESTATS    ${list}
-    \    Should Contain    ${output}    ${list}
+    FOR    ${list}    IN    @{FLOWTABLE_METRICS}
+        ${output}=    Query Metrics on H2 Datastore    FLOWTABLESTATS    ${list}
+        Should Contain    ${output}    ${list}
+    END