x
/
group-based-policy
Code Issues Proposed changes

[AIM][SFC] remove external network display name 

Change-Id: I2e6cb46cabb051d5b36092e7895255d953dbf3de
This commit is contained in:
Ivar Lazzaro 2018-04-06 16:16:22 -07:00
parent 2d5aa2661f
commit be5b3fc323
No known key found for this signature in database
GPG Key ID: ACEEC8CB558DC3CF
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gbpservice/neutron/services/sfc/aim/sfc_driver.py
View File

@ -591,8 +591,8 @@ class SfcAIMDriver(SfcAIMDriverBase):
def _map_flowc_network_group(self, plugin_context, net, cidr, flowc,
prefix):
flc_aid, flc_aname = self._get_external_group_aim_name(
plugin_context, flowc, prefix)
flc_aid = self._get_external_group_aim_name(plugin_context, flowc,
prefix)
aim_ctx = aim_context.AimContext(plugin_context.session)
cidr = netaddr.IPNetwork(cidr)
l3out = self.aim_mech._get_svi_net_l3out(net)
@ -609,7 +609,7 @@ class SfcAIMDriver(SfcAIMDriverBase):
# L3Out. Return the External network
ext_net = aim_resource.ExternalNetwork(
tenant_name=l3out.tenant_name, l3out_name=l3out.name,
name=flc_aid, display_name=flc_aname)
name=flc_aid)
ext_sub = aim_resource.ExternalSubnet(
tenant_name=ext_net.tenant_name,
l3out_name=ext_net.l3out_name,
@ -637,8 +637,8 @@ class SfcAIMDriver(SfcAIMDriverBase):
def _delete_flowc_network_group_mapping(self, plugin_context, net, flowc,
tenant, cidr, prefix=''):
flc_aid, _ = self._get_external_group_aim_name(plugin_context, flowc,
prefix)
flc_aid = self._get_external_group_aim_name(plugin_context, flowc,
prefix)
aim_ctx = aim_context.AimContext(plugin_context.session)
l3out = self.aim_mech._get_svi_net_l3out(net)
cidr = netaddr.IPNetwork(cidr)
@ -980,5 +980,4 @@ class SfcAIMDriver(SfcAIMDriverBase):
cidr = aim_utils.sanitize_display_name(cidr)
name = self.name_mapper.network(plugin_context.session, net['id'],
prefix=cidr + '_')
display_name = aim_utils.sanitize_display_name(net['name'])
return name, display_name
return name