T-REX: startup config generation

[csit.git] / tests / suites / performance / short.robot

diff --git a/tests/suites/performance/short.robot b/tests/suites/performance/short.robot
index eea9c17..4273b9b 100644 (file)
--- a/tests/suites/performance/short.robot
+++ b/tests/suites/performance/short.robot
@@ -20,34 +20,33 @@
 | Library | resources.libraries.python.TrafficGenerator
 | Library | resources.libraries.python.NodePath
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
+| Suite Setup | 3-node Performance Suite Setup
+| Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Suite Setup | Initialize traffic generator | ${nodes['TG']}
-| ... | ${nodes['TG']['interfaces']['port3']['pci_address']}
-| ... | ${nodes['TG']['interfaces']['port5']['pci_address']}
-| Suite Teardown | Teardown traffic generator | ${nodes['TG']}
+| Test Teardown  | Run Keyword If Test Failed | Show statistics on all DUTs
 
 *** Test Cases ***
-| VPP passes 64B frames through L2 cross connect at 3.5mpps in 3-node topology
+| 2core VPP passes 64B frames through L2 cross connect at 3.5mpps in 3-node topology
 | | Given L2 xconnect initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-xconnect
 
-| VPP passes 1518B frames through L2 cross connect at 10gbps in 3-node topology
+| 2core VPP passes 1518B frames through L2 cross connect at 10gbps in 3-node topology
 | | Given L2 xconnect initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | 10 | 10gbps | 1518 | 3-node-xconnect
 
-| VPP passes 9000B frames through L2 cross connect at 10gbps in 3-node topology
+| 2core VPP passes 9000B frames through L2 cross connect at 10gbps in 3-node topology
 | | Given L2 xconnect initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | 10 | 10gbps | 9000 | 3-node-xconnect
 
-| VPP passes 64B frames through bridge domain at 3.5mpps in 3-node topology
+| 2core VPP passes 64B frames through bridge domain at 3.5mpps in 3-node topology
 | | Given L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-bridge
 
-| VPP passes 1518B frames through bridge domain at 10gbps in 3-node topology
+| 2core VPP passes 1518B frames through bridge domain at 10gbps in 3-node topology
 | | Given L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | 10 | 10gbps | 1518 | 3-node-bridge
 
-| VPP passes 9000B frames through bridge domain at 10gbps in 3-node topology
+| 2core VPP passes 9000B frames through bridge domain at 10gbps in 3-node topology
 | | Given L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | 10 | 10gbps | 9000 | 3-node-bridge
 
@@ -66,47 +65,53 @@
 
 *** Keywords ***
 
-
-| L2 xconnect initialized in a 3-node topology
-| | Interfaces on all DUTs are in "up" state
-| | L2 setup xconnect on DUTs
-
-| IPv4 forwarding initialized in a 3-node topology
-| | Setup nodes for IPv4 testing
-
-| L2 bridge domain initialized in a 3-node circular topology
+| 3-node Topology Variables Setup
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
 | | ...          | ${nodes['TG']}
 | | Compute Path
-| | ${src_if} | ${tg}= | Next Interface
+| | ${tg_if1} | ${tg}= | Next Interface
 | | ${dut1_if1} | ${dut1}= | Next Interface
 | | ${dut1_if2} | ${dut1}= | Next Interface
 | | ${dut2_if1} | ${dut2}= | Next Interface
 | | ${dut2_if2} | ${dut2}= | Next Interface
-| | ${dst_if} | ${tg}= | Next Interface
+| | ${tg_if2} | ${tg}= | Next Interface
+| | Set Suite Variable | ${tg}
+| | Set Suite Variable | ${tg_if1}
+| | Set Suite Variable | ${tg_if2}
+| | Set Suite Variable | ${dut1}
+| | Set Suite Variable | ${dut1_if1}
+| | Set Suite Variable | ${dut1_if2}
+| | Set Suite Variable | ${dut2}
+| | Set Suite Variable | ${dut2_if1}
+| | Set Suite Variable | ${dut2_if2}
+
+| 3-node Performance Suite Setup
+| | 3-node Topology Variables Setup
+| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | L2
+
+| 3-node Performance Suite Teardown
+| | Teardown traffic generator | ${tg}
+
+| IPv4 forwarding initialized in a 3-node topology
+| | Setup nodes for IPv4 testing
+
+| L2 bridge domain initialized in a 3-node circular topology
 | | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | Sleep | 10 | Wait for interfaces initialization
 
 | L2 xconnect initialized in a 3-node circular topology
-| | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
-| | ...          | ${nodes['TG']}
-| | Compute Path
-| | ${src_if} | ${tg}= | Next Interface
-| | ${dut1_if1} | ${dut1}= | Next Interface
-| | ${dut1_if2} | ${dut1}= | Next Interface
-| | ${dut2_if1} | ${dut2}= | Next Interface
-| | ${dut2_if2} | ${dut2}= | Next Interface
-| | ${dst_if} | ${tg}= | Next Interface
 | | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | Sleep | 10 | Wait for interfaces initialization
 
 | Traffic should pass with no loss
 | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
 | | Send traffic on | ${nodes} | ${duration}
 | | ...             | ${rate} | ${framesize} | ${topology_type}
-| | Show statistics on all DUTs
 | | No traffic loss occured
 
 | Show statistics on all DUTs
-| | Vpp show stats | ${nodes['DUT1']}
-| | Vpp show stats | ${nodes['DUT2']}
+| | Sleep | 10 | Waiting for statistics to be collected
+| | Vpp show stats | ${dut1}
+| | Vpp show stats | ${dut2}