openstack
/
neutron
Code Issues Proposed changes

Merge "Router synch shouldn't return unrelated routers" into stable/queens

This commit is contained in:
Zuul 2020-05-20 04:04:43 +00:00 committed by Gerrit Code Review
parent 4a80731ae4 86efdd03ae
commit 078259dc08
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/l3_dvrscheduler_db.py
View File

@ -432,10 +432,10 @@ class L3_DVRsch_db_mixin(l3agent_sch_db.L3AgentSchedulerDbMixin):
"serviceable ports in host %(host)s", "serviceable ports in host %(host)s",
{'router_ids': result_set, {'router_ids': result_set,
'host': agent_db['host']}) 'host': agent_db['host']})
for dvr_router in dvr_routers: for router_id in router_ids:
result_set |= set( result_set |= set(
self._get_other_dvr_router_ids_connected_router( self._get_other_dvr_router_ids_connected_router(
context, dvr_router)) context, router_id))
LOG.debug("Router IDs %(router_ids)s for agent in host %(host)s", LOG.debug("Router IDs %(router_ids)s for agent in host %(host)s",
{'router_ids': result_set, {'router_ids': result_set,