openstack/neutron
Code Issues Proposed changes

L3: Only send notifications if l3 plugin exists

Browse Source 
Validate that the plugin exists to invoke notifications

Conflicts:
    neutron/db/l3_db.py
(cherry picked from commit 6566fb1a37)

Change-Id: Iab970ca633b338e021b2c910281672b2350939c4
Closes-bug: #1618728
This commit is contained in:
Gary Kotton 2016-09-05 00:18:51 -07:00 committed by Iago Santos
parent 87d4ba32a0
commit 5c52d1b848
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/db/l3_db.py
View File

@ -1925,7 +1925,10 @@ def _notify_routers_callback(resource, event, trigger, **kwargs):
router_ids = kwargs['router_ids']
l3plugin = manager.NeutronManager.get_service_plugins().get(
constants.L3_ROUTER_NAT)
l3plugin.notify_routers_updated(context, router_ids)
if l3plugin:
l3plugin.notify_routers_updated(context, router_ids)
else:
LOG.debug('%s not configured', constants.L3_ROUTER_NAT)
def _notify_subnet_gateway_ip_update(resource, event, trigger, **kwargs):
@ -1964,7 +1967,10 @@ def _notify_subnetpool_address_scope_update(resource, event,
router_ids = [r[0] for r in query]
l3plugin = manager.NeutronManager.get_service_plugins().get(
constants.L3_ROUTER_NAT)
l3plugin.notify_routers_updated(context, router_ids)
if l3plugin:
l3plugin.notify_routers_updated(context, router_ids)
else:
LOG.debug('%s not configured', constants.L3_ROUTER_NAT)
@removals.remove(