openstack
/
neutron
Code Issues Proposed changes

Refactor _cache_related_dvr_routers_info_before_interface_removal() 

Change from try/except to pop like other methods in the file.

Trivialfix

Change-Id: I79ce40bff400214de524b869a7c661c6b2ba9e23
This commit is contained in:
Brian Haley 2018-11-09 15:57:50 -05:00
parent 094095b3d7
commit 02e4efa01c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/db/l3_dvr_db.py
View File

@ -530,17 +530,12 @@ class DVRResourceOperationHandler(object):
return
cache_key = (router_id, subnet_id)
try:
existing_hosts = self.related_dvr_router_hosts[cache_key]
except KeyError:
existing_hosts = set()
existing_hosts = self.related_dvr_router_hosts.pop(cache_key, set())
other_hosts = set(self._get_other_dvr_hosts(context, router_id))
self.related_dvr_router_hosts[cache_key] = existing_hosts | other_hosts
try:
existing_routers = self.related_dvr_router_routers[cache_key]
except KeyError:
existing_routers = set()
existing_routers = self.related_dvr_router_routers.pop(cache_key,
set())
other_routers = set(self._get_other_dvr_router_ids_connected_router(
context, router_id))
self.related_dvr_router_routers[cache_key] = (