openstack/neutron
Code Issues Proposed changes

Merge "Fix some pep8 warnings"

Browse Source
This commit is contained in:
Zuul 2018-04-13 10:41:57 +00:00 committed by Gerrit Code Review
commit 7d6d277e40
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -663,6 +663,7 @@ class IpAddrCommand(IpDeviceCommandBase):
if addr_info['dadfailed']: if addr_info['dadfailed']:
raise AddressNotReady( raise AddressNotReady(
address=address, reason=_('Duplicate address detected')) address=address, reason=_('Duplicate address detected'))
return False
errmsg = _("Exceeded %s second limit waiting for " errmsg = _("Exceeded %s second limit waiting for "
"address to leave the tentative state.") % wait_time "address to leave the tentative state.") % wait_time
common_utils.wait_until_true( common_utils.wait_until_true(
@ -698,9 +699,9 @@ class IpRouteCommand(IpDeviceCommandBase):
args += self._table_args(table) args += self._table_args(table)
self._as_root([ip_version], tuple(args)) self._as_root([ip_version], tuple(args))
def _run_as_root_detect_device_not_found(self, *args, **kwargs): def _run_as_root_detect_device_not_found(self, options, args):
try: try:
return self._as_root(*args, **kwargs) return self._as_root(options, tuple(args))
except RuntimeError as rte: except RuntimeError as rte:
with excutils.save_and_reraise_exception() as ctx: with excutils.save_and_reraise_exception() as ctx:
if "Cannot find device" in str(rte): if "Cannot find device" in str(rte):
@ -713,7 +714,7 @@ class IpRouteCommand(IpDeviceCommandBase):
'via', gateway] 'via', gateway]
args += self._dev_args() args += self._dev_args()
args += self._table_args(table) args += self._table_args(table)
self._run_as_root_detect_device_not_found([ip_version], tuple(args)) self._run_as_root_detect_device_not_found([ip_version], args)
def _parse_routes(self, ip_version, output, **kwargs): def _parse_routes(self, ip_version, output, **kwargs):
for line in output.splitlines(): for line in output.splitlines():
@ -802,7 +803,7 @@ class IpRouteCommand(IpDeviceCommandBase):
args += self._table_args(table) args += self._table_args(table)
for k, v in kwargs.items(): for k, v in kwargs.items():
args += [k, v] args += [k, v]
self._run_as_root_detect_device_not_found([ip_version], tuple(args)) self._run_as_root_detect_device_not_found([ip_version], args)
def delete_route(self, cidr, via=None, table=None, **kwargs): def delete_route(self, cidr, via=None, table=None, **kwargs):
ip_version = common_utils.get_ip_version(cidr) ip_version = common_utils.get_ip_version(cidr)
@ -813,7 +814,7 @@ class IpRouteCommand(IpDeviceCommandBase):
args += self._table_args(table) args += self._table_args(table)
for k, v in kwargs.items(): for k, v in kwargs.items():
args += [k, v] args += [k, v]
self._run_as_root_detect_device_not_found([ip_version], tuple(args)) self._run_as_root_detect_device_not_found([ip_version], args)
class IPRoute(SubProcessBase): class IPRoute(SubProcessBase):
@ -876,9 +877,8 @@ class IpNetnsCommand(IpCommandBase):
log_fail_as_error=True, extra_ok_codes=None, log_fail_as_error=True, extra_ok_codes=None,
run_as_root=False): run_as_root=False):
ns_params = [] ns_params = []
kwargs = {'run_as_root': run_as_root}
if self._parent.namespace: if self._parent.namespace:
kwargs['run_as_root'] = True run_as_root = True
ns_params = ['ip', 'netns', 'exec', self._parent.namespace] ns_params = ['ip', 'netns', 'exec', self._parent.namespace]
env_params = [] env_params = []
@ -888,7 +888,8 @@ class IpNetnsCommand(IpCommandBase):
cmd = ns_params + env_params + list(cmds) cmd = ns_params + env_params + list(cmds)
return utils.execute(cmd, check_exit_code=check_exit_code, return utils.execute(cmd, check_exit_code=check_exit_code,
extra_ok_codes=extra_ok_codes, extra_ok_codes=extra_ok_codes,
log_fail_as_error=log_fail_as_error, **kwargs) log_fail_as_error=log_fail_as_error,
run_as_root=run_as_root)
def exists(self, name): def exists(self, name):
return network_namespace_exists(name) return network_namespace_exists(name)