Tidy updated test suites

[integration/test.git] / csit / suites / tsdr / Cassandra / 010_InterfaceMetrics.robot

diff --git a/csit/suites/tsdr/Cassandra/010_InterfaceMetrics.robot b/csit/suites/tsdr/Cassandra/010_InterfaceMetrics.robot
index 3ec12d8cd3b41db97411198384ddeb8b07ae5d40..824cc913e93e84c343ac4e8318f378637b00dcae 100644 (file)
--- a/csit/suites/tsdr/Cassandra/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/Cassandra/010_InterfaceMetrics.robot
@@ -13,14 +13,14 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 @{INTERFACE_METRICS}    TransmittedPackets    TransmittedBytes    TransmitErrors    TransmitDrops    ReceivedPackets    ReceivedBytes    ReceiveOverRunError
 ...               ReceiveFrameError    ReceiveErrors    ReceiveDrops    ReceiveCrcError    CollisionCount
-${root_path}    flow-capable-node-connector-statistics
-@{xpath}    ${root_path}/packets/transmitted    ${root_path}/bytes/transmitted    ${root_path}/transmit-errors    ${root_path}/transmit-drops    ${root_path}/packets/received    ${root_path}/bytes/received    ${root_path}/receive-over-run-error
-...                ${root_path}/receive-frame-error    ${root_path}/receive-errors    ${root_path}/receive-drops    ${root_path}/receive-crc-error    ${root_path}/collision-count
+${root_path}      flow-capable-node-connector-statistics
+@{xpath}          ${root_path}/packets/transmitted    ${root_path}/bytes/transmitted    ${root_path}/transmit-errors    ${root_path}/transmit-drops    ${root_path}/packets/received    ${root_path}/bytes/received    ${root_path}/receive-over-run-error
+...               ${root_path}/receive-frame-error    ${root_path}/receive-errors    ${root_path}/receive-drops    ${root_path}/receive-crc-error    ${root_path}/collision-count
 @{CATEGORY}       FlowStats    FlowTableStats    PortStats    QueueStats
 ${TSDR_PORTSTATS}    tsdr:list PortStats
 ${CONFIG_INTERVAL}    /restconf/config/tsdr-openflow-statistics-collector:TSDRDCConfig
 ${OPER_INTERVAL}    /restconf/operations/tsdr-openflow-statistics-collector:setPollingInterval
-${metric_path}     metric_path
+${metric_path}    metric_path
 ${metric_val}     metric_val
 @{xml_list}
 @{tsdr_list}
@@ -35,10 +35,9 @@ Verification of TSDR Cassandra Feature Installation
     Start Tsdr Suite
     Ping All Hosts
     Wait Until Keyword Succeeds    5x    30 sec    Check Metric path    24\\d+|25\\d+
-    Wait Until Keyword Succeeds    5x    30 sec    Check Metric val     \\d{5}
+    Wait Until Keyword Succeeds    5x    30 sec    Check Metric val    \\d{5}
 
 Storing Statistics from Openflow REST
-
     [Documentation]    Store openflow PortStats metrics using REST.
     : FOR    ${item}    IN    @{xpath}
     \    ${ret_val}=    Set Variable    -1
@@ -74,13 +73,11 @@ Storing Statistics from Openflow REST
     \    ${ret_val}=    Set Variable    -1
     Log List    ${xml_list}
 
-
-
 Verification of InterfaceMetrics-Attributes on Cassandra Client
     [Documentation]    Verify the InterfaceMetrics has been updated on Cassandra Data Store
     Copy TSDR tables
     : FOR    ${list}    IN    @{INTERFACE_METRICS}
-    \    ${ret_val1}=    Extract From DB Table     grep NID=openflow:1 | grep DC=PORTSTATS | grep MN=${list} | grep RK=Node:openflow:1,NodeConnector:openflow:1:1
+    \    ${ret_val1}=    Extract From DB Table    grep NID=openflow:1 | grep DC=PORTSTATS | grep MN=${list} | grep RK=Node:openflow:1,NodeConnector:openflow:1:1
     \    Append To List    ${tsdr_list}    ${ret_val1}
     \    ${ret_val1}=    Extract From DB Table    grep NID=openflow:1 | grep DC=PORTSTATS | grep MN=${list} | grep RK=Node:openflow:1,NodeConnector:openflow:1:2
     \    Append To List    ${tsdr_list}    ${ret_val1}
@@ -102,13 +99,10 @@ Verification of InterfaceMetrics-Attributes on Cassandra Client
     \    Append To List    ${tsdr_list}    ${ret_val1}
 
 Comparing Mertics
-
     [Documentation]    Compare openflow Interface metrics between data collected from openflow Plugin and TSDR
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${xml_list}    ${tsdr_list}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}
 
-
-
 Verify Configuration Interval-change
     [Documentation]    Verify the TSDR Collection configuration changes
     ${session}=    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
@@ -120,7 +114,6 @@ Verify Configuration Interval-change
     Delete All Sessions
 
 *** Keywords ***
-
 Verify TSDR Configuration Interval
     [Arguments]    ${interval}
     [Documentation]    Verify Configuration interval of TSDR Collection
@@ -144,6 +137,3 @@ Extract From DB Table
     ${ret_val1}=    Set Variable    -100
     ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    ${pattern}
     [Return]    ${ret_val1}
-
-
-