FIX: TCP perf tests

Change-Id: I59ad8ef70fc2bedce14b52359922a002f960ab7a
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 2005c286222ebb1456a6dbe41fdca6dbfeb361f6)

3 files changed, 31 insertions, 2 deletions

diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 8a17a6ab7b..8f1774e2f5 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -16,6 +16,7 @@
 | Library | resources.tools.wrk.wrk
 | Resource | resources/libraries/robot/performance/performance_configuration.robot
 | Resource | resources/libraries/robot/performance/performance_utils.robot
+| Resource | resources/libraries/robot/tcp/tcp_setup.robot
 | Documentation | Performance suite keywords - Suite and test setups and
 | ... | teardowns.
 
@@ -514,6 +515,12 @@
 | | Reset VAT History On All DUTs | ${nodes}
 | | Create base startup configuration of VPP on all DUTs
 
+| Set up tcp performance test
+| | [Documentation] | Common test setup for TCP performance tests.
+| | ...
+| | Reset VAT History On All DUTs | ${nodes}
+| | Create base startup configuration of VPP for TCP tests on all DUTs
+
 | Set up performance test with Ligato Kubernetes
 | | [Documentation] | Common test setup for performance tests with Ligato \
 | | ... | Kubernetes.
diff --git a/resources/libraries/robot/tcp/tcp_setup.robot b/resources/libraries/robot/tcp/tcp_setup.robot
index 6da7f0fb15..42026a1e2c 100644
--- a/resources/libraries/robot/tcp/tcp_setup.robot
+++ b/resources/libraries/robot/tcp/tcp_setup.robot
@@ -20,6 +20,28 @@
 | Documentation | L2 keywords to set up VPP to test tcp.
 
 *** Keywords ***
+| Create base startup configuration of VPP for TCP tests on all DUTs
+| | [Documentation] | Create base startup configuration of VPP for TCP related
+| | ... | tests to all DUTs.
+| | ...
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Import Library | resources.libraries.python.VppConfigGenerator
+| | | ... | WITH NAME | ${dut}
+| | | Run keyword | ${dut}.Set Node |  ${nodes['${dut}']}
+| | | Run keyword | ${dut}.Add Unix Log
+| | | Run keyword | ${dut}.Add Unix CLI Listen
+| | | Run keyword | ${dut}.Add Unix Nodaemon
+| | | Run keyword | ${dut}.Add DPDK Socketmem | 4096,4096
+| | | Run keyword | ${dut}.Add DPDK Log Level | debug
+| | | Run keyword | ${dut}.Add DPDK Uio Driver | ${uio_driver}
+| | | Run keyword | ${dut}.Add Heapsize | 4G
+| | | Run keyword | ${dut}.Add Plugin | disable | default
+| | | Run keyword | ${dut}.Add Plugin | enable | @{plugins_to_enable}
+| | | Run keyword | ${dut}.Add IP6 Hash Buckets | 2000000
+| | | Run keyword | ${dut}.Add IP6 Heap Size | 4G
+| | | Run keyword | ${dut}.Add IP Heap Size | 4G
+
 | Set up HTTP server with paramters on the VPP node
 | | [Documentation]
 | | ... | Configure IP address on the port, set it up and start HTTP server on
diff --git a/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot b/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
index 7533ae9ea5..55f6982ff1 100644
--- a/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
+++ b/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
@@ -23,7 +23,7 @@
 | 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
 | ...
 | Documentation | *HTTP requests per seconds, connections per seconds and
@@ -72,7 +72,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 ***