openstack
/
neutron
Code Issues Proposed changes

Merge "Change in-tree code to use moved get_ip_version()"

This commit is contained in:
Jenkins 2017-03-10 05:23:35 +00:00 committed by Gerrit Code Review
parent b7ed5a6938 bd64327007
commit 8a5eac2fe1
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/l3/dvr_fip_ns.py
View File

@ -231,7 +231,7 @@ class FipNamespace(namespaces.Namespace):
for subnet in gateway_port.get('subnets', []):
gateway_ip = subnet.get('gateway_ip', None)
if gateway_ip:
ip_version = ip_lib.get_ip_version(gateway_ip)
ip_version = common_utils.get_ip_version(gateway_ip)
gw_ips[ip_version] = gateway_ip
return gw_ips
@ -254,7 +254,7 @@ class FipNamespace(namespaces.Namespace):
def _add_default_gateway_for_fip(self, gw_ip, ip_device, tbl_index):
"""Adds default gateway for fip based on the tbl_index passed."""
if tbl_index is None:
ip_version = ip_lib.get_ip_version(gw_ip)
ip_version = common_utils.get_ip_version(gw_ip)
tbl_index_list = self.get_fip_table_indexes(ip_version)
for tbl_index in tbl_index_list:
ip_device.route.add_gateway(gw_ip, table=tbl_index)

2
neutron/agent/l3/router_info.py
View File

@ -965,7 +965,7 @@ class RouterInfo(object):
device_name = name_generator(p['id'])
ip_cidrs = common_utils.fixed_ip_cidrs(p['fixed_ips'])
port_as_marks = self.get_port_address_scope_mark(p)
for ip_version in {ip_lib.get_ip_version(cidr)
for ip_version in {common_utils.get_ip_version(cidr)
for cidr in ip_cidrs}:
devicename_scopemark[ip_version][device_name] = (
port_as_marks[ip_version])

18
neutron/agent/linux/ip_lib.py
View File

@ -468,7 +468,7 @@ class IpRuleCommand(IpCommandBase):
return tuple(args)
def add(self, ip, **kwargs):
ip_version = get_ip_version(ip)
ip_version = common_utils.get_ip_version(ip)
# In case if we need to add in a rule based on incoming
# interface we don't need to pass in the ip.
@ -481,7 +481,7 @@ class IpRuleCommand(IpCommandBase):
self._as_root([ip_version], args_tuple)
def delete(self, ip, **kwargs):
ip_version = get_ip_version(ip)
ip_version = common_utils.get_ip_version(ip)
# TODO(Carl) ip ignored in delete, okay in general?
@ -583,7 +583,7 @@ class IpAddrCommand(IpDeviceCommandBase):
self._as_root([net.version], tuple(args))
def delete(self, cidr):
ip_version = get_ip_version(cidr)
ip_version = common_utils.get_ip_version(cidr)
self._as_root([ip_version],
('del', cidr,
'dev', self.name))
@ -690,7 +690,7 @@ class IpRouteCommand(IpDeviceCommandBase):
return ['dev', self.name] if self.name else []
def add_gateway(self, gateway, metric=None, table=None):
ip_version = get_ip_version(gateway)
ip_version = common_utils.get_ip_version(gateway)
args = ['replace', 'default', 'via', gateway]
if metric:
args += ['metric', metric]
@ -708,7 +708,7 @@ class IpRouteCommand(IpDeviceCommandBase):
raise exceptions.DeviceNotFoundError(device_name=self.name)
def delete_gateway(self, gateway, table=None):
ip_version = get_ip_version(gateway)
ip_version = common_utils.get_ip_version(gateway)
args = ['del', 'default',
'via', gateway]
args += self._dev_args()
@ -794,7 +794,7 @@ class IpRouteCommand(IpDeviceCommandBase):
self._as_root([ip_version], tuple(args))
def add_route(self, cidr, via=None, table=None, **kwargs):
ip_version = get_ip_version(cidr)
ip_version = common_utils.get_ip_version(cidr)
args = ['replace', cidr]
if via:
args += ['via', via]
@ -805,7 +805,7 @@ class IpRouteCommand(IpDeviceCommandBase):
self._run_as_root_detect_device_not_found([ip_version], tuple(args))
def delete_route(self, cidr, via=None, table=None, **kwargs):
ip_version = get_ip_version(cidr)
ip_version = common_utils.get_ip_version(cidr)
args = ['del', cidr]
if via:
args += ['via', via]
@ -982,7 +982,7 @@ def add_neigh_entry(ip_address, mac_address, device, namespace=None, **kwargs):
:param device: Device name to use in adding entry
:param namespace: The name of the namespace in which to add the entry
"""
ip_version = get_ip_version(ip_address)
ip_version = common_utils.get_ip_version(ip_address)
privileged.add_neigh_entry(ip_version,
ip_address,
mac_address,
@ -1000,7 +1000,7 @@ def delete_neigh_entry(ip_address, mac_address, device, namespace=None,
:param device: Device name to use in deleting entry
:param namespace: The name of the namespace in which to delete the entry
"""
ip_version = get_ip_version(ip_address)
ip_version = common_utils.get_ip_version(ip_address)
privileged.delete_neigh_entry(ip_version,
ip_address,
mac_address,

3
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -39,6 +39,7 @@ from neutron.common import config as common_config
from neutron.common import exceptions
from neutron.common import profiler as setup_profiler
from neutron.common import topics
from neutron.common import utils
from neutron.plugins.common import constants as p_const
from neutron.plugins.common import utils as p_utils
from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb
@ -656,7 +657,7 @@ class LinuxBridgeManager(amb.CommonAgentManagerBase):
LOG.debug('Using %s VXLAN mode', self.vxlan_mode)
def fdb_ip_entry_exists(self, mac, ip, interface):
ip_version = ip_lib.get_ip_version(ip)
ip_version = utils.get_ip_version(ip)
entry = ip_lib.dump_neigh_entries(ip_version, interface, dst=ip,
lladdr=mac)
return entry != []

3
neutron/tests/common/conn_testers.py
View File

@ -20,7 +20,6 @@ from neutron_lib import constants
from oslo_utils import uuidutils
from neutron.agent import firewall
from neutron.agent.linux import ip_lib
from neutron.common import constants as n_consts
from neutron.common import utils as common_utils
from neutron.tests.common import machine_fixtures
@ -174,7 +173,7 @@ class ConnectionTester(fixtures.Fixture):
def _test_icmp_connectivity(self, direction, protocol, src_port, dst_port):
src_namespace, ip_address = self._get_namespace_and_address(direction)
ip_version = ip_lib.get_ip_version(ip_address)
ip_version = common_utils.get_ip_version(ip_address)
icmp_timeout = ICMP_VERSION_TIMEOUTS[ip_version]
try:
net_helpers.assert_ping(src_namespace, ip_address,

2
neutron/tests/common/net_helpers.py
View File

@ -379,7 +379,7 @@ class Pinger(object):
def start(self):
if self.proc and self.proc.is_running:
raise RuntimeError("This pinger has already a running process")
ip_version = ip_lib.get_ip_version(self.address)
ip_version = common_utils.get_ip_version(self.address)
ping_exec = 'ping' if ip_version == 4 else 'ping6'
cmd = [ping_exec, self.address, '-W', str(self.timeout)]
if self.count:

2
neutron/tests/functional/agent/l3/test_keepalived_state_change.py
View File

@ -31,7 +31,7 @@ from neutron.tests.functional import base
def has_expected_arp_entry(device_name, namespace, ip, mac):
ip_version = ip_lib.get_ip_version(ip)
ip_version = utils.get_ip_version(ip)
entry = ip_lib.dump_neigh_entries(ip_version, device_name, namespace,
dst=ip, lladdr=mac)
return entry != []