x/group-based-policy
Code Issues Proposed changes

Fix exception with cleanup

Browse Source 
Commit 00bf365025772d423eea7da1ddbb6211ab757aed in upstream neutron
changed the call to extend the router resource from an assignment to
an update, which means that this member must be present when creating
the router dictionary. The call to get_routers throws an exception if
specific fields are requested, which don't include the gateway. This
patch ensures that the gateway extension is present, avoiding this exception.

Change-Id: Id88eaf2fb4160d27a7a0322ddf4e4b494f3dd8c4
This commit is contained in:
Thomas Bachman
2020-11-20 01:56:31 +00:00
committed by Thomas Bachman
parent 17d3827095
commit 05ac94ae60
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gbpservice/neutron/services/apic_aim/l3_plugin.py
View File

@@ -47,6 +47,8 @@ from gbpservice.neutron.plugins.ml2plus.drivers.apic_aim import (
LOG = logging.getLogger(__name__)
EXTERNAL_GW_INFO = l3_def.EXTERNAL_GW_INFO
@resource_extend.has_resource_extenders
class ApicL3Plugin(extraroute_db.ExtraRoute_db_mixin,
@@ -126,6 +128,25 @@ class ApicL3Plugin(extraroute_db.ExtraRoute_db_mixin,
res = self._make_router_dict(router, fields,
process_extensions=False)
res[api_plus.BULK_EXTENDED] = True
# If fields is not None, then the dictionary returned
# above contains only the fields specified. Here we add
# the gateway, since the subsequent call to apply_funcs
# raises an exception due to this missing field when
# extending the dictionary with the gateway (note: we
# also are keeping this call consistent with upstream code).
if router['gw_port_id']:
ext_gw_info = {
'network_id': router.gw_port['network_id'],
'external_fixed_ips': [
{'subnet_id': ip["subnet_id"],
'ip_address': ip["ip_address"]}
for ip in router.gw_port['fixed_ips']]}
else:
ext_gw_info = None
res.update({
EXTERNAL_GW_INFO: ext_gw_info,
'gw_port_id': router['gw_port_id'],
})
resource_extend.apply_funcs(l3_def.ROUTERS, res, router)
res.pop(api_plus.BULK_EXTENDED, None)
results.append(res)