Done the following changes :

[integration/test.git] / csit / suites / tsdr / HBase / 030_FlowTableMetrics.robot

diff --git a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
index b6e930756a11dca49631770f4c76e997cbb928c0..6d17b712905a1f197b8a408c15ddabd53be492b9 100644 (file)
--- a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
@@ -11,35 +11,31 @@ Resource          ../../../libraries/TsdrUtils.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${TSDR_FLOWTABLE_STATS}    tsdr:list FlowTableStats
+${TSDR_FLOWTABLE_STATS}    tsdr:list FLOWTABLESTATS
 
 *** Test Cases ***
 Verification of TSDR FlowTableMetrics
     [Documentation]    Verify the TSDR FlowTableMetrics
-    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_FLOWTABLE_STATS}    MetricName
-    ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWTABLE_STATS}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30
-    Should Contain    ${output}    MetricName
+    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_FLOWTABLE_STATS}    MN
+    ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWTABLE_STATS}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    30
+    Should Contain    ${output}    MN
 
 Verification of FlowTableMetrics on Karaf Console
     [Documentation]    Verify the FlowTableMetrics has been updated thru tsdr:list command on karaf console
     ${tsdr_cmd}=    Concatenate the String    ${TSDR_FLOWTABLE_STATS}    | grep ActiveFlows | head
-    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    90
+    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    90
     Should Contain    ${output}    ActiveFlows
 
 Verification of FlowTableMetrics-ActiveFlows on HBase Client
     [Documentation]    Verify the FlowTableMetrics has been updated on HBase Datastore
-    ${query}=    Generate HBase Query    FlowTableMetrics    ActiveFlows_openflow:1_0
-    ${out}=    Query the Data from HBaseClient    ${query}
-    Should Match Regexp    ${out}    (?mui)ActiveFlows_openflow
+    Verify the Metrics Attributes on Hbase Client    ActiveFlows    Node:openflow:1,Table:0    FLOWTABLESTATS
 
 Verification of FlowTableMetrics-PacketMatch on HBase Client
     [Documentation]    Verify the FlowTableMetrics has been updated on HBase Datastore
-    ${query}=    Generate HBase Query    FlowTableMetrics    PacketMatch_openflow:1_0_
-    ${out}=    Query the Data from HBaseClient    ${query}
-    Should Match Regexp    ${out}    (?mui)PacketMatch_openflow
+    Verify the Metrics Attributes on Hbase Client    PacketMatch    Node:openflow:1,Table:0    FLOWTABLESTATS
+
 
 Verification of FlowTableMetrics-PacketLookup on HBase Client
     [Documentation]    Verify the FlowTableMetrics has been updated on HBase Datastore
-    ${query}=    Generate HBase Query    FlowTableMetrics    PacketLookup_openflow:1_0_
-    ${out}=    Query the Data from HBaseClient    ${query}
-    Should Match Regexp    ${out}    (?mui)PacketLookup_openfl
+    Verify the Metrics Attributes on Hbase Client    PacketLookup    Node:openflow:1,Table:0    FLOWTABLESTATS
+