Merge "Enable hacking N344"

This commit is contained in:
Jenkins 2017-03-24 01:29:52 +00:00 committed by Gerrit Code Review
commit d4861725f7
2 changed files with 4 additions and 4 deletions

View File

@ -2103,8 +2103,8 @@ class AIMMappingDriver(nrd.CommonNeutronBase, aim_rpc.AIMMappingRPCMixin):
# TODO(amitbose) Handle per-tenant NAT EPG
ext_net_epg = aim_resource.EndpointGroup.from_dn(ext_net_epg_dn)
fips_in_ext_net = filter(
lambda x: x['floating_network_id'] == ext_net['id'], fips)
fips_in_ext_net = [fip for fip in fips
if fip['floating_network_id'] == ext_net['id']]
if not fips_in_ext_net:
ext_segment_name = dn.replace('/', ':')
ipms.append({'external_segment_name': ext_segment_name,

View File

@ -736,8 +736,8 @@ class ApicMappingDriver(api.ResourceMappingDriver,
subnet = self._get_subnet(context._plugin_context,
es['subnet_id'])
ext_net_id = subnet['network_id']
fips_in_es = filter(
lambda x: x['floating_network_id'] == ext_net_id, fips)
fips_in_es = [fip for fip in fips
if fip['floating_network_id'] == ext_net_id]
ext_network = self._get_network(context._plugin_context,
ext_net_id)
if host: