Align suite/test teardown/setup

[csit.git] / 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 7533ae9..c995a58 100644 (file)
--- a/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
+++ b/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
@@ -15,16 +15,17 @@
 
 | Library  | resources.tools.wrk.wrk
 | Resource | resources/libraries/robot/wrk/wrk_utils.robot
-| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/tcp/tcp_setup.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | HTTP | TCP
 | ...
-| Suite Setup | Set up 3-node performance topology with wrk and DUT's NIC model
-| ... | Intel-XL710
+| Suite Setup | Setup suite single link | wrk
+| Suite Teardown | Tear down suite
+| Test Setup | Setup test
+| Test Teardown | Tear down test
 | ...
-| Test Setup | Set up 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.*
@@ -36,12 +37,16 @@
 | ... | *[Ver] TG verification:*
 | ... | *[Ref] Applicable standard specifications:*
 
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+
 *** 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 PCI devices to DUTs in 3-node single link 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}
 | | | Import Library | resources.libraries.python.VppConfigGenerator
@@ -72,7 +77,7 @@
 | | ... | ELSE IF | '${test_type}' == 'cps'
 | | ... | Run keywords
 | | ... | Set up HTTP server with paramters on the VPP node
-| | ... | 10000 | 64 | 4000m | AND
+| | ... | 31000 | 64 | 4000m | AND
 | | ... | Measure connections per second | ${traffic_profile}
 
 *** Test Cases ***
@@ -80,58 +85,46 @@
 | | [Documentation]
 | | ... | Measure number of connections per second using wrk.
 | | ...
-| | [Tags] | 1T1C | TCP_CPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | wt=1 | rxq=1
+| | [Tags] | 1C | TCP_CPS
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | phy_cores=${1}
 | | ... | test_type=cps
 
 | tc02-2t2c-ethip4tcphttp-httpserver-cps
 | | [Documentation]
 | | ... | Measure number of connections per second using wrk.
 | | ...
-| | [Tags] | 2T2C | TCP_CPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | wt=2 | rxq=2
+| | [Tags] | 2C | TCP_CPS
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | phy_cores=${2}
 | | ... | test_type=cps
 
 | tc03-4t4c-ethip4tcphttp-httpserver-cps
 | | [Documentation]
 | | ... | Measure number of connections per second using wrk.
 | | ...
-| | [Tags] | 4T4C | TCP_CPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | wt=4 | rxq=4
+| | [Tags] | 4C | TCP_CPS
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-cps | phy_cores=${4}
 | | ... | test_type=cps
 
 | tc04-1t1c-ethip4tcphttp-httpserver-rps
 | | [Documentation]
 | | ... | Measure and report number of requests per second using wrk.
 | | ...
-| | [Tags] | 1T1C | TCP_RPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | wt=1 | rxq=1
+| | [Tags] | 1C | TCP_RPS
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | phy_cores=${1}
 | | ... | test_type=rps
 
 | tc05-2t2c-ethip4tcphttp-httpserver-rps
 | | [Documentation]
 | | ... | Measure and report number of requests per second using wrk.
 | | ...
-| | [Tags] | 2T2C | TCP_RPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | wt=2 | rxq=2
+| | [Tags] | 2C | TCP_RPS
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | phy_cores=${2}
 | | ... | test_type=rps
 
 | tc06-4t4c-ethip4tcphttp-httpserver-rps
 | | [Documentation]
 | | ... | Measure and report number of requests per second using wrk.
 | | ...
-| | [Tags] | 4T4C | TCP_RPS
-| | ...
-| | [Template] | Measure throughput or rps or cps
-| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | wt=4 | rxq=4
+| | [Tags] | 4C | TCP_RPS
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | phy_cores=${4}
 | | ... | test_type=rps