x/group-based-policy
Code Issues Proposed changes

Merge "Revert "Split the default ext epg 0/0 subnet into 0/1 and 128/1""

Browse Source
This commit is contained in:
Zuul
2018-04-12 17:30:19 +00:00
committed by Gerrit Code Review
parent 43b66ea9b5 0dec95dc4e
commit d162ab4d39
5 changed files with 31 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -595,12 +595,11 @@ class SfcAIMDriver(SfcAIMDriverBase):
prefix)
aim_ctx = aim_context.AimContext(plugin_context.session)
cidr = netaddr.IPNetwork(cidr)
network_db = self.plugin._get_network(plugin_context, net['id'])
l3out = self.aim_mech._get_default_svi_l3out(network_db)
l3out = self.aim_mech._get_svi_net_l3out(net)
if l3out:
if cidr.prefixlen == 0:
# Use default External Network
ext_net = self.aim_mech._get_default_svi_ext_epg(network_db)
ext_net = self.aim_mech._get_svi_default_external_epg(net)
ext_net_db = self.aim.get(aim_ctx, ext_net)
if not ext_net_db:
raise exceptions.DefaultExternalNetworkNotFound(
@@ -641,8 +640,7 @@ class SfcAIMDriver(SfcAIMDriverBase):
flc_aid = self._get_external_group_aim_name(plugin_context, flowc,
prefix)
aim_ctx = aim_context.AimContext(plugin_context.session)
network_db = self.plugin._get_network(plugin_context, net['id'])
l3out = self.aim_mech._get_default_svi_l3out(network_db)
l3out = self.aim_mech._get_svi_net_l3out(net)
cidr = netaddr.IPNetwork(cidr)
ext_net = None
if l3out:
@@ -653,8 +651,7 @@ class SfcAIMDriver(SfcAIMDriverBase):
epg = self.aim.get(aim_ctx, ext_net)
else:
epg = self.aim.get(
aim_ctx,
self.aim_mech._get_default_svi_ext_epg(network_db))
aim_ctx, self.aim_mech._get_svi_default_external_epg(net))
else:
epg = self.aim.get(aim_ctx, self.aim_mech._get_epg_by_network_id(
plugin_context.session, net['id']))