performance tests: 2core, test teardown, remove UDP header

- testing on 2 core VPP
- show statistics only if test fails
- remove UDP header from packet

Change-Id: I5b47330a0bbc4602e8e8eb19fcc481a7635bd2a5
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>

2 files changed, 12 insertions, 9 deletions

diff --git a/resources/tools/t-rex-stateless.py b/resources/tools/t-rex-stateless.py
index d93a0ac029..eacf4b8d18 100755
--- a/resources/tools/t-rex-stateless.py
+++ b/resources/tools/t-rex-stateless.py
@@ -79,8 +79,8 @@ def create_packets(traffic_options, frame_size=64):
     p2_dst_start_ip = traffic_options['p2_dst_start_ip']
     #p2_dst_end_ip = traffic_options['p2_dst_end_ip']
 
-    base_pkt_a = Ether()/IP(src=p1_src_start_ip, dst=p1_dst_start_ip)/UDP(dport=12, sport=1025, chksum=0)
-    base_pkt_b = Ether()/IP(src=p2_src_start_ip, dst=p2_dst_start_ip)/UDP(dport=12, sport=1025, chksum=0)
+    base_pkt_a = Ether()/IP(src=p1_src_start_ip, dst=p1_dst_start_ip)
+    base_pkt_b = Ether()/IP(src=p2_src_start_ip, dst=p2_dst_start_ip)
 
     vm1 = CTRexScRaw([STLVmTupleGen(ip_min=p1_src_start_ip, ip_max=p1_src_end_ip,
                                     name="tuple"), # define tuple gen
diff --git a/tests/suites/performance/short.robot b/tests/suites/performance/short.robot
index eea9c176e1..598cd409bf 100644
--- a/tests/suites/performance/short.robot
+++ b/tests/suites/performance/short.robot
@@ -25,29 +25,30 @@
 | ... | ${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
 
@@ -86,6 +87,7 @@
 | | ${dst_if} | ${tg}= | Next Interface
 | | 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']}
@@ -99,14 +101,15 @@
 | | ${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
+| | Sleep | 10 | Waiting for statistics to be collected
 | | Vpp show stats | ${nodes['DUT1']}
 | | Vpp show stats | ${nodes['DUT2']}