feat(tests): IPv6 fixes

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: I9bc9f9fe410c0fa78e20a234487e63eb42f3fe3f
(cherry picked from commit 67ac481efe85b85b9991069dda92467483bbf345)

6 files changed, 24 insertions, 30 deletions

diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
index 4f024e75fc..9149dad5ed 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -34,7 +34,7 @@
 | ... | - **[Enc] Packet Encapsulations:** Eth-IPv6 for IPv6 routing.
 | ... |
 | ... | - **[Cfg] DUT configuration:** DUT1 is configured with IPv6 routing \
-| ... | 2x100k static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.
+| ... | 2x100k static IPv6 /128 route entries. DUT1 is tested with ${nic_name}.
 | ... |
 | ... | - **[Ver] TG verification:** TG finds and reports throughput NDR (Non \
 | ... | Drop Rate) with zero packet loss tolerance and throughput PDR \
@@ -64,7 +64,7 @@
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}
+| ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}-${nic_pfs}p
 
 *** Keywords ***
 | Local Template
@@ -89,8 +89,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
-| | And Initialize IPv6 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
+| | And Initialize IPv6 Forwarding | count=${rts_per_flow} | pfs=${nic_pfs}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-rnd-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-rnd-ndrpdr.robot
index 0462070085..2cc8dce84e 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-rnd-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-rnd-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -34,7 +34,7 @@
 | ... | - **[Enc] Packet Encapsulations:** Eth-IPv6 for IPv6 routing.
 | ... |
 | ... | - **[Cfg] DUT configuration:** DUT1 is configured with IPv6 routing \
-| ... | 2x100k static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.
+| ... | 2x100k static IPv6 /128 route entries. DUT1 is tested with ${nic_name}.
 | ... |
 | ... | - **[Ver] TG verification:** TG finds and reports throughput NDR (Non \
 | ... | Drop Rate) with zero packet loss tolerance and throughput PDR \
@@ -64,7 +64,7 @@
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${100000}
 # Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}-rnd
+| ${traffic_profile}= | trex-stl-ethip6-ip6dst-rnd${rts_per_flow}-${nic_pfs}p
 
 *** Keywords ***
 | Local Template
@@ -89,8 +89,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
-| | And Initialize IPv6 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
+| | And Initialize IPv6 Forwarding | count=${rts_per_flow} | pfs=${nic_pfs}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
index 452e0c52d9..f5d80bdfd1 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -34,7 +34,7 @@
 | ... | - **[Enc] Packet Encapsulations:** Eth-IPv6 for IPv6 routing.
 | ... |
 | ... | - **[Cfg] DUT configuration:** DUT1 is configured with IPv6 routing \
-| ... | 2x10k static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.
+| ... | 2x10k static IPv6 /128 route entries. DUT1 is tested with ${nic_name}.
 | ... |
 | ... | - **[Ver] TG verification:** TG finds and reports throughput NDR (Non \
 | ... | Drop Rate) with zero packet loss tolerance and throughput PDR \
@@ -64,7 +64,7 @@
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}
+| ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}-${nic_pfs}p
 
 *** Keywords ***
 | Local Template
@@ -89,8 +89,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
-| | And Initialize IPv6 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
+| | And Initialize IPv6 Forwarding | count=${rts_per_flow} | pfs=${nic_pfs}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-rnd-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-rnd-ndrpdr.robot
index 1651ad120a..4861ea19cb 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-rnd-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-rnd-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -34,7 +34,7 @@
 | ... | - **[Enc] Packet Encapsulations:** Eth-IPv6 for IPv6 routing.
 | ... |
 | ... | - **[Cfg] DUT configuration:** DUT1 is configured with IPv6 routing \
-| ... | 2x10k static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.
+| ... | 2x10k static IPv6 /128 route entries. DUT1 is tested with ${nic_name}.
 | ... |
 | ... | - **[Ver] TG verification:** TG finds and reports throughput NDR (Non \
 | ... | Drop Rate) with zero packet loss tolerance and throughput PDR \
@@ -64,7 +64,7 @@
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${10000}
 # Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}-rnd
+| ${traffic_profile}= | trex-stl-ethip6-ip6dst-rnd${rts_per_flow}-${nic_pfs}p
 
 *** Keywords ***
 | Local Template
@@ -89,8 +89,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
-| | And Initialize IPv6 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
+| | And Initialize IPv6 Forwarding | count=${rts_per_flow} | pfs=${nic_pfs}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
index b6cebce232..12d5045a41 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -34,7 +34,7 @@
 | ... | - **[Enc] Packet Encapsulations:** Eth-IPv6 for IPv6 routing.
 | ... |
 | ... | - **[Cfg] DUT configuration:** DUT1 is configured with IPv6 routing \
-| ... | 2x1M static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.
+| ... | 2x1M static IPv6 /128 route entries. DUT1 is tested with ${nic_name}.
 | ... |
 | ... | - **[Ver] TG verification:** TG finds and reports throughput NDR (Non \
 | ... | Drop Rate) with zero packet loss tolerance and throughput PDR \
@@ -64,7 +64,7 @@
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}
+| ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}-${nic_pfs}p
 
 *** Keywords ***
 | Local Template
@@ -89,8 +89,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
-| | And Initialize IPv6 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
+| | And Initialize IPv6 Forwarding | count=${rts_per_flow} | pfs=${nic_pfs}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-rnd-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-rnd-ndrpdr.robot
index 38957603dc..d2d0512efd 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-rnd-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-rnd-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -34,7 +34,7 @@
 | ... | - **[Enc] Packet Encapsulations:** Eth-IPv6 for IPv6 routing.
 | ... |
 | ... | - **[Cfg] DUT configuration:** DUT1 is configured with IPv6 routing \
-| ... | 2x1M static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.
+| ... | 2x1M static IPv6 /128 route entries. DUT1 is tested with ${nic_name}.
 | ... |
 | ... | - **[Ver] TG verification:** TG finds and reports throughput NDR (Non \
 | ... | Drop Rate) with zero packet loss tolerance and throughput PDR \
@@ -64,7 +64,7 @@
 | ${overhead}= | ${0}
 | ${rts_per_flow}= | ${1000000}
 # Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip6-ip6dst${rts_per_flow}-rnd
+| ${traffic_profile}= | trex-stl-ethip6-ip6dst-rnd${rts_per_flow}-${nic_pfs}p
 
 *** Keywords ***
 | Local Template
@@ -89,8 +89,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
-| | And Initialize IPv6 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
+| | And Initialize IPv6 Forwarding | count=${rts_per_flow} | pfs=${nic_pfs}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***