diff --git a/ovn_bgp_agent/constants.py b/ovn_bgp_agent/constants.py index 86841301..12a3e6c8 100644 --- a/ovn_bgp_agent/constants.py +++ b/ovn_bgp_agent/constants.py @@ -32,6 +32,9 @@ FRR_SOCKET_PATH = "/run/frr/" IP_VERSION_6 = 6 IP_VERSION_4 = 4 +ARP_IPV4_PREFIX = "169.254." +NDP_IPV6_PREFIX = "fd53:d91e:400:7f17::" + BGP_MODE = 'BGP' EVPN_MODE = 'EVPN' diff --git a/ovn_bgp_agent/tests/unit/utils/test_linux_net.py b/ovn_bgp_agent/tests/unit/utils/test_linux_net.py index a978e405..f38ca59a 100644 --- a/ovn_bgp_agent/tests/unit/utils/test_linux_net.py +++ b/ovn_bgp_agent/tests/unit/utils/test_linux_net.py @@ -128,7 +128,7 @@ class TestLinuxNet(test_base.TestCase): linux_net.ensure_arp_ndp_enabled_for_bridge('fake-bridge', 511) # NOTE(ltomasbo): hardoced starting ipv4 is 192.168.0.0, and ipv6 is # fd53:d91e:400:7f17::0 - ipv4 = '192.168.1.255' # base + 511 offset + ipv4 = '169.254.1.255' # base + 511 offset ipv6 = 'fd53:d91e:400:7f17::1ff' # base + 5122 offset (to hex) calls = [mock.call(ipv4, 'fake-bridge'), mock.call(ipv6, 'fake-bridge')] @@ -144,7 +144,7 @@ class TestLinuxNet(test_base.TestCase): linux_net.ensure_arp_ndp_enabled_for_bridge('fake-bridge', 511, 11) # NOTE(ltomasbo): hardoced starting ipv4 is 192.168.0.0, and ipv6 is # fd53:d91e:400:7f17::0 - ipv4 = '192.168.1.255' # base + 511 offset + ipv4 = '169.254.1.255' # base + 511 offset ipv6 = 'fd53:d91e:400:7f17::1ff' # base + 5122 offset (to hex) calls = [mock.call(ipv4, 'fake-bridge'), mock.call(ipv6, 'fake-bridge')] diff --git a/ovn_bgp_agent/utils/linux_net.py b/ovn_bgp_agent/utils/linux_net.py index dfe3e208..846be067 100644 --- a/ovn_bgp_agent/utils/linux_net.py +++ b/ovn_bgp_agent/utils/linux_net.py @@ -94,8 +94,9 @@ def delete_device(device): def ensure_arp_ndp_enabled_for_bridge(bridge, offset, vlan_tag=None): - ipv4 = "192.168." + str(int(offset / 256)) + "." + str(offset % 256) - ipv6 = "fd53:d91e:400:7f17::%x" % offset + ipv4 = constants.ARP_IPV4_PREFIX + str(int(offset / 256)) + "." + str( + offset % 256) + ipv6 = constants.NDP_IPV6_PREFIX + "%x" % offset try: ovn_bgp_agent.privileged.linux_net.add_ip_to_dev(ipv4, bridge) except KeyError as e: