openstack
/
neutron
Code Issues Proposed changes

Merge "Remove a bare raise noticed by the linter" into stable/rocky

This commit is contained in:
Zuul 2019-02-23 10:14:36 +00:00 committed by Gerrit Code Review
parent 743af7ed57 1e6ce6f963
commit 119ef92b47
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/privileged/agent/linux/ip_lib.py
View File

@ -137,7 +137,6 @@ def _translate_ip_device_exception(e, device=None, namespace=None):
if e.code == errno.EOPNOTSUPP:
raise InterfaceOperationNotSupported(device=device,
namespace=namespace)
raise
def _get_link_id(device, namespace):
@ -155,6 +154,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)
@ -168,6 +168,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)
@ -181,6 +182,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)