From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 9 Feb 2016 11:10:06 +0000 (+0100)
Subject: Tidy robot files.
X-Git-Tag: release/beryllium-sr1~117
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=4859f3d0f3cb781f8ef27dfe8f5286a44696eadf

Tidy robot files.

robotframework==3.0

Change-Id: I92d7cb221c5864e570bf607e098e6b68b6ac349c
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/csit/libraries/TsdrUtils.robot b/csit/libraries/TsdrUtils.robot
index 0e30f450f3..07c2ca5ddf 100644
--- a/csit/libraries/TsdrUtils.robot
+++ b/csit/libraries/TsdrUtils.robot
@@ -63,7 +63,6 @@ Iperf All Hosts
     Write    iperf ${host1} ${host2}
     Read Until    mininet>
 
-
 Iperf All Hosts Hbase
     [Arguments]    ${pattern}
     [Documentation]    Iperf between h1 and h2 and check Hbase
@@ -82,7 +81,7 @@ Iperf All Hosts HSQLDB
     [Arguments]    ${pattern}
     [Documentation]    Iperf between h1 and h2 and check Cassandra
     Iperf All Hosts    h1    h2
-    ${query_output}=   Issue Command On Karaf Console    tsdr:list NETFLOW | wc -l
+    ${query_output}=    Issue Command On Karaf Console    tsdr:list NETFLOW | wc -l
     Should Match Regexp    ${query_output}    ${pattern}
 
 Stop Tsdr Suite
@@ -264,7 +263,6 @@ Verify the Metrics Attributes on Cassandra Client
     ${metric_count}=    Get From List    ${split_line}    3
     [Return]    ${metric_count}
 
-
 Form Portstats Query Pattern
     [Arguments]    ${metric}    ${node}    ${port}    ${attribute}
     [Documentation]    Used for geneating openflow metrics Queries for Cassandra.
@@ -285,7 +283,6 @@ Create Temporary Key Info
     ${output}=    Run Command On Remote System    ${ODL_SYSTEM_IP}    cat ${CASSANDRA_DB_PATH}${val_table}|grep "${pattern}"
     [Return]    ${output}
 
-
 Verify Metric Val File
     [Documentation]    Returns Value for metric matching particular keya,keyb
     @{metricval}=    Read File and Return Split Lines    ${CASSANDRA_DB_PATH}${temp_metric_val}
@@ -303,7 +300,6 @@ Verify Metric log File
     [Return]    ${contents}
 
 Grep From File
-
     [Arguments]    ${file}    ${pattern}
     [Documentation]    Use cat to grep from the file and return the output
     ${output}=    Run Command On Remote System    ${ODL_SYSTEM_IP}    cat ${file} | ${pattern}
@@ -613,12 +609,11 @@ Write SNMP config
 Bringup Netflow
     [Documentation]    Brings up basic netflow setup .
     Verify Feature Is Installed    odl-tsdr-netflow-statistics-collector
-    Wait Until Keyword Succeeds    24x    10 sec    Check Karaf Log Has Messages     NetFlow Data Colletor Initialized
+    Wait Until Keyword Succeeds    24x    10 sec    Check Karaf Log Has Messages    NetFlow Data Colletor Initialized
     Start Tsdr Suite
     Ping All Hosts
     Configure Netflow
 
-
 Collect Data from SNMP Agent
     [Arguments]    ${SNMP_IP}=127.0.0.1    ${SNMP_AGENT_COMM}=${SNMP_COMMUNITY}
     [Documentation]    Poll for SNMP Agent OID
@@ -658,7 +653,7 @@ Collect Data from SNMP Agent
     \    ${ifOperStatus}=    Get From Dictionary    ${OPER_STATUS}    ${ifOperStatus1}
     \    Append To List    ${SNMP_ENTRY}    grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfOutDiscards | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfOutDiscards
     \    Append To List    ${SNMP_VALUES}    ${ifOutDiscards}
-    \    Append To List    ${SNMP_ENTRY}     grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfInDiscards | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfInDiscards
+    \    Append To List    ${SNMP_ENTRY}    grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfInDiscards | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfInDiscards
     \    Append To List    ${SNMP_VALUES}    ${ifInDiscards}
     \    Append To List    ${SNMP_ENTRY}    grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfInOctets | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfInOctets
     \    Append To List    ${SNMP_VALUES}    ${ifInOctets}
@@ -685,4 +680,3 @@ Collect Data from SNMP Agent
     \    Append To List    ${SNMP_ENTRY}    grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfOperStatus | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfOperStatus
     \    Append To List    ${SNMP_VALUES}    ${ifOperStatus}
     [Return]    ${SNMP_ENTRY}    ${SNMP_VALUES}
-
diff --git a/csit/suites/aaa/authn/010_Credential_Authentication.robot b/csit/suites/aaa/authn/010_Credential_Authentication.robot
index c7575f811a..a442ee43c7 100644
--- a/csit/suites/aaa/authn/010_Credential_Authentication.robot
+++ b/csit/suites/aaa/authn/010_Credential_Authentication.robot
@@ -53,7 +53,7 @@ Revoke Token And Verify Transaction Fails
 
 Disable Authentication And Re-Enable Authentication
     [Documentation]    Toggles authentication off and verifies that no login credentials are needed for REST transactions.
-    ...    Test has been disabled due to the fact that this interface has changed.  Authentication is now disabled
+    ...    Test has been disabled due to the fact that this interface has changed. Authentication is now disabled
     ...    through modification of shiro.ini, which requires controller restart and is not suit for this test.
     [Tags]    exclude
     Disable Authentication On Controller    ${ODL_SYSTEM_IP}
diff --git a/csit/suites/tsdr/Cassandra/010_InterfaceMetrics.robot b/csit/suites/tsdr/Cassandra/010_InterfaceMetrics.robot
index 2a24704276..e384bff58b 100644
--- a/csit/suites/tsdr/Cassandra/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/Cassandra/010_InterfaceMetrics.robot
@@ -1,6 +1,7 @@
 *** Settings ***
 Documentation     Test suite for Cassandra DataStore PortStats Verification
 Suite Teardown    Stop Tsdr Suite
+Metadata          https://bugs.opendaylight.org/show_bug.cgi?id=5068    ${EMPTY}
 Library           SSHLibrary
 Library           Collections
 Library           String
@@ -9,19 +10,18 @@ Library           ../../../libraries/Common.py
 Resource          ../../../libraries/KarafKeywords.robot
 Resource          ../../../libraries/TsdrUtils.robot
 Variables         ../../../variables/Variables.py
-Metadata          https://bugs.opendaylight.org/show_bug.cgi?id=5068    ${EMPTY}
 
 *** 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,7 +35,7 @@ Verification of TSDR Cassandra Feature Installation
     Verify Feature Is Installed    odl-tsdr-openflow-statistics-collector
     Start Tsdr Suite
     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}
 
 Storing Statistics from Openflow REST
     [Documentation]    Store openflow PortStats metrics using REST.
@@ -73,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}
@@ -140,4 +138,3 @@ Extract From DB Table
     ${ret_val1}=    Set Variable    -100
     ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    ${pattern}
     [Return]    ${ret_val1}
-
diff --git a/csit/suites/tsdr/Cassandra/020_FlowMetrics.robot b/csit/suites/tsdr/Cassandra/020_FlowMetrics.robot
index 48887be1ee..b4ce17f5ad 100644
--- a/csit/suites/tsdr/Cassandra/020_FlowMetrics.robot
+++ b/csit/suites/tsdr/Cassandra/020_FlowMetrics.robot
@@ -11,11 +11,10 @@ Resource          ../../../libraries/TsdrUtils.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-
 @{FLOW_METRICS}    PacketCount    ByteCount
 ${TSDR_FLOWSTATS}    tsdr:list FlowStats
 ${packet_count}    flow/flow-statistics/packet-count
-${byte_count}    flow/flow-statistics/byte-count
+${byte_count}     flow/flow-statistics/byte-count
 @{tsdr_op1}
 @{tsdr_op2}
 @{tsdr_op3}
@@ -26,42 +25,32 @@ ${byte_count}    flow/flow-statistics/byte-count
 @{tsdr_op2_bc}
 @{tsdr_op3_bc}
 
-
 *** Test Cases ***
-
 Verification of TSDR Cassandra Feature Installation
     [Documentation]    Install and Verify the TSDR Cassandra Features
     Verify Feature Is Installed    odl-tsdr-cassandra
     Verify Feature Is Installed    odl-tsdr-openflow-statistics-collector
     Start Tsdr Suite
     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 Flowstats from openflow plugin
-
     @{openflow_1}=    Return all XML matches    ${OPERATIONAL_NODES_API}/node/openflow:1/table/0/    flow/id
     @{openflow_2}=    Return all XML matches    ${OPERATIONAL_NODES_API}/node/openflow:2/table/0/    flow/id
     @{openflow_3}=    Return all XML matches    ${OPERATIONAL_NODES_API}/node/openflow:3/table/0/    flow/id
-
-    Set Suite Variable 	  @{openflow_1}
+    Set Suite Variable    @{openflow_1}
     Set Suite Variable    @{openflow_2}
     Set Suite Variable    @{openflow_3}
-
     @{openflow_1_packetcount}=    Return all XML matches    ${OPERATIONAL_NODES_API}/node/openflow:1/table/0/    ${packet_count}
     @{openflow_2_packetcount}=    Return all XML matches    ${OPERATIONAL_NODES_API}/node/openflow:2/table/0/    ${packet_count}
     @{openflow_3_packetcount}=    Return all XML matches    ${OPERATIONAL_NODES_API}/node/openflow:3/table/0/    ${packet_count}
-
     Set Suite Variable    @{openflow_1_packetcount}
     Set Suite Variable    @{openflow_2_packetcount}
     Set Suite Variable    @{openflow_3_packetcount}
-
-
     @{openflow_1_bytecount}=    Return all XML matches    ${OPERATIONAL_NODES_API}/node/openflow:1/table/0/    ${byte_count}
     @{openflow_2_bytecount}=    Return all XML matches    ${OPERATIONAL_NODES_API}/node/openflow:2/table/0/    ${byte_count}
     @{openflow_3_bytecount}=    Return all XML matches    ${OPERATIONAL_NODES_API}/node/openflow:3/table/0/    ${byte_count}
-
     Set Suite Variable    @{openflow_1_bytecount}
     Set Suite Variable    @{openflow_2_bytecount}
     Set Suite Variable    @{openflow_3_bytecount}
@@ -70,29 +59,23 @@ Verification of FlowStats-Attributes on Cassandra Data Store
     [Documentation]    Verify the InterfaceMetrics has been updated on Cassandra Data Store
     Copy TSDR tables
     : FOR    ${flow}    IN    @{openflow_1}
-    \   ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:1 | grep DC=FLOWSTATS | grep MN=PacketCount | grep -F 'RK=Node:openflow:1,Table:0,Flow:${flow}'
-    \   Append To List    ${tsdr_op1_pc}    ${ret_val1}
-
+    \    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:1 | grep DC=FLOWSTATS | grep MN=PacketCount | grep -F 'RK=Node:openflow:1,Table:0,Flow:${flow}'
+    \    Append To List    ${tsdr_op1_pc}    ${ret_val1}
     : FOR    ${flow}    IN    @{openflow_2}
-    \   ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=FLOWSTATS | grep MN=PacketCount | grep -F 'RK=Node:openflow:2,Table:0,Flow:${flow}'
-    \   Append To List    ${tsdr_op2_pc}    ${ret_val1}
-
+    \    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=FLOWSTATS | grep MN=PacketCount | grep -F 'RK=Node:openflow:2,Table:0,Flow:${flow}'
+    \    Append To List    ${tsdr_op2_pc}    ${ret_val1}
     : FOR    ${flow}    IN    @{openflow_3}
-    \   ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:3 | grep DC=FLOWSTATS | grep MN=PacketCount | grep -F 'RK=Node:openflow:3,Table:0,Flow:${flow}'
-    \   Append To List    ${tsdr_op3_pc}    ${ret_val1}
-
+    \    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:3 | grep DC=FLOWSTATS | grep MN=PacketCount | grep -F 'RK=Node:openflow:3,Table:0,Flow:${flow}'
+    \    Append To List    ${tsdr_op3_pc}    ${ret_val1}
     : FOR    ${flow}    IN    @{openflow_1}
-    \   ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:1 | grep DC=FLOWSTATS | grep MN=ByteCount | grep -F 'RK=Node:openflow:1,Table:0,Flow:${flow}'
-    \   Append To List    ${tsdr_op1_bc}    ${ret_val1}
-
+    \    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:1 | grep DC=FLOWSTATS | grep MN=ByteCount | grep -F 'RK=Node:openflow:1,Table:0,Flow:${flow}'
+    \    Append To List    ${tsdr_op1_bc}    ${ret_val1}
     : FOR    ${flow}    IN    @{openflow_2}
-    \   ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=FLOWSTATS | grep MN=ByteCount | grep -F 'RK=Node:openflow:2,Table:0,Flow:${flow}'
-    \   Append To List    ${tsdr_op2_bc}    ${ret_val1}
-
+    \    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=FLOWSTATS | grep MN=ByteCount | grep -F 'RK=Node:openflow:2,Table:0,Flow:${flow}'
+    \    Append To List    ${tsdr_op2_bc}    ${ret_val1}
     : FOR    ${flow}    IN    @{openflow_3}
-    \   ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:3 | grep DC=FLOWSTATS | grep MN=ByteCount | grep -F 'RK=Node:openflow:3,Table:0,Flow:${flow}'
-    \   Append To List    ${tsdr_op3_bc}    ${ret_val1}
-
+    \    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:3 | grep DC=FLOWSTATS | grep MN=ByteCount | grep -F 'RK=Node:openflow:3,Table:0,Flow:${flow}'
+    \    Append To List    ${tsdr_op3_bc}    ${ret_val1}
     Set Suite Variable    @{tsdr_op1_pc}
     Set Suite Variable    @{tsdr_op2_pc}
     Set Suite Variable    @{tsdr_op3_pc}
@@ -100,37 +83,24 @@ Verification of FlowStats-Attributes on Cassandra Data Store
     Set Suite Variable    @{tsdr_op2_bc}
     Set Suite Variable    @{tsdr_op3_bc}
 
-
 Comparing Packet Count Metrics
     [Documentation]    Comparing Packet count values between Cassandra and openflow plugin
-
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_1_packetcount}    ${tsdr_op1_pc}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
-
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_2_packetcount}    ${tsdr_op2_pc}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
-
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_3_packetcount}    ${tsdr_op3_pc}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
 
-
-
 Comparing Byte Count Metrics
     [Documentation]    Comparing byte count values between Cassandra and openflow plugin
-
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_1_bytecount}    ${tsdr_op1_bc}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
-
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_2_bytecount}    ${tsdr_op2_bc}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
-
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_3_bytecount}    ${tsdr_op3_bc}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    20
 
-
-
-
 *** Keywords ***
 Initialize the Tsdr Suite
     Initialize Cassandra Tables Metricval
-
diff --git a/csit/suites/tsdr/Cassandra/030_FlowTableMetrics.robot b/csit/suites/tsdr/Cassandra/030_FlowTableMetrics.robot
index 2055c5e58b..539f9543d4 100644
--- a/csit/suites/tsdr/Cassandra/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/Cassandra/030_FlowTableMetrics.robot
@@ -23,7 +23,6 @@ ${packetmatched}    flow-table-statistics/packets-matched
 @{openflow_packetmatched}
 
 *** Test Cases ***
-
 Verification of TSDR Cassandra Feature Installation
     [Documentation]    Install and Verify the TSDR Cassandra Features
     COMMENT    Install a Feature    odl-tsdr-cassandra-all    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    60
@@ -32,8 +31,7 @@ Verification of TSDR Cassandra Feature Installation
     Verify Feature Is Installed    odl-tsdr-openflow-statistics-collector
     Start Tsdr Suite
     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 Flow Table Stats Values from Openflow plugin
@@ -43,77 +41,54 @@ Getting all Tables from Openflow Plugin
     Append To List    ${openflow_packetlookup}    ${ret}
     ${ret}=    Get Stats XML    ${OPERATIONAL_NODES_API}/node/openflow:3/table/0/    ${packetlookup}
     Append To List    ${openflow_packetlookup}    ${ret}
-
     Set Suite Variable    @{openflow_packetlookup}
-
-
     ${ret}=    Get Stats XML    ${OPERATIONAL_NODES_API}/node/openflow:1/table/0/    ${activeflows}
     Append To List    ${openflow_activeflows}    ${ret}
     ${ret}=    Get Stats XML    ${OPERATIONAL_NODES_API}/node/openflow:2/table/0/    ${activeflows}
     Append To List    ${openflow_activeflows}    ${ret}
     ${ret}=    Get Stats XML    ${OPERATIONAL_NODES_API}/node/openflow:3/table/0/    ${activeflows}
     Append To List    ${openflow_activeflows}    ${ret}
-
     Set Suite Variable    @{openflow_activeflows}
-
     ${ret}=    Get Stats XML    ${OPERATIONAL_NODES_API}/node/openflow:1/table/0/    ${packetmatched}
     Append To List    ${openflow_packetmatched}    ${ret}
     ${ret}=    Get Stats XML    ${OPERATIONAL_NODES_API}/node/openflow:2/table/0/    ${packetmatched}
     Append To List    ${openflow_packetmatched}    ${ret}
     ${ret}=    Get Stats XML    ${OPERATIONAL_NODES_API}/node/openflow:3/table/0/    ${packetmatched}
     Append To List    ${openflow_packetmatched}    ${ret}
-
     Set Suite Variable    @{openflow_packetmatched}
 
-
-
-
 Verification of FlowStats-Attributes on Cassandra Data Store
     [Documentation]    Verify the InterfaceMetrics has been updated on Cassandra Data Store
     Copy TSDR tables
-    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client     grep NID=openflow:1 | grep DC=FLOWTABLESTATS | grep MN=PacketLookup | grep RK=Node:openflow:1,Table:0
+    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:1 | grep DC=FLOWTABLESTATS | grep MN=PacketLookup | grep RK=Node:openflow:1,Table:0
     Append To List    ${tsdr_pl}    ${ret_val1}
-    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client     grep NID=openflow:2 | grep DC=FLOWTABLESTATS | grep MN=PacketLookup | grep RK=Node:openflow:2,Table:0
+    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=FLOWTABLESTATS | grep MN=PacketLookup | grep RK=Node:openflow:2,Table:0
     Append To List    ${tsdr_pl}    ${ret_val1}
-    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client     grep NID=openflow:3 | grep DC=FLOWTABLESTATS | grep MN=PacketLookup | grep RK=Node:openflow:3,Table:0
+    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:3 | grep DC=FLOWTABLESTATS | grep MN=PacketLookup | grep RK=Node:openflow:3,Table:0
     Append To List    ${tsdr_pl}    ${ret_val1}
-
-
-
-    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client     grep NID=openflow:1 | grep DC=FLOWTABLESTATS | grep MN=ActiveFlows | grep RK=Node:openflow:1,Table:0
+    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:1 | grep DC=FLOWTABLESTATS | grep MN=ActiveFlows | grep RK=Node:openflow:1,Table:0
     Append To List    ${tsdr_af}    ${ret_val1}
-    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client     grep NID=openflow:2 | grep DC=FLOWTABLESTATS | grep MN=ActiveFlows | grep RK=Node:openflow:2,Table:0
+    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=FLOWTABLESTATS | grep MN=ActiveFlows | grep RK=Node:openflow:2,Table:0
     Append To List    ${tsdr_af}    ${ret_val1}
-    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client     grep NID=openflow:3 | grep DC=FLOWTABLESTATS | grep MN=ActiveFlows | grep RK=Node:openflow:3,Table:0
+    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:3 | grep DC=FLOWTABLESTATS | grep MN=ActiveFlows | grep RK=Node:openflow:3,Table:0
     Append To List    ${tsdr_af}    ${ret_val1}
-
-
-    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client     grep NID=openflow:1 | grep DC=FLOWTABLESTATS | grep MN=PacketMatch | grep RK=Node:openflow:1,Table:0
+    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:1 | grep DC=FLOWTABLESTATS | grep MN=PacketMatch | grep RK=Node:openflow:1,Table:0
     Append To List    ${tsdr_pm}    ${ret_val1}
-    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client     grep NID=openflow:2 | grep DC=FLOWTABLESTATS | grep MN=PacketMatch | grep RK=Node:openflow:2,Table:0
+    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:2 | grep DC=FLOWTABLESTATS | grep MN=PacketMatch | grep RK=Node:openflow:2,Table:0
     Append To List    ${tsdr_pm}    ${ret_val1}
-    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client     grep NID=openflow:3 | grep DC=FLOWTABLESTATS | grep MN=PacketMatch | grep RK=Node:openflow:3,Table:0
+    ${ret_val1}=    Verify the Metrics Attributes on Cassandra Client    grep NID=openflow:3 | grep DC=FLOWTABLESTATS | grep MN=PacketMatch | grep RK=Node:openflow:3,Table:0
     Append To List    ${tsdr_pm}    ${ret_val1}
 
-
-
-
 Comparing Flow Table Metrics
     [Documentation]    Comparing Flow table values between Cassandra and openflow plugin.
-
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_packetlookup}    ${tsdr_pl}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    5
-
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_activeflows}    ${tsdr_af}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    5
-
     : FOR    ${xml_val}    ${tsdr_val}    IN ZIP    ${openflow_packetmatched}    ${tsdr_pm}
     \    Compare Tsdr XML Metrics    ${xml_val}    ${tsdr_val}    5
 
-
-
 *** Keywords ***
 Initialize the Tsdr Suite
     COMMENT    Initialize the Cassandra for TSDR
     Initialize Cassandra Tables Metricval
-
diff --git a/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot b/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot
index 2adaa57192..b69c3add4e 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,7 +26,6 @@ ${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
@@ -36,40 +35,32 @@ Verification of TSDR Cassandra Feature Installation
     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,21 +82,15 @@ 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
 
-
-
 *** Keyword ***
 Configuration of Queue on Switch
     [Documentation]    Queue configuration on openvswitch
diff --git a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
index dd0cc131a8..5c5ab07cb8 100755
--- a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
@@ -2,6 +2,7 @@
 Documentation     Test suite for Hbase DataStore PortStats Verification
 Suite Setup       Initialize the Tsdr Suite
 Suite Teardown    Stop Tsdr Suite
+Metadata          https://bugs.opendaylight.org/show_bug.cgi?id=5068    ${EMPTY}
 Library           SSHLibrary
 Library           Collections
 Library           String
@@ -10,7 +11,6 @@ Library           ../../../libraries/Common.py
 Resource          ../../../libraries/KarafKeywords.robot
 Resource          ../../../libraries/TsdrUtils.robot
 Variables         ../../../variables/Variables.py
-Metadata          https://bugs.opendaylight.org/show_bug.cgi?id=5068    ${EMPTY}
 
 *** Variables ***
 @{INTERFACE_METRICS}    TransmittedPackets    TransmittedBytes    TransmitErrors    TransmitDrops    ReceivedPackets    ReceivedBytes    ReceiveOverRunError