From 64fa60b9810a6884acb1712e1f7533577cbc0d64 Mon Sep 17 00:00:00 2001 From: Jozef Behran Date: Thu, 10 Mar 2016 18:10:34 +0100 Subject: [PATCH] Tidy new and updated test suites Change-Id: I1290e2eff4977de37bd8375c380ca7cd1161c190 Signed-off-by: Jozef Behran --- csit/suites/tsdr/HBase/010_InterfaceMetrics.robot | 7 +++---- csit/suites/tsdr/HBase/020_FlowMetrics.robot | 4 +--- csit/suites/tsdr/HBase/030_FlowTableMetrics.robot | 3 --- csit/suites/tsdr/HBase/040_QueueMetrics.robot | 6 +----- csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot | 5 +++-- csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot | 1 - csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot | 1 - csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot | 1 - 8 files changed, 8 insertions(+), 20 deletions(-) diff --git a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot index 356b08fc8e..55f24537d1 100755 --- 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 5cd30daff1..bf5edf9322 100644 --- 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 658f1d8854..8781d0f5c5 100644 --- 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 219c322566..f68d5f7780 100644 --- 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 2c21fa9c2b..30ed2aaf6f 100644 --- 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 1193ef9523..b962505903 100644 --- 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 a82ca699bf..98a5a83724 100644 --- 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 c1dfb61a80..6a69cbba7c 100644 --- 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 - -- 2.36.6