X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Ftsdr%2FCassandra%2F040_QueueMetrics.robot;h=4b9d2b9e6456078a3f81169917cca27fb0b7a542;hb=94651ca9711d8eb316721775561e815830bc6c7e;hp=2adaa5719227c27b87d22198f2f171218c9fa11e;hpb=649de519a7f6d7f5e4138f9e24d441305ac64b07;p=integration%2Ftest.git

diff --git a/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot b/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot
index 2adaa57192..4b9d2b9e64 100644
--- a/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot
+++ b/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Cassandra DataStore Queue Stats Verification
-Suite Setup           Initialize Cassandra Tables Metricval
+Suite Setup       Initialize Cassandra Tables Metricval
 Suite Teardown    Stop Tsdr Suite
 Library           SSHLibrary
 Library           Collections
@@ -13,7 +13,7 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 @{QUEUE_METRICS}    TransmittedPackets    TransmittedBytes    TransmissionErrors
 ${TSDR_QUEUESTATS}    tsdr:list QueueStats
-${QUERY_HEAD}    ${OPERATIONAL_NODES_API}/node
+${QUERY_HEAD}     ${OPERATIONAL_NODES_API}/node
 ${query_head1}    ${QUERY_HEAD}/openflow:2/node-connector/openflow:2:2/queue/
 @{tsdr_q0}
 @{tsdr_q2}
@@ -26,50 +26,41 @@ ${transmittederrors}    flow-capable-node-connector-queue-statistics/transmissio
 @{openflow_q1}
 
 *** Test Cases ***
-
 Verification of TSDR Cassandra Feature Installation
     [Documentation]    Install and Verify the TSDR Cassandra Features
-    COMMENT    Install a Feature    odl-tsdr-cassandra-all    ${CONTROLLER}    ${KARAF_SHELL_PORT}    60
+    COMMENT    Install a Feature    odl-tsdr-cassandra-all    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    60
     Verify Feature Is Installed    odl-tsdr-cassandra
     COMMENT    Verify Feature Is Installed    odl-tsdr-cassandra-persistence
     Verify Feature Is Installed    odl-tsdr-openflow-statistics-collector
     Start Tsdr Suite
     Configuration of Queue on Switch
     Ping All Hosts
-    Wait Until Keyword Succeeds    5x    30 sec    Check Metric val     \\d{5}
+    Wait Until Keyword Succeeds    5x    30 sec    Check Metric val    \\d{5}
 
 Getting all Tables from Openflow Plugin
     [Documentation]    Getting Queue Stats from openflow plugin
-    ${ret}=    Get Stats XML    ${query_head1}0/   ${transmittederrors}
+    ${ret}=    Get Stats XML    ${query_head1}0/    ${transmittederrors}
     Append To List    ${openflow_q0}    ${ret}
     ${ret}=    Get Stats XML    ${query_head1}0/    ${transmittedpackets}
     Append To List    ${openflow_q0}    ${ret}
     ${ret}=    Get Stats XML    ${query_head1}0/    ${transmittedbytes}
     Append To List    ${openflow_q0}    ${ret}
-
     Set Suite Variable    @{openflow_q0}
-
-
-    ${ret}=    Get Stats XML    ${query_head1}1/   ${transmittederrors}
+    ${ret}=    Get Stats XML    ${query_head1}1/    ${transmittederrors}
     Append To List    ${openflow_q1}    ${ret}
     ${ret}=    Get Stats XML    ${query_head1}1/    ${transmittedpackets}
     Append To List    ${openflow_q1}    ${ret}
     ${ret}=    Get Stats XML    ${query_head1}1/    ${transmittedbytes}
     Append To List    ${openflow_q1}    ${ret}
-
     Set Suite Variable    @{openflow_q1}
-
-
-    ${ret}=    Get Stats XML    ${query_head1}2/   ${transmittederrors}
+    ${ret}=    Get Stats XML    ${query_head1}2/    ${transmittederrors}
     Append To List    ${openflow_q2}    ${ret}
     ${ret}=    Get Stats XML    ${query_head1}2/    ${transmittedpackets}
     Append To List    ${openflow_q2}    ${ret}
     ${ret}=    Get Stats XML    ${query_head1}2/    ${transmittedbytes}
     Append To List    ${openflow_q2}    ${ret}
-
     Set Suite Variable    @{openflow_q2}
 
-
 Verification of FlowStats-Attributes on Cassandra Data Store
     [Documentation]    Verify the InterfaceMetrics has been updated on Cassandra Data Store
     Copy TSDR tables
@@ -79,18 +70,11 @@ Verification of FlowStats-Attributes on Cassandra Data Store
     Append To List    ${tsdr_q0}    ${ret_val1}
     ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=QUEUESTATS | grep MN=TransmittedBytes | grep RK=Node:openflow:2,NodeConnector:openflow:2:2,Queue:0
     Append To List    ${tsdr_q0}    ${ret_val1}
-
-
-
     ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=QUEUESTATS | grep MN=TransmissionErrors | grep RK=Node:openflow:2,NodeConnector:openflow:2:2,Queue:1
     Append To List    ${tsdr_q1}    ${ret_val1}
     ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=QUEUESTATS | grep MN=TransmittedPackets | grep RK=Node:openflow:2,NodeConnector:openflow:2:2,Queue:1
     Append To List    ${tsdr_q1}    ${ret_val1}
     ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=QUEUESTATS | grep MN=TransmittedBytes | grep RK=Node:openflow:2,NodeConnector:openflow:2:2,Queue:1
-
-
-
-
     ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=QUEUESTATS | grep MN=TransmissionErrors | grep RK=Node:openflow:2,NodeConnector:openflow:2:2,Queue:2
     Append To List    ${tsdr_q2}    ${ret_val1}
     ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=QUEUESTATS | grep MN=TransmittedPackets | grep RK=Node:openflow:2,NodeConnector:openflow:2:2,Queue:2
@@ -98,20 +82,17 @@ Verification of FlowStats-Attributes on Cassandra Data Store
     ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=QUEUESTATS | grep MN=TransmittedBytes | grep RK=Node:openflow:2,NodeConnector:openflow:2:2,Queue:2
     Append To List    ${tsdr_q2}    ${ret_val1}
 
-
 Comparing Queue Metrics
     [Documentation]    Comparing Queue metrics between Cassandra and OF plugin
-
-    : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_q0}    ${tsdr_q0}
-    \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
-
-    : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_q1}    ${tsdr_q1}
-    \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
-
-    : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_q2}    ${tsdr_q2}
-    \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
-
-
+    FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_q0}    ${tsdr_q0}
+        Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
+    END
+    FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_q1}    ${tsdr_q1}
+        Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
+    END
+    FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_q2}    ${tsdr_q2}
+        Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
+    END
 
 *** Keyword ***
 Configuration of Queue on Switch