diff --git a/neutron/agent/linux/iptables_firewall.py b/neutron/agent/linux/iptables_firewall.py index 06db216ae19..84629b02df2 100644 --- a/neutron/agent/linux/iptables_firewall.py +++ b/neutron/agent/linux/iptables_firewall.py @@ -29,7 +29,6 @@ from neutron.agent.linux import ipset_manager from neutron.agent.linux import iptables_comments as ic from neutron.agent.linux import iptables_manager from neutron.agent.linux import utils -from neutron.common import constants as n_const from neutron.common import exceptions as n_exc from neutron.common import ipv6_utils from neutron.common import utils as c_utils @@ -381,7 +380,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver): else: mac_ipv6_pairs.append((mac, ip_address)) lla = str(ipv6_utils.get_ipv6_addr_by_EUI64( - n_const.IPV6_LLA_PREFIX, mac)) + constants.IPv6_LLA_PREFIX, mac)) mac_ipv6_pairs.append((mac, lla)) def _spoofing_rule(self, port, ipv4_rules, ipv6_rules): diff --git a/neutron/agent/linux/openvswitch_firewall/firewall.py b/neutron/agent/linux/openvswitch_firewall/firewall.py index b352ceb187f..1f0bbba7f6d 100644 --- a/neutron/agent/linux/openvswitch_firewall/firewall.py +++ b/neutron/agent/linux/openvswitch_firewall/firewall.py @@ -87,7 +87,7 @@ class OFPort(object): self.vlan_tag = vlan_tag self.mac = ovs_port.vif_mac self.lla_address = str(ipv6_utils.get_ipv6_addr_by_EUI64( - constants.IPV6_LLA_PREFIX, self.mac)) + lib_const.IPv6_LLA_PREFIX, self.mac)) self.ofport = ovs_port.ofport self.sec_groups = list() self.fixed_ips = port_dict.get('fixed_ips', []) diff --git a/neutron/agent/linux/pd.py b/neutron/agent/linux/pd.py index b612b74f5b4..d8dab29d860 100644 --- a/neutron/agent/linux/pd.py +++ b/neutron/agent/linux/pd.py @@ -17,6 +17,7 @@ import functools import signal import eventlet +from neutron_lib import constants as n_const from oslo_config import cfg from oslo_log import log as logging import six @@ -175,7 +176,7 @@ class PrefixDelegation(object): @staticmethod def _get_lla(mac): - lla = ipv6_utils.get_ipv6_addr_by_EUI64(l3_constants.IPV6_LLA_PREFIX, + lla = ipv6_utils.get_ipv6_addr_by_EUI64(n_const.IPv6_LLA_PREFIX, mac) return lla diff --git a/neutron/common/constants.py b/neutron/common/constants.py index 60908570f60..20a20470ad0 100644 --- a/neutron/common/constants.py +++ b/neutron/common/constants.py @@ -72,8 +72,6 @@ DHCPV6_STATELESS = 'dhcpv6-stateless' IPV6_SLAAC = 'slaac' IPV6_MODES = [DHCPV6_STATEFUL, DHCPV6_STATELESS, IPV6_SLAAC] -IPV6_LLA_PREFIX = 'fe80::/64' - # Special provisional prefix for IPv6 Prefix Delegation PROVISIONAL_IPV6_PD_PREFIX = '::/64' diff --git a/neutron/db/securitygroups_rpc_base.py b/neutron/db/securitygroups_rpc_base.py index 7b63ab7cc9d..661375d81c8 100644 --- a/neutron/db/securitygroups_rpc_base.py +++ b/neutron/db/securitygroups_rpc_base.py @@ -19,7 +19,6 @@ from oslo_log import log as logging from sqlalchemy.orm import exc from neutron._i18n import _, _LW -from neutron.common import constants as n_const from neutron.common import ipv6_utils as ipv6 from neutron.common import utils from neutron.db.allowed_address_pairs import models as addr_pair @@ -319,7 +318,7 @@ class SecurityGroupServerRpcMixin(sg_db.SecurityGroupDbMixin): for mac_address, network_id, ip in query: if (netaddr.IPAddress(ip).version == 6 and not netaddr.IPAddress(ip).is_link_local()): - ip = str(ipv6.get_ipv6_addr_by_EUI64(n_const.IPV6_LLA_PREFIX, + ip = str(ipv6.get_ipv6_addr_by_EUI64(const.IPv6_LLA_PREFIX, mac_address)) if ip not in ips[network_id]: ips[network_id].append(ip) @@ -380,7 +379,7 @@ class SecurityGroupServerRpcMixin(sg_db.SecurityGroupDbMixin): 'found for IPv6 RA'), subnet['id']) return lla_ip = str(ipv6.get_ipv6_addr_by_EUI64( - n_const.IPV6_LLA_PREFIX, + const.IPv6_LLA_PREFIX, mac_address)) return lla_ip diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py index 2f9efad5c00..ccb810fc414 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py @@ -925,7 +925,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, if netaddr.IPNetwork(ip).version == 6} # Allow neighbor advertisements for LLA address. ipv6_addresses |= {str(ipv6.get_ipv6_addr_by_EUI64( - c_const.IPV6_LLA_PREFIX, mac)) + n_const.IPv6_LLA_PREFIX, mac)) for mac in mac_addresses} if not has_zero_prefixlen_address(ipv6_addresses): # Install protection only when prefix is not zero because a /0 diff --git a/neutron/tests/unit/agent/test_securitygroups_rpc.py b/neutron/tests/unit/agent/test_securitygroups_rpc.py index 8436effc150..68f063663b3 100644 --- a/neutron/tests/unit/agent/test_securitygroups_rpc.py +++ b/neutron/tests/unit/agent/test_securitygroups_rpc.py @@ -581,7 +581,7 @@ class SGServerRpcCallBackTestCase(test_sg.SecurityGroupDBTestCase): dhcp_rest = self.deserialize(self.fmt, dhcp_port) dhcp_mac = dhcp_rest['port']['mac_address'] dhcp_lla_ip = str(ipv6.get_ipv6_addr_by_EUI64( - n_const.IPV6_LLA_PREFIX, + const.IPv6_LLA_PREFIX, dhcp_mac)) res1 = self._create_port( @@ -705,7 +705,7 @@ class SGServerRpcCallBackTestCase(test_sg.SecurityGroupDBTestCase): gateway_mac = gateway_res['port']['mac_address'] gateway_port_id = gateway_res['port']['id'] gateway_lla_ip = str(ipv6.get_ipv6_addr_by_EUI64( - n_const.IPV6_LLA_PREFIX, + const.IPv6_LLA_PREFIX, gateway_mac)) ports_rest1 = self._make_port( @@ -773,7 +773,7 @@ class SGServerRpcCallBackTestCase(test_sg.SecurityGroupDBTestCase): gateway_mac = gateway_res['port']['mac_address'] gateway_port_id = gateway_res['port']['id'] gateway_lla_ip = str(ipv6.get_ipv6_addr_by_EUI64( - n_const.IPV6_LLA_PREFIX, + const.IPv6_LLA_PREFIX, gateway_mac)) # Create another router interface port interface_res = self._make_port( @@ -848,7 +848,7 @@ class SGServerRpcCallBackTestCase(test_sg.SecurityGroupDBTestCase): gateway_mac = gateway_res['port']['mac_address'] gateway_port_id = gateway_res['port']['id'] gateway_lla_ip = str(ipv6.get_ipv6_addr_by_EUI64( - n_const.IPV6_LLA_PREFIX, + const.IPv6_LLA_PREFIX, gateway_mac)) ports_rest1 = self._make_port(