From ad71afc5baa8008bd5d4ea26f51a71eefe3fbe62 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Tue, 10 Jul 2018 06:10:41 +0000
Subject: Refactor perf test cases

- Refactor Performance TCs due to changes in Hyperthreading and RXQ allocations.
- Simplify the structure of suite to avoid large refactors in future.

Change-Id: Ifb1b9719391f26745f075a900bd9fb39b6cb809c
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 .../tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot | 33 ++++++++--------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot')

diff --git a/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot b/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
index c900d52cf4..f5dd934ed4 100644
--- a/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
+++ b/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
@@ -26,6 +26,8 @@
 | Test Setup | Set up tcp performance test
 | Test Teardown | Tear down performance test with wrk
 | ...
+| Test Template | Local template
+| ...
 | Documentation | *HTTP requests per seconds, connections per seconds and
 | ... | throughput measurement.*
 | ...
@@ -37,10 +39,11 @@
 | ... | *[Ref] Applicable standard specifications:*
 
 *** Keywords ***
-| Measure throughput or rps or cps
-| | [Arguments] | ${traffic_profile} | ${wt} | ${rxq} | ${test_type}
+| Local template
+| | [Arguments] | ${traffic_profile} | ${phy_cores} | ${test_type}
+| | ... | ${rxq}=${None}
 | | ...
-| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
+| | Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | Add PCI devices to all DUTs
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
@@ -81,9 +84,7 @@
 | | ... | Measure number of connections per second using wrk.
 | | ...
 | | [Tags] | 1C | TCP_CPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | wt=1 | rxq=1
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | phy_cores=${1}
 | | ... | test_type=cps
 
 | tc02-2t2c-ethip4tcphttp-httpserver-cps
@@ -91,9 +92,7 @@
 | | ... | Measure number of connections per second using wrk.
 | | ...
 | | [Tags] | 2C | TCP_CPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | wt=2 | rxq=2
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | phy_cores=${2}
 | | ... | test_type=cps
 
 | tc03-4t4c-ethip4tcphttp-httpserver-cps
@@ -101,9 +100,7 @@
 | | ... | Measure number of connections per second using wrk.
 | | ...
 | | [Tags] | 4C | TCP_CPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | wt=4 | rxq=4
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | phy_cores=${4}
 | | ... | test_type=cps
 
 | tc04-1t1c-ethip4tcphttp-httpserver-rps
@@ -111,9 +108,7 @@
 | | ... | Measure and report number of requests per second using wrk.
 | | ...
 | | [Tags] | 1C | TCP_RPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | wt=1 | rxq=1
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | phy_cores=${1}
 | | ... | test_type=rps
 
 | tc05-2t2c-ethip4tcphttp-httpserver-rps
@@ -121,9 +116,7 @@
 | | ... | Measure and report number of requests per second using wrk.
 | | ...
 | | [Tags] | 2C | TCP_RPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | wt=2 | rxq=2
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | phy_cores=${2}
 | | ... | test_type=rps
 
 | tc06-4t4c-ethip4tcphttp-httpserver-rps
@@ -131,7 +124,5 @@
 | | ... | Measure and report number of requests per second using wrk.
 | | ...
 | | [Tags] | 4C | TCP_RPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | wt=4 | rxq=4
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | phy_cores=${4}
 | | ... | test_type=rps
-- 
cgit 1.2.3-korg