From 229f32b91828e7de865a137dbf1f4a2066004d49 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Wed, 21 Aug 2024 19:15:47 +0200
Subject: fix(ip4scale6): 6 TRex ports means 6 traffic directions

Without this, Robot computes from single-port load incorrectly.

Change-Id: I4c83e959c64be1e7d2dd557db20b95be1ce3d0ae
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 GPL/tools/trex/trex_stl_profile.py                                  | 4 ++--
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-ndrpdr.robot     | 1 +
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-rnd-ndrpdr.robot | 1 +
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-ndrpdr.robot      | 1 +
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-rnd-ndrpdr.robot  | 1 +
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-ndrpdr.robot       | 1 +
 tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-rnd-ndrpdr.robot   | 1 +
 7 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/GPL/tools/trex/trex_stl_profile.py b/GPL/tools/trex/trex_stl_profile.py
index ac53e90571..e3a3c8c0f9 100644
--- a/GPL/tools/trex/trex_stl_profile.py
+++ b/GPL/tools/trex/trex_stl_profile.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
 #
 # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
@@ -190,7 +190,7 @@ def simple_burst(
 
         # Choose rate and start traffic:
         client.start(
-            ports=ports[::] if traffic_directions == 2 else ports[::2],
+            ports=ports[::2] if traffic_directions == 1 else ports[::],
             mult=rate,
             duration=duration,
             force=force,
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-ndrpdr.robot
index a091ee6936..fd86c564a4 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-ndrpdr.robot
@@ -66,6 +66,7 @@
 | ${rxq_ratio}= | ${3}
 # Traffic profile
 | ${traffic_profile}= | trex-stl-ethip4-ip4dst${rts_per_flow}-${nic_pfs}p
+| ${traffic_directions}= | ${6}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-rnd-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-rnd-ndrpdr.robot
index bc01eefb2c..abb3aa72da 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-rnd-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale600k-rnd-ndrpdr.robot
@@ -66,6 +66,7 @@
 | ${rxq_ratio}= | ${3}
 # Traffic profile
 | ${traffic_profile}= | trex-stl-ethip4-ip4dst-rnd${rts_per_flow}-${nic_pfs}p
+| ${traffic_directions}= | ${6}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-ndrpdr.robot
index b1e83b1d9b..76110ed346 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-ndrpdr.robot
@@ -66,6 +66,7 @@
 | ${rxq_ratio}= | ${3}
 # Traffic profile
 | ${traffic_profile}= | trex-stl-ethip4-ip4dst${rts_per_flow}-${nic_pfs}p
+| ${traffic_directions}= | ${6}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-rnd-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-rnd-ndrpdr.robot
index e72ba8e1a8..a5606e70fb 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-rnd-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale60k-rnd-ndrpdr.robot
@@ -66,6 +66,7 @@
 | ${rxq_ratio}= | ${3}
 # Traffic profile
 | ${traffic_profile}= | trex-stl-ethip4-ip4dst-rnd${rts_per_flow}-${nic_pfs}p
+| ${traffic_directions}= | ${6}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-ndrpdr.robot
index 8a17f390c7..c1413ed215 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-ndrpdr.robot
@@ -66,6 +66,7 @@
 | ${rxq_ratio}= | ${3}
 # Traffic profile
 | ${traffic_profile}= | trex-stl-ethip4-ip4dst${rts_per_flow}-${nic_pfs}p
+| ${traffic_directions}= | ${6}
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-rnd-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-rnd-ndrpdr.robot
index 8cd519d499..7b6dc8e95e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-rnd-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-rnd-ndrpdr.robot
@@ -66,6 +66,7 @@
 | ${rxq_ratio}= | ${3}
 # Traffic profile
 | ${traffic_profile}= | trex-stl-ethip4-ip4dst-rnd${rts_per_flow}-${nic_pfs}p
+| ${traffic_directions}= | ${6}
 
 *** Keywords ***
 | Local Template
-- 
cgit 1.2.3-korg