aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries
diff options
context:
space:
mode:
authorpmikus <peter.mikus@protonmail.ch>2024-04-18 10:37:09 +0000
committerPeter Mikus <peter.mikus@protonmail.ch>2024-04-18 12:12:44 +0000
commit67ac481efe85b85b9991069dda92467483bbf345 (patch)
tree003ca4928bf3a321015ea15bcdc93a38c269c145 /resources/libraries
parentde8b46886a590150bc5d403f9f556e6cbc99c3eb (diff)
feat(tests): IPv6 fixes
Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch> Change-Id: I9bc9f9fe410c0fa78e20a234487e63eb42f3fe3f
Diffstat (limited to 'resources/libraries')
-rw-r--r--resources/libraries/python/IPTopology.py34
1 files changed, 19 insertions, 15 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
+ )