Merge "Refactor _cache_related_dvr_routers_info_before_interface_removal()"

This commit is contained in:
Zuul 2018-11-20 04:56:55 +00:00 committed by Gerrit Code Review
commit d49edf1d77

@ -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] = (