X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Ftcp%2F10ge2p1x520-ethip4tcphttp-httpserver.robot;h=f5dd934ed46df3068f532a8dc5092c2addd2fd52;hp=867c3177d5c4217a559acb9a649aa4b74f8caf97;hb=ad71afc5baa8008bd5d4ea26f51a71eefe3fbe62;hpb=a95c54b7821596402e0aa7136cd7d1de71a5b187

diff --git a/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot b/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
index 867c3177d5..f5dd934ed4 100644
--- a/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
+++ b/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
@@ -23,9 +23,11 @@
 | Suite Setup | Set up 3-node performance topology with wrk and DUT's NIC model
 | ... | Intel-XL710
 | ...
-| Test Setup | Set up performance test
+| 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,15 +39,18 @@
 | ... | *[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 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
 | | | ... | WITH NAME | ${dut}
+| | | Run keyword | ${dut}.Add api segment global size | 2G
+| | | Run keyword | ${dut}.Add api segment api size | 1G
 | | | Run keyword | ${dut}.Add TCP preallocated connections | 1000000
 | | | Run keyword | ${dut}.Add TCP preallocated half open connections | 1000000
 | | | Run keyword | ${dut}.Add session event queue length | 1000000
@@ -57,12 +62,20 @@
 | | | Run keyword | ${dut}.Add session local endpoints table buckets | 2500000
 | | | Run keyword | ${dut}.Add session local endpoints table memory | 3g
 | | Apply startup configuration on all VPP DUTs
-| | Set up HTTP server on the VPP node | 192.168.10.2 | 24
 | | Run Keyword If | '${test_type}' == 'bw'
+| | ... | Run keywords
+| | ... | Set up HTTP server with paramters on the VPP node
+| | ... | 500000 | 4 | 4000m | AND
 | | ... | Measure throughput | ${traffic_profile}
 | | ... | ELSE IF | '${test_type}' == 'rps'
+| | ... | Run keywords
+| | ... | Set up HTTP server with paramters on the VPP node
+| | ... | 500000 | 4 | 4000m | AND
 | | ... | Measure requests per second | ${traffic_profile}
 | | ... | ELSE IF | '${test_type}' == 'cps'
+| | ... | Run keywords
+| | ... | Set up HTTP server with paramters on the VPP node
+| | ... | 31000 | 64 | 4000m | AND
 | | ... | Measure connections per second | ${traffic_profile}
 
 *** Test Cases ***
@@ -70,58 +83,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-1u1c1con-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-1u1c1con-cps | wt=2 | rxq=1
+| | [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-1u1c1con-cps | wt=4 | rxq=2
+| | [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-1u1c50con-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-1u1c50con-rps | wt=2 | rxq=1
+| | [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-1u1c50con-rps | wt=4 | rxq=2
+| | [Tags] | 4C | TCP_RPS
+| | traffic_profile=wrk-sf-2n-ethip4tcphttp-8u8c50con-rps | phy_cores=${4}
 | | ... | test_type=rps