From 03613f1079bf5b86a58dd061fe4dd232ae52c1ea Mon Sep 17 00:00:00 2001
From: Miroslav Miklus <mmiklus@cisco.com>
Date: Fri, 19 Feb 2016 15:11:36 +0100
Subject: [PATCH] Performance suite: xconnect fix, show commands

- adjust L2 xconnect to changed xconnect library
- show [interface stats, hardware, errors, runtime]

Change-Id: I9dffebdd0abbde5107c6dc926210ba725e1e039c
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
---
 resources/libraries/robot/counters.robot |  8 ++++++++
 tests/suites/performance/short.robot     | 32 +++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/resources/libraries/robot/counters.robot b/resources/libraries/robot/counters.robot
index a8897685ad..45fe3531f6 100644
--- a/resources/libraries/robot/counters.robot
+++ b/resources/libraries/robot/counters.robot
@@ -37,3 +37,11 @@
 | | [Arguments] | ${node} | ${interface} | ${value}
 | | ${ipv4_counter}= | Vpp get ipv4 interface counter | ${node} | ${interface}
 | | Should Be Equal | ${ipv4_counter} | ${value}
+
+| Vpp show stats
+| | [Documentation] | Show [error, hardware, interface] stats
+| | [Arguments] | ${node}
+| | Vpp Dump Stats Table | ${node}
+| | Vpp Show Errors Verbose | ${node}
+| | Vpp Show Hardware Detail | ${node}
+| | Vpp Show Runtime Verbose | ${node}
diff --git a/tests/suites/performance/short.robot b/tests/suites/performance/short.robot
index 9497aa208e..ff6c726dba 100644
--- a/tests/suites/performance/short.robot
+++ b/tests/suites/performance/short.robot
@@ -16,7 +16,8 @@
 | Resource | resources/libraries/robot/bridge_domain.robot
 | Resource | resources/libraries/robot/ipv4.robot
 | Resource | resources/libraries/robot/l2_xconnect.robot
-| Library | resources/libraries/python/TrafficGenerator.py
+| Resource | resources/libraries/robot/counters.robot
+| Library | resources.libraries.python.TrafficGenerator
 | Library | resources.libraries.python.NodePath
 | Force Tags | topo-3node | PERFTEST
 | Test Setup | Setup all DUTs before test
@@ -27,15 +28,15 @@
 
 *** Test Cases ***
 | VPP passes 64B frames through L2 cross connect at 3.5mpps in 3-node topology
-| | Given L2 xconnect initialized in a 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
-| | Given L2 xconnect initialized in a 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
-| | Given L2 xconnect initialized in a 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
@@ -50,9 +51,9 @@
 | | Given L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | 10 | 10gbps | 9000 | 3-node-bridge
 
-#| VPP passes 64B frames through IPv4 forwarding at 30% in 3-node topology
+#| VPP passes 64B frames through IPv4 forwarding at 3.5mpps in 3-node topology
 #| | Given IPv4 forwarding initialized in a 3-node topology
-#| | Then Traffic should pass with no loss | 10 | 30 | 64 | 3-node-IPv4
+#| | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-IPv4
 
 #| VPP passes 1518B frames through IPv4 forwarding at 100% in 3-node topology
 #| | Given IPv4 forwarding initialized in a 3-node topology
@@ -71,7 +72,7 @@
 | | L2 setup xconnect on DUTs
 
 | IPv4 forwarding initialized in a 3-node topology
-| | Setup DUT nodes for IPv4 testing
+| | Setup nodes for IPv4 testing
 
 | L2 bridge domain initialized in a 3-node circular topology
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
@@ -86,9 +87,26 @@
 | | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
 
+| 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}
 
 | 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']}
-- 
2.16.6