Tidy new and updated test suites

Change-Id: I1290e2eff4977de37bd8375c380ca7cd1161c190
Signed-off-by: Jozef Behran <jbehran@cisco.com>

diff --git a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
index 356b08fc8e8d0507c57393bcebf15d99f4efb5d0..55f24537d1b5df35908ca15a4adabde65eabafdb 100755 (executable)
--- a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
@@ -18,7 +18,6 @@ Variables         ../../../variables/Variables.py
 &{HEADERS_QUERY}    Content-Type=application/json    Content-Type=application/json
 
 *** Test Cases ***
-
 Init Variables
     [Documentation]    Initialize ODL version specific variables
     log    ${ODL_VERSION}
@@ -63,10 +62,10 @@ Verify Configuration Interval-change
     [Teardown]    Report_Failure_Due_To_Bug    5068
 
 *** Keywords ***
-
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
-    Set Suite Variable    @{CATEGORY}       FLOWGROUPSTATS    FLOWMETERSTATS    FLOWSTATS    FLOWTABLESTATS    PORTSTATS    QUEUESTATS
+    Set Suite Variable    @{CATEGORY}    FLOWGROUPSTATS    FLOWMETERSTATS    FLOWSTATS    FLOWTABLESTATS    PORTSTATS
+    ...    QUEUESTATS
     Set Suite Variable    ${TSDR_PORTSTATS}    tsdr:list PORTSTATS
     Set Suite Variable    ${CONFIG_INTERVAL}    /restconf/config/tsdr-openflow-statistics-collector:TSDROSCConfig
     Set Suite Variable    ${OPER_INTERVAL}    /restconf/operations/tsdr-openflow-statistics-collector:setPollingInterval
@@ -77,7 +76,7 @@ Init Variables Master
 
 Init Variables Lithium
     [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    @{CATEGORY}       FlowStats    FlowTableStats    PortStats    QueueStats
+    Set Suite Variable    @{CATEGORY}    FlowStats    FlowTableStats    PortStats    QueueStats
     Set Suite Variable    ${TSDR_PORTSTATS}    tsdr:list PortStats
     Set Suite Variable    ${CONFIG_INTERVAL}    /restconf/config/TSDRDC:TSDRDCConfig
     Set Suite Variable    ${OPER_INTERVAL}    /restconf/operations/TSDRDC:setPollingInterval

diff --git a/csit/suites/tsdr/HBase/020_FlowMetrics.robot b/csit/suites/tsdr/HBase/020_FlowMetrics.robot
index 5cd30daff12c20c428184236870d30374c4c11e5..bf5edf932275b33ffc4014836339a16b990a55e0 100644 (file)
--- a/csit/suites/tsdr/HBase/020_FlowMetrics.robot
+++ b/csit/suites/tsdr/HBase/020_FlowMetrics.robot
@@ -14,7 +14,6 @@ Variables         ../../../variables/Variables.py
 @{FLOW_METRICS}    PacketCount    ByteCount
 
 *** Test Cases ***
-
 Init Variables
     [Documentation]    Initialize ODL version specific variables
     log    ${ODL_VERSION}
@@ -35,6 +34,7 @@ Verification of FlowMetrics-PacketCount on HBase Client
     ${Line1}=    Get Line    ${output}    0
     Should Contain    ${Line1}    PacketCount
     Verify the Metrics Attributes on Hbase Client    PacketCount    ${node_connector}    ${flowstats}
+
 Verification of FlowMetrics-BytesCount on HBase Client
     [Documentation]    Verify the FlowStats-ByteCount on both Karaf Console and Hbase Client
     ${tsdr_cmd}=    Concatenate the String    ${TSDR_FLOWSTATS}    | grep ByteCount | head
@@ -44,7 +44,6 @@ Verification of FlowMetrics-BytesCount on HBase Client
     Verify the Metrics Attributes on Hbase Client    ByteCount    ${node_connector}    ${flowstats}
 
 *** Keywords ***
-
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FLOWSTATS
@@ -56,4 +55,3 @@ Init Variables Lithium
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FlowStats
     set Suite Variable    ${node_connector}    openflow:1_0
     set suite Variable    ${flowstats}    FlowMetrics
-

diff --git a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
index 658f1d8854d9e6e1a3d396dff87a5f3385149401..8781d0f5c52340b5f8bfaee2b1a38106e7d8e9eb 100644 (file)
--- a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
@@ -14,7 +14,6 @@ Variables         ../../../variables/Variables.py
 ${TSDR_FLOWTABLE_STATS}    tsdr:list FLOWTABLESTATS
 
 *** Test Cases ***
-
 Init Variables
     [Documentation]    Initialize ODL version specific variables
     log    ${ODL_VERSION}
@@ -46,7 +45,6 @@ Verification of FlowTableMetrics-PacketLookup on HBase Client
     Verify the Metrics Attributes on Hbase Client    PacketLookup    ${node_connector}    ${flowtablestats}
 
 *** Keywords ***
-
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FLOWTABLESTATS
@@ -58,4 +56,3 @@ Init Variables Lithium
     Set Suite Variable    ${TSDR_FLOWSTATS}    tsdr:list FlowTableStats
     set Suite Variable    ${node_connector}    openflow:1_0
     set suite Variable    ${flowtablestats}    FlowTableMetrics
-

diff --git a/csit/suites/tsdr/HBase/040_QueueMetrics.robot b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
index 219c322566492f1a2cf930983dceca3297bceb1f..f68d5f77805502d7e3234fb9e8283039edbe3966 100644 (file)
--- a/csit/suites/tsdr/HBase/040_QueueMetrics.robot
+++ b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
@@ -14,7 +14,6 @@ Variables         ../../../variables/Variables.py
 @{QUEUE_METRICS}    TransmittedPackets    TransmittedBytes    TransmissionErrors
 
 *** Test Cases ***
-
 Init Variables
     [Documentation]    Initialize ODL version specific variables
     log    ${ODL_VERSION}
@@ -46,13 +45,11 @@ Verification of QueueMetrics-TransmissionErrors on HBase Client
     [Documentation]    Verify the QueueMetrics has been updated on HBase Datastore
     Verify the Metrics Attributes on Hbase Client    TransmissionErrors    ${node_connector}    ${queuestats}
 
-*** Keyword ***
+*** Keywords ***
 Configuration of Queue on Switch
     [Documentation]    Queue configuration on openvswitch
     Configure the Queue on Switch    s2-eth2
 
-*** Keywords ***
-
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
     Set Suite Variable    ${TSDR_QUEUESTATS}    tsdr:list QUEUESTATS
@@ -64,4 +61,3 @@ Init Variables Lithium
     Set Suite Variable    ${TSDR_QUEUESTATS}    tsdr:list QueueStats
     set Suite Variable    ${node_connector}    openflow:2
     set suite Variable    ${queuestats}    QueueMetrics
-

diff --git a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
index 2c21fa9c2bbe5b393f58407dea3c30b3768a2b08..30ed2aaf6ff9bd4d01539378bff7dd3c91fc3bb7 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot
@@ -47,12 +47,13 @@ Verify PortStats On Karaf console
 *** Keywords ***
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
-    Set Suite Variable    @{CATEGORY}       FLOWGROUPSTATS    FLOWMETERSTATS    FLOWSTATS    FLOWTABLESTATS    PORTSTATS    QUEUESTATS
+    Set Suite Variable    @{CATEGORY}    FLOWGROUPSTATS    FLOWMETERSTATS    FLOWSTATS    FLOWTABLESTATS    PORTSTATS
+    ...    QUEUESTATS
     Set Suite Variable    ${TSDR_PORTSTATS}    tsdr:list PORTSTATS
     Set Suite Variable    ${HSQLDB_INSTALL}    odl-tsdr-hsqldb
 
 Init Variables Lithium
     [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    @{CATEGORY}       FlowStats    FlowTableStats    PortStats    QueueStats
+    Set Suite Variable    @{CATEGORY}    FlowStats    FlowTableStats    PortStats    QueueStats
     Set Suite Variable    ${TSDR_PORTSTATS}    tsdr:list PortStats
     Set Suite Variable    ${HSQLDB_INSTALL}    odl-tsdr-HSQLDB

diff --git a/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot b/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot
index 1193ef9523e01a80bbe1f1de101d831b4a3d226d..b962505903156845ad2f82fae07270dcc5280bba 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot
@@ -20,7 +20,6 @@ Init Variables
     Run Keyword If    '${ODL_VERSION}' == 'stable-lithium'    Init Variables Lithium
     ...    ELSE    Init Variables Master
 
-
 Verification of TSDR FlowMetrics
     [Documentation]    Verify the TSDR FLOWSTATS
     Wait Until Keyword Succeeds    60s    1s    Verify the Metric is Collected?    ${TSDR_FLOWSTATS}    PacketCount

diff --git a/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot b/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot
index a82ca699bf83dc5940e1a9d756747055df7a3ca0..98a5a83724422b4735527ac0830f700a37077a09 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot
@@ -35,4 +35,3 @@ Init Variables Master
 Init Variables Lithium
     [Documentation]    Sets variables specific to Lithium version
     Set Suite Variable    ${TSDR_FLOWTABLE_STATS}    tsdr:list FlowTableStats
-

diff --git a/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot b/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot
index c1dfb61a805bebef2e4218d1be50c1772eab3189..6a69cbba7c33dd9cd66e5536d71e973ab1793469 100644 (file)
--- a/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot
+++ b/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot
@@ -39,4 +39,3 @@ Init Variables Master
 Init Variables Lithium
     [Documentation]    Sets variables specific to Lithium version
     Set Suite Variable    ${TSDR_QUEUE_STATS}    tsdr:list QueueStats
-