openstack/neutron
Code Issues Proposed changes

Merge "Bump pylint version to one that supports python3.7"

Browse Source
This commit is contained in:
Zuul
2019-02-22 03:53:13 +00:00
committed by Gerrit Code Review
parent 167d572278 7e208c3014
commit 929d3fe9f4
8 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,6 +108,8 @@ class DvrLocalRouter(dvr_router_base.DvrRouterBase):
def floating_ip_added_dist(self, fip, fip_cidr):
"""Add floating IP to respective namespace based on agent mode."""
if fip.get(lib_constants.DVR_SNAT_BOUND):
# TODO(dougwig) - remove this disable when fixing bug #1816874
# pylint: disable=assignment-from-no-return
floating_ip_status = self.add_centralized_floatingip(fip, fip_cidr)
return floating_ip_status
if not self._check_if_floatingip_bound_to_host(fip):

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

@@ -377,6 +377,8 @@ class RouterInfo(object):
fip.get('host') == self.host):
LOG.debug("Floating IP is migrating from centralized "
"to distributed: %s", fip)
# TODO(dougwig) - remove this disable when fixing bug #1816874
# pylint: disable=assignment-from-no-return
fip_statuses[fip['id']] = self.migrate_centralized_floating_ip(
fip, interface_name, device)
elif fip_statuses[fip['id']] == fip['status']: