diff --git a/neutron/agent/l2/extensions/fdb_population.py b/neutron/agent/l2/extensions/fdb_population.py index 0143bb66454..c0c9c50636d 100644 --- a/neutron/agent/l2/extensions/fdb_population.py +++ b/neutron/agent/l2/extensions/fdb_population.py @@ -20,7 +20,8 @@ from neutron_lib import constants from neutron_lib.utils import helpers from oslo_config import cfg from oslo_log import log as logging -from pyroute2.netlink import exceptions as netlink_exceptions +from pyroute2.netlink import exceptions \ + as netlink_exceptions # pylint: disable=no-name-in-module from neutron.agent.linux import bridge_lib from neutron.conf.agent import l2_ext_fdb_population diff --git a/neutron/agent/l3/dvr_local_router.py b/neutron/agent/l3/dvr_local_router.py index d8cd3483e98..af5ce59f792 100644 --- a/neutron/agent/l3/dvr_local_router.py +++ b/neutron/agent/l3/dvr_local_router.py @@ -19,7 +19,8 @@ import netaddr from neutron_lib import constants as lib_constants from oslo_log import log as logging from oslo_utils import excutils -from pyroute2.netlink import exceptions as pyroute2_exc +from pyroute2.netlink import exceptions \ + as pyroute2_exc # pylint: disable=no-name-in-module from neutron.agent.l3 import dvr_fip_ns from neutron.agent.l3 import dvr_router_base diff --git a/neutron/agent/l3/router_info.py b/neutron/agent/l3/router_info.py index 9ddcc8477ae..85c4829a03a 100644 --- a/neutron/agent/l3/router_info.py +++ b/neutron/agent/l3/router_info.py @@ -21,7 +21,8 @@ from neutron_lib.exceptions import l3 as l3_exc from neutron_lib.utils import helpers from oslo_log import log as logging from oslo_utils import netutils -from pyroute2.netlink import exceptions as pyroute2_exc +from pyroute2.netlink import exceptions \ + as pyroute2_exc # pylint: disable=no-name-in-module from neutron._i18n import _ from neutron.agent.l3 import namespaces diff --git a/neutron/agent/linux/bridge_lib.py b/neutron/agent/linux/bridge_lib.py index f7545e4cd8b..026a3508fc5 100644 --- a/neutron/agent/linux/bridge_lib.py +++ b/neutron/agent/linux/bridge_lib.py @@ -20,7 +20,8 @@ import collections import functools import os -from pyroute2.netlink import exceptions as netlink_exceptions +from pyroute2.netlink import exceptions \ + as netlink_exceptions # pylint: disable=no-name-in-module from neutron.agent.linux import ip_lib from neutron.privileged.agent.linux import ip_lib as priv_ip_lib diff --git a/neutron/agent/linux/interface.py b/neutron/agent/linux/interface.py index c4919def686..7caef279a2d 100644 --- a/neutron/agent/linux/interface.py +++ b/neutron/agent/linux/interface.py @@ -21,7 +21,8 @@ from neutron_lib import constants from neutron_lib import exceptions from oslo_log import log as logging from oslo_utils import excutils -from pyroute2.netlink import exceptions as pyroute2_exc +from pyroute2.netlink import exceptions \ + as pyroute2_exc # pylint: disable=no-name-in-module from neutron.agent.common import ovs_lib from neutron.agent.linux import ip_lib diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py index b4fd21d5778..f370e708991 100644 --- a/neutron/agent/linux/ip_lib.py +++ b/neutron/agent/linux/ip_lib.py @@ -25,11 +25,13 @@ from neutron_lib import exceptions from oslo_config import cfg from oslo_log import log as logging from oslo_utils import netutils -from pyroute2.netlink import exceptions as netlink_exceptions -from pyroute2.netlink import rtnl -from pyroute2.netlink.rtnl import ifaddrmsg -from pyroute2.netlink.rtnl import ifinfmsg -from pyroute2 import netns +from pyroute2.netlink import exceptions \ + as netlink_exceptions # pylint: disable=no-name-in-module +from pyroute2.netlink import rtnl # pylint: disable=no-name-in-module +from pyroute2.netlink.rtnl import \ + ifaddrmsg # pylint: disable=no-name-in-module +from pyroute2.netlink.rtnl import ifinfmsg # pylint: disable=no-name-in-module +from pyroute2 import netns # pylint: disable=no-name-in-module from neutron._i18n import _ from neutron.agent.common import utils diff --git a/neutron/agent/linux/tc_lib.py b/neutron/agent/linux/tc_lib.py index f64c6f7c2b8..3deb78e0413 100644 --- a/neutron/agent/linux/tc_lib.py +++ b/neutron/agent/linux/tc_lib.py @@ -21,9 +21,11 @@ from neutron_lib import exceptions from neutron_lib.exceptions import qos as qos_exc from neutron_lib.services.qos import constants as qos_consts from oslo_log import log as logging -from pyroute2.iproute import linux as iproute_linux -from pyroute2.netlink import rtnl -from pyroute2.netlink.rtnl.tcmsg import common as rtnl_common +from pyroute2.iproute import linux \ + as iproute_linux # pylint: disable=no-name-in-module +from pyroute2.netlink import rtnl # pylint: disable=no-name-in-module +from pyroute2.netlink.rtnl.tcmsg import common \ + as rtnl_common # pylint: disable=no-name-in-module from neutron._i18n import _ from neutron.agent.linux import ip_lib diff --git a/neutron/privileged/agent/linux/ip_lib.py b/neutron/privileged/agent/linux/ip_lib.py index efc0503f76c..6b24341deda 100644 --- a/neutron/privileged/agent/linux/ip_lib.py +++ b/neutron/privileged/agent/linux/ip_lib.py @@ -17,13 +17,13 @@ import socket from neutron_lib import constants from oslo_log import log as logging import pyroute2 -from pyroute2 import netlink -from pyroute2.netlink import exceptions as netlink_exceptions -from pyroute2.netlink import rtnl -from pyroute2.netlink.rtnl import ifinfmsg -from pyroute2.netlink.rtnl import ndmsg -from pyroute2 import NetlinkError -from pyroute2 import netns +from pyroute2 import netlink # pylint: disable=no-name-in-module +from pyroute2.netlink import exceptions \ + as netlink_exceptions # pylint: disable=no-name-in-module +from pyroute2.netlink import rtnl # pylint: disable=no-name-in-module +from pyroute2.netlink.rtnl import ifinfmsg # pylint: disable=no-name-in-module +from pyroute2.netlink.rtnl import ndmsg # pylint: disable=no-name-in-module +from pyroute2 import netns # pylint: disable=no-name-in-module from neutron._i18n import _ from neutron import privileged @@ -210,7 +210,7 @@ def _run_iproute_link(command, device, namespace=None, **kwargs): with get_iproute(namespace) as ip: idx = get_link_id(device, namespace) return ip.link(command, index=idx, **kwargs) - except NetlinkError as e: + except netlink.NetlinkError as e: _translate_ip_device_exception(e, device, namespace) raise except OSError as e: @@ -224,7 +224,7 @@ def _run_iproute_neigh(command, device, namespace, **kwargs): with get_iproute(namespace) as ip: idx = get_link_id(device, namespace) return ip.neigh(command, ifindex=idx, **kwargs) - except NetlinkError as e: + except netlink_exceptions.NetlinkError as e: _translate_ip_device_exception(e, device, namespace) raise except OSError as e: @@ -238,7 +238,7 @@ def _run_iproute_addr(command, device, namespace, **kwargs): with get_iproute(namespace) as ip: idx = get_link_id(device, namespace) return ip.addr(command, index=idx, **kwargs) - except NetlinkError as e: + except netlink_exceptions.NetlinkError as e: _translate_ip_device_exception(e, device, namespace) raise except OSError as e: @@ -265,7 +265,7 @@ def add_ip_address(ip_version, ip, prefixlen, device, namespace, scope, family=family, broadcast=broadcast, scope=get_scope_name(scope)) - except NetlinkError as e: + except netlink_exceptions.NetlinkError as e: if e.code == errno.EEXIST: raise IpAddressAlreadyExists(ip=ip, device=device) raise @@ -281,7 +281,7 @@ def delete_ip_address(ip_version, ip, prefixlen, device, namespace): address=ip, mask=prefixlen, family=family) - except NetlinkError as e: + except netlink_exceptions.NetlinkError as e: # when trying to delete a non-existent IP address, pyroute2 raises # NetlinkError with code EADDRNOTAVAIL (99, 'Cannot assign requested # address') @@ -314,7 +314,7 @@ def create_interface(ifname, namespace, kind, **kwargs): link_key = "vxlan_link" if kind == "vxlan" else "link" kwargs[link_key] = get_link_id(physical_interface, namespace) return ip.link("add", ifname=ifname, kind=kind, **kwargs) - except NetlinkError as e: + except netlink_exceptions.NetlinkError as e: if e.code == errno.EEXIST: raise InterfaceAlreadyExists(device=ifname) raise @@ -452,7 +452,7 @@ def delete_neigh_entry(ip_version, ip_address, mac_address, device, namespace, lladdr=mac_address, family=family, **kwargs) - except NetlinkError as e: + except netlink_exceptions.NetlinkError as e: # trying to delete a non-existent entry shouldn't raise an error if e.code == errno.ENOENT: return diff --git a/neutron/privileged/agent/linux/tc_lib.py b/neutron/privileged/agent/linux/tc_lib.py index ab46d864b1e..b41c8ff4a04 100644 --- a/neutron/privileged/agent/linux/tc_lib.py +++ b/neutron/privileged/agent/linux/tc_lib.py @@ -17,7 +17,8 @@ import socket from neutron_lib import constants as n_constants import pyroute2 -from pyroute2 import protocols as pyroute2_protocols +from pyroute2 import protocols \ + as pyroute2_protocols # pylint: disable=no-name-in-module from neutron._i18n import _ from neutron import privileged