diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-03 19:20:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-03 19:20:29 +0000 |
| commit | 6a767c29548338282a928887d807d5728ccf5448 (patch) | |
| tree | 5ca76fff0b096875e29aeea10fc2118d285013d2 | |
| parent | 0678e48b6b5177dbbbad6b9361f6b3f396d14c2e (diff) | |
| parent | a8e8f88cded69d221525f6441b17c747f36a182b (diff) | |
| download | neutron-6a767c29548338282a928887d807d5728ccf5448.tar.gz | |
Merge "Remove a bare raise noticed by the linter"
| -rw-r--r-- | neutron/privileged/agent/linux/ip_lib.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/neutron/privileged/agent/linux/ip_lib.py b/neutron/privileged/agent/linux/ip_lib.py index e3717602db..0289d53fb6 100644 --- a/neutron/privileged/agent/linux/ip_lib.py +++ b/neutron/privileged/agent/linux/ip_lib.py @@ -157,12 +157,11 @@ def _get_iproute(namespace): def _translate_ip_device_exception(e, device=None, namespace=None): - if e.code == errno.ENODEV: - raise NetworkInterfaceNotFound(device=device, namespace=namespace) - if e.code == errno.EOPNOTSUPP: - raise InterfaceOperationNotSupported(device=device, - namespace=namespace) - raise + if e.code == errno.ENODEV: + raise NetworkInterfaceNotFound(device=device, namespace=namespace) + if e.code == errno.EOPNOTSUPP: + raise InterfaceOperationNotSupported(device=device, + namespace=namespace) def _get_link_id(device, namespace): @@ -180,6 +179,7 @@ def _run_iproute_link(command, device, namespace=None, **kwargs): return ip.link(command, index=idx, **kwargs) except NetlinkError as e: _translate_ip_device_exception(e, device, namespace) + raise except OSError as e: if e.errno == errno.ENOENT: raise NetworkNamespaceNotFound(netns_name=namespace) @@ -193,6 +193,7 @@ def _run_iproute_neigh(command, device, namespace, **kwargs): return ip.neigh(command, ifindex=idx, **kwargs) except NetlinkError as e: _translate_ip_device_exception(e, device, namespace) + raise except OSError as e: if e.errno == errno.ENOENT: raise NetworkNamespaceNotFound(netns_name=namespace) @@ -206,6 +207,7 @@ def _run_iproute_addr(command, device, namespace, **kwargs): return ip.addr(command, index=idx, **kwargs) except NetlinkError as e: _translate_ip_device_exception(e, device, namespace) + raise except OSError as e: if e.errno == errno.ENOENT: raise NetworkNamespaceNotFound(netns_name=namespace) |