From 44ab3dadf61808df3bb54ba462ba7fb9e669aec2 Mon Sep 17 00:00:00 2001 From: pmikus Date: Thu, 18 Apr 2024 10:37:09 +0000 Subject: feat(tests): IPv6 fixes Signed-off-by: Peter Mikus Change-Id: I9bc9f9fe410c0fa78e20a234487e63eb42f3fe3f (cherry picked from commit 67ac481efe85b85b9991069dda92467483bbf345) --- resources/libraries/python/IPTopology.py | 34 ++++++++++++---------- ...1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot | 9 +++--- ...0ge2p1x710-ethip6-ip6scale200k-rnd-ndrpdr.robot | 9 +++--- ...n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot | 9 +++--- ...10ge2p1x710-ethip6-ip6scale20k-rnd-ndrpdr.robot | 9 +++--- ...2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot | 9 +++--- ...-10ge2p1x710-ethip6-ip6scale2m-rnd-ndrpdr.robot | 9 +++--- 7 files changed, 43 insertions(+), 45 deletions(-) diff --git a/resources/libraries/python/IPTopology.py b/resources/libraries/python/IPTopology.py index 9648ed1881..3b459cd156 100644 --- a/resources/libraries/python/IPTopology.py +++ b/resources/libraries/python/IPTopology.py @@ -22,15 +22,17 @@ class IPTopology: """IP Topology Library.""" @staticmethod - def initialize_ipv4_forwarding(count=1, pfs=2): + def initialize_ipv4_forwarding(count=1, pfs=2, route_prefix=32): """ Custom setup of IPv4 forwarding with scalability of IP routes on all DUT nodes in 2-node / 3-node circular topology. :param count: Number of routes to configure. :param pfs: Number of physical interfaces to configure. + :param route_prefix: Route prefix to configure. :type count: int :type pfs: int + :type route_prefix: int """ topology = BuiltIn().get_variable_value("&{topology_info}") dut = topology["duts"][-1] @@ -79,34 +81,36 @@ class IPTopology: ) IPUtil.vpp_route_add( - topology["DUT1"], f"{i}0.0.0.0", 32, gateway=f"1.{l}.1.1", - interface=dut1_int1, count=count + topology["DUT1"], f"{i}0.0.0.0", route_prefix, + gateway=f"1.{l}.1.1", interface=dut1_int1, count=count ) if dut == "DUT2": IPUtil.vpp_route_add( - topology["DUT1"], f"{i+1}0.0.0.0", 32, gateway=f"3.{l}.3.2", - interface=dut1_int2, count=count + topology["DUT1"], f"{i+1}0.0.0.0", route_prefix, + gateway=f"3.{l}.3.2", interface=dut1_int2, count=count ) IPUtil.vpp_route_add( - topology["DUT2"], f"{i}0.0.0.0", 32, gateway=f"3.{l}.3.1", - interface=dut_int1, count=count + topology["DUT2"], f"{i}0.0.0.0", route_prefix, + gateway=f"3.{l}.3.1", interface=dut_int1, count=count ) IPUtil.vpp_route_add( - topology[dut], f"{i+1}0.0.0.0", 32, gateway=f"2.{l}.2.1", - interface=dut_int2, count=count + topology[dut], f"{i+1}0.0.0.0", route_prefix, + gateway=f"2.{l}.2.1", interface=dut_int2, count=count ) @staticmethod - def initialize_ipv6_forwarding(count=1, pfs=2): + def initialize_ipv6_forwarding(count=1, pfs=2, route_prefix=128): """ Custom setup of IPv6 forwarding with scalability of IP routes on all DUT nodes in 2-node / 3-node circular topology. :param count: Number of routes to configure. :param pfs: Number of physical interfaces to configure. + :param route_prefix: Route prefix to configure. :type count: int :type pfs: int + :type route_prefix: int """ topology = BuiltIn().get_variable_value("&{topology_info}") dut = topology["duts"][-1] @@ -155,19 +159,19 @@ class IPTopology: ) IPUtil.vpp_route_add( - topology["DUT1"], f"2{i}00::0", 64, + topology["DUT1"], f"2{i}00::0", route_prefix, gateway=f"2001:{l}::1", interface=dut1_int1, count=count ) if dut == "DUT2": IPUtil.vpp_route_add( - topology["DUT1"], f"2{i+1}00::0", 64, + topology["DUT1"], f"2{i+1}00::0", route_prefix, gateway=f"2003:{l}::2", interface=dut1_int2, count=count ) IPUtil.vpp_route_add( - topology["DUT2"], f"2{i}00::0", 64, + topology["DUT2"], f"2{i}00::0", route_prefix, gateway=f"2003:{l}::1", interface=dut_int1, count=count ) IPUtil.vpp_route_add( - topology[dut], f"2{i+1}00::0", 64, + topology[dut], f"2{i+1}00::0", route_prefix, gateway=f"2002:{l}::1", interface=dut_int2, count=count - ) \ No newline at end of file + ) 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 *** -- cgit 1.2.3-korg