x/group-based-policy
Code Issues Proposed changes

[apic_mapping] some naming changes

Browse Source 
1. replace router_type=asr with edge_nat=true as we will need this mode for other types of
routers too.
2. when edge_nat=true, replace Shd-<L3 out name> with Auto-<L3 out name> as this l3 out will
also have node/IF profiles created.
3. these 2 naming changes were requested by Mandeep.
4. also use "none" while checking the BGP authentication. This way if in the future they add
support to other new types of authentications then the code will still work.

Change-Id: I469073ad3c03cfa1f6c0bb93d452a72236eabb73
Partial-Bug: 1547723
This commit is contained in:
Kent Wu
2016-04-18 16:19:54 -07:00
parent a4515e39dc
commit cdfa14e189
2 changed files with 134 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py
View File

@@ -148,33 +148,34 @@ class PreExistingL3OutInIncorrectTenant(gpexc.GroupPolicyBadRequest):
"'%(es_tenant)s' to which external-segment '%(es)s' maps.") "'%(es_tenant)s' to which external-segment '%(es)s' maps.")
class ASRVlanRangeNotFound(gpexc.GroupPolicyBadRequest): class EdgeNatVlanRangeNotFound(gpexc.GroupPolicyBadRequest):
message = _("No vlan range is specified for L3Out %(l3out)s " message = _("No vlan range is specified for L3Out %(l3out)s "
"when router_type is ASR.") "when edge_nat is enabled.")
class ASRBadVlanRange(gpexc.GroupPolicyBadRequest): class EdgeNatBadVlanRange(gpexc.GroupPolicyBadRequest):
message = _("Bad vlan range is specified for L3Out %(l3out)s " message = _("Bad vlan range is specified for L3Out %(l3out)s "
"when router_type is ASR.") "when edge_nat is enabled.")
class ASRWrongL3OutIFType(gpexc.GroupPolicyBadRequest): class EdgeNatWrongL3OutIFType(gpexc.GroupPolicyBadRequest):
message = _("L3Out %(l3out)s can only support routed " message = _("L3Out %(l3out)s can only support routed "
"sub-interfaces in the interface profiles when router_type " "sub-interfaces in the interface profiles when edge_nat"
"is ASR.") "is enabled.")
class ASRWrongL3OutAuthTypeForBGP(gpexc.GroupPolicyBadRequest): class EdgeNatWrongL3OutAuthTypeForBGP(gpexc.GroupPolicyBadRequest):
message = _("L3Out %(l3out)s can only support no authentication " message = _("L3Out %(l3out)s can only support no authentication "
"for BGP interface profile when router_type is ASR.") "for BGP interface profile when edge_nat is enabled.")
class ASRWrongL3OutAuthTypeForOSPF(gpexc.GroupPolicyBadRequest): class EdgeNatWrongL3OutAuthTypeForOSPF(gpexc.GroupPolicyBadRequest):
message = _("L3Out %(l3out)s can only support no authentication " message = _("L3Out %(l3out)s can only support no authentication "
"for OSPF interface profile when router_type is ASR.") "for OSPF interface profile when edge_nat is enabled.")
REVERSE_PREFIX = 'reverse-' REVERSE_PREFIX = 'reverse-'
SHADOW_PREFIX = 'Shd-' SHADOW_PREFIX = 'Shd-'
AUTO_PREFIX = 'Auto-'
SERVICE_PREFIX = 'Svc-' SERVICE_PREFIX = 'Svc-'
IMPLICIT_PREFIX = 'implicit-' IMPLICIT_PREFIX = 'implicit-'
ANY_PREFIX = 'any-' ANY_PREFIX = 'any-'
@@ -505,7 +506,7 @@ class ApicMappingDriver(api.ResourceMappingDriver,
if not self._is_nat_enabled_on_es(es): if not self._is_nat_enabled_on_es(es):
continue continue
ext_info = self.apic_manager.ext_net_dict.get(es['name']) ext_info = self.apic_manager.ext_net_dict.get(es['name'])
if ext_info and self._is_asr_router_type(ext_info): if ext_info and self._is_edge_nat(ext_info):
continue continue
nat_epg_name = self._get_nat_epg_for_es(context, es) nat_epg_name = self._get_nat_epg_for_es(context, es)
nat_epg_tenant = self.apic_manager.apic.fvTenant.name( nat_epg_tenant = self.apic_manager.apic.fvTenant.name(
@@ -1203,7 +1204,7 @@ class ApicMappingDriver(api.ResourceMappingDriver,
if hp_net.cidr == net.cidr: if hp_net.cidr == net.cidr:
raise HostPoolSubnetOverlap(host_pool_cidr=hp_net.cidr, raise HostPoolSubnetOverlap(host_pool_cidr=hp_net.cidr,
es=es['name']) es=es['name'])
self._check_asr_setting(es) self._check_edge_nat_setting(es)
else: else:
LOG.warning(UNMANAGED_SEGMENT % context.current['id']) LOG.warning(UNMANAGED_SEGMENT % context.current['id'])
@@ -1780,9 +1781,10 @@ class ApicMappingDriver(api.ResourceMappingDriver,
# don't need to explicitly create the shadow l3out in this case # don't need to explicitly create the shadow l3out in this case
# because we are going to query APIC then use the pre-existing # because we are going to query APIC then use the pre-existing
# l3out as a template then clone it accordingly # l3out as a template then clone it accordingly
if (is_shadow and self._is_asr_router_type(ext_info) and if is_shadow and self._is_edge_nat(ext_info):
self._is_pre_existing(es)): es_name = str(es_name).replace(SHADOW_PREFIX, AUTO_PREFIX, 1)
is_l3out_creation_needed = False if self._is_pre_existing(es):
is_l3out_creation_needed = False
if is_l3out_creation_needed: if is_l3out_creation_needed:
self.apic_manager.ensure_external_routed_network_created( self.apic_manager.ensure_external_routed_network_created(
@@ -1804,9 +1806,9 @@ class ApicMappingDriver(api.ResourceMappingDriver,
encap = ext_info.get('encap') # No encap if None encap = ext_info.get('encap') # No encap if None
is_details_needed = True is_details_needed = True
# if there is a router_type (like ASR) then we have to flesh # if its edge nat then we have to flesh
# out this shadow L3 out in APIC # out this shadow L3 out in APIC
if is_shadow and self._is_asr_router_type(ext_info): if is_shadow and self._is_edge_nat(ext_info):
vlan_id = self.l3out_vlan_alloc.reserve_vlan( vlan_id = self.l3out_vlan_alloc.reserve_vlan(
es['name'], context.current['id']) es['name'], context.current['id'])
encap = 'vlan-' + str(vlan_id) encap = 'vlan-' + str(vlan_id)
@@ -1859,6 +1861,9 @@ class ApicMappingDriver(api.ResourceMappingDriver,
es_name = self.name_mapper.external_segment(context, es, es_name = self.name_mapper.external_segment(context, es,
prefix=self._get_shadow_prefix(context, prefix=self._get_shadow_prefix(context,
is_shadow, context.current)) is_shadow, context.current))
ext_info = self.apic_manager.ext_net_dict.get(es['name'])
if is_shadow and self._is_edge_nat(ext_info):
es_name = str(es_name).replace(SHADOW_PREFIX, AUTO_PREFIX, 1)
es_tenant = self._get_tenant_for_shadow(is_shadow, context.current, es) es_tenant = self._get_tenant_for_shadow(is_shadow, context.current, es)
nat_enabled = self._is_nat_enabled_on_es(es) nat_enabled = self._is_nat_enabled_on_es(es)
pre_existing = False if is_shadow else self._is_pre_existing(es) pre_existing = False if is_shadow else self._is_pre_existing(es)
@@ -1891,10 +1896,9 @@ class ApicMappingDriver(api.ResourceMappingDriver,
context, es['name']) context, es['name'])
if pre_existing else es_name), if pre_existing else es_name),
transaction=trs) transaction=trs)
# if there is a router_type (like ASR) then we have to # if its edge nat then we have to release
# release the vlan associated with this shadow L3out # the vlan associated with this shadow L3out
ext_info = self.apic_manager.ext_net_dict.get(es['name']) if is_shadow and self._is_edge_nat(ext_info):
if is_shadow and self._is_asr_router_type(ext_info):
self.l3out_vlan_alloc.release_vlan( self.l3out_vlan_alloc.release_vlan(
es['name'], context.current['id']) es['name'], context.current['id'])
@@ -1971,7 +1975,7 @@ class ApicMappingDriver(api.ResourceMappingDriver,
context._plugin_context, es, ep, context._plugin_context, es, ep,
provided_prs, consumed_prs, [], [], provided_prs, consumed_prs, [], [],
l3policy_obj, transaction=trs) l3policy_obj, transaction=trs)
if is_shadow and not self._is_asr_router_type(ext_info): if is_shadow and not self._is_edge_nat(ext_info):
# set up link to NAT EPG # set up link to NAT EPG
self.apic_manager.associate_external_epg_to_nat_epg( self.apic_manager.associate_external_epg_to_nat_epg(
es_tenant, es_name, ep_name, es_tenant, es_name, ep_name,
@@ -3112,18 +3116,18 @@ class ApicMappingDriver(api.ResourceMappingDriver,
return opt.lower() in ['true', 'yes', '1'] return opt.lower() in ['true', 'yes', '1']
return False return False
def _is_asr_router_type(self, ext_info): def _is_edge_nat(self, ext_info):
router_type = ext_info.get('router_type') opt = ext_info.get('edge_nat', 'false')
return router_type and router_type.lower() == 'asr' return opt.lower() in ['true', 'yes', '1']
def _check_asr_setting(self, es): def _check_edge_nat_setting(self, es):
ext_info = self.apic_manager.ext_net_dict.get(es['name']) ext_info = self.apic_manager.ext_net_dict.get(es['name'])
if ext_info and self._is_asr_router_type(ext_info): if ext_info and self._is_edge_nat(ext_info):
vlan_range = ext_info.get('vlan_range') vlan_range = ext_info.get('vlan_range')
if not vlan_range: if not vlan_range:
raise ASRVlanRangeNotFound(l3out=es['name']) raise EdgeNatVlanRangeNotFound(l3out=es['name'])
elif not self.l3out_vlan_alloc.l3out_vlan_ranges.get(es['name']): elif not self.l3out_vlan_alloc.l3out_vlan_ranges.get(es['name']):
raise ASRBadVlanRange(l3out=es['name']) raise EdgeNatBadVlanRange(l3out=es['name'])
def _query_l3out_info(self, l3out_name, tenant_id, return_full=False): def _query_l3out_info(self, l3out_name, tenant_id, return_full=False):
info = {'l3out_tenant': tenant_id} info = {'l3out_tenant': tenant_id}
@@ -3153,12 +3157,12 @@ class ApicMappingDriver(api.ResourceMappingDriver,
if not self._is_pre_existing(es): if not self._is_pre_existing(es):
return return
ext_info = self.apic_manager.ext_net_dict.get(es['name']) ext_info = self.apic_manager.ext_net_dict.get(es['name'])
is_asr_router = self._is_asr_router_type(ext_info) is_edge_nat = self._is_edge_nat(ext_info)
l3out_info = self._query_l3out_info( l3out_info = self._query_l3out_info(
self.name_mapper.name_mapper.pre_existing( self.name_mapper.name_mapper.pre_existing(
context, es['name']), context, es['name']),
self.name_mapper.tenant(es), self.name_mapper.tenant(es),
return_full=is_asr_router) return_full=is_edge_nat)
if not l3out_info: if not l3out_info:
raise PreExistingL3OutNotFound(l3out=es['name']) raise PreExistingL3OutNotFound(l3out=es['name'])
l3out_info['l3out_tenant'] = str(l3out_info['l3out_tenant']) l3out_info['l3out_tenant'] = str(l3out_info['l3out_tenant'])
@@ -3168,22 +3172,22 @@ class ApicMappingDriver(api.ResourceMappingDriver,
raise PreExistingL3OutInIncorrectTenant( raise PreExistingL3OutInIncorrectTenant(
l3out_tenant=l3out_info['l3out_tenant'], l3out_tenant=l3out_info['l3out_tenant'],
l3out=es['name'], es=es['name'], es_tenant=es_tenant) l3out=es['name'], es=es['name'], es_tenant=es_tenant)
if is_asr_router: if is_edge_nat:
l3out_str = str(l3out_info['l3out']) l3out_str = str(l3out_info['l3out'])
for match in re.finditer("u'ifInstT': u'([^']+)'", for match in re.finditer("u'ifInstT': u'([^']+)'",
l3out_str): l3out_str):
if match.group(1) != 'sub-interface': if match.group(1) != 'sub-interface':
raise ASRWrongL3OutIFType(l3out=es['name']) raise EdgeNatWrongL3OutIFType(l3out=es['name'])
for match in re.finditer("u'authType': u'([^']+)'", for match in re.finditer("u'authType': u'([^']+)'",
l3out_str): l3out_str):
if match.group(1) != 'none': if match.group(1) != 'none':
raise ASRWrongL3OutAuthTypeForOSPF(l3out=es['name']) raise EdgeNatWrongL3OutAuthTypeForOSPF(l3out=es['name'])
for match in re.finditer( for match in re.finditer(
"u'bfdIfP': {u'attributes': {((?!u'attributes': {).)*u'type':" "u'bfdIfP': {u'attributes': {((?!u'attributes': {).)*u'type':"
" u'([^']+)'", " u'([^']+)'",
l3out_str): l3out_str):
if match.group(2) == 'sha1': if match.group(2) != 'none':
raise ASRWrongL3OutAuthTypeForBGP(l3out=es['name']) raise EdgeNatWrongL3OutAuthTypeForBGP(l3out=es['name'])
def _create_tenant_filter(self, rule_name, tenant, entries=None, def _create_tenant_filter(self, rule_name, tenant, entries=None,
transaction=None): transaction=None):

169
gbpservice/neutron/tests/unit/services/grouppolicy/test_apic_mapping.py
View File

@@ -217,7 +217,7 @@ l3extRsPathL3OutAtt": {"attributes": {"ifInstT": "sub-interface", "encap": \
self.driver.apic_manager.apic.fvCtx.name = echo2 self.driver.apic_manager.apic.fvCtx.name = echo2
self._db_plugin = n_db.NeutronDbPluginV2() self._db_plugin = n_db.NeutronDbPluginV2()
def _build_external_dict(self, name, cidr_exposed, is_asr_mode=False): def _build_external_dict(self, name, cidr_exposed, is_edge_nat=False):
ext_info = { ext_info = {
'enable_nat': 'True' if self.nat_enabled else 'False' 'enable_nat': 'True' if self.nat_enabled else 'False'
} }
@@ -233,17 +233,17 @@ l3extRsPathL3OutAtt": {"attributes": {"ifInstT": "sub-interface", "encap": \
'gateway_ip': str(netaddr.IPNetwork(cidr_exposed)[1]), 'gateway_ip': str(netaddr.IPNetwork(cidr_exposed)[1]),
'cidr_exposed': cidr_exposed}) 'cidr_exposed': cidr_exposed})
if is_asr_mode: if is_edge_nat:
ext_info['router_type'] = 'ASR' ext_info['edge_nat'] = 'true'
ext_info['vlan_range'] = '2000:2010' ext_info['vlan_range'] = '2000:2010'
return {name: ext_info} return {name: ext_info}
def _mock_external_dict(self, data, is_asr_mode=False): def _mock_external_dict(self, data, is_edge_nat=False):
self.driver.apic_manager.ext_net_dict = {} self.driver.apic_manager.ext_net_dict = {}
for x in data: for x in data:
self.driver.apic_manager.ext_net_dict.update( self.driver.apic_manager.ext_net_dict.update(
self._build_external_dict(x[0], x[1], is_asr_mode=is_asr_mode)) self._build_external_dict(x[0], x[1], is_edge_nat=is_edge_nat))
def _create_simple_policy_rule(self, direction='bi', protocol='tcp', def _create_simple_policy_rule(self, direction='bi', protocol='tcp',
port_range=80, shared=False, port_range=80, shared=False,
@@ -1595,10 +1595,10 @@ class TestL3Policy(ApicMappingTestCase):
router_ports[1]['fixed_ips'][0]['subnet_id'] == subnet['id']) router_ports[1]['fixed_ips'][0]['subnet_id'] == subnet['id'])
def _test_l3p_plugged_to_es_at_creation(self, shared_es, def _test_l3p_plugged_to_es_at_creation(self, shared_es,
shared_l3p, is_asr_mode=False): shared_l3p, is_edge_nat=False):
# Verify L3P is correctly plugged to ES on APIC during create # Verify L3P is correctly plugged to ES on APIC during create
self._mock_external_dict([('supported', '192.168.0.2/24')], self._mock_external_dict([('supported', '192.168.0.2/24')],
is_asr_mode) is_edge_nat)
es = self.create_external_segment( es = self.create_external_segment(
name='supported', cidr='192.168.0.0/24', name='supported', cidr='192.168.0.0/24',
shared=shared_es, shared=shared_es,
@@ -1622,11 +1622,14 @@ class TestL3Policy(ApicMappingTestCase):
l3p_owner = self.common_tenant if shared_l3p else l3p['tenant_id'] l3p_owner = self.common_tenant if shared_l3p else l3p['tenant_id']
mgr = self.driver.apic_manager mgr = self.driver.apic_manager
call_name = mgr.ensure_external_routed_network_created call_name = mgr.ensure_external_routed_network_created
l3out_str = "Shd-%s-%s"
if is_edge_nat:
l3out_str = "Auto-%s-%s"
if self.nat_enabled: if self.nat_enabled:
expected_l3out_calls = [] expected_l3out_calls = []
if not is_asr_mode or not self.pre_l3out: if not is_edge_nat or not self.pre_l3out:
expected_l3out_calls.append( expected_l3out_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
owner=l3p_owner, context=l3p['id'], owner=l3p_owner, context=l3p['id'],
transaction=mock.ANY)) transaction=mock.ANY))
if not self.pre_l3out: if not self.pre_l3out:
@@ -1645,7 +1648,7 @@ class TestL3Policy(ApicMappingTestCase):
transaction=mock.ANY)] transaction=mock.ANY)]
self._check_call_list(expected_l3out_calls, call_name.call_args_list) self._check_call_list(expected_l3out_calls, call_name.call_args_list)
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
(self.driver.l3out_vlan_alloc. (self.driver.l3out_vlan_alloc.
reserve_vlan.assert_called_once_with( reserve_vlan.assert_called_once_with(
es['name'], l3p['id'])) es['name'], l3p['id']))
@@ -1667,23 +1670,23 @@ class TestL3Policy(ApicMappingTestCase):
owner=owner, subnet='128.0.0.0/16', owner=owner, subnet='128.0.0.0/16',
transaction=mock.ANY)] transaction=mock.ANY)]
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
expected_set_domain_calls.append( expected_set_domain_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
owner=owner, transaction=mock.ANY)) owner=owner, transaction=mock.ANY))
expected_logic_node_calls.append( expected_logic_node_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
mocked.APIC_EXT_SWITCH, mocked.APIC_EXT_MODULE, mocked.APIC_EXT_SWITCH, mocked.APIC_EXT_MODULE,
mocked.APIC_EXT_PORT, mock.ANY, '192.168.0.2/24', mocked.APIC_EXT_PORT, mock.ANY, '192.168.0.2/24',
owner=owner, router_id=APIC_EXTERNAL_RID, owner=owner, router_id=APIC_EXTERNAL_RID,
transaction=mock.ANY)) transaction=mock.ANY))
expected_route_calls.append( expected_route_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
mocked.APIC_EXT_SWITCH, '192.168.0.254', mocked.APIC_EXT_SWITCH, '192.168.0.254',
owner=owner, subnet='0.0.0.0/0', owner=owner, subnet='0.0.0.0/0',
transaction=mock.ANY)) transaction=mock.ANY))
expected_route_calls.append( expected_route_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
mocked.APIC_EXT_SWITCH, '192.168.0.1', mocked.APIC_EXT_SWITCH, '192.168.0.1',
owner=owner, subnet='128.0.0.0/16', owner=owner, subnet='128.0.0.0/16',
transaction=mock.ANY)) transaction=mock.ANY))
@@ -1695,12 +1698,12 @@ class TestL3Policy(ApicMappingTestCase):
self._check_call_list(expected_route_calls, self._check_call_list(expected_route_calls,
mgr.ensure_static_route_created.call_args_list) mgr.ensure_static_route_created.call_args_list)
else: else:
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
final_req = re.sub('Shd-Sub', final_req = re.sub('Shd-Sub',
"Shd-%s-%s" % (l3p['id'], es['id']), self.trimmed_l3out) l3out_str % (l3p['id'], es['id']), self.trimmed_l3out)
mgr.apic.post_body.assert_called_once_with( mgr.apic.post_body.assert_called_once_with(
mgr.apic.l3extOut.mo, final_req, l3p_owner, mgr.apic.l3extOut.mo, final_req, l3p_owner,
"Shd-%s-%s" % (l3p['id'], es['id'])) l3out_str % (l3p['id'], es['id']))
self.assertFalse(mgr.set_domain_for_external_routed_network.called) self.assertFalse(mgr.set_domain_for_external_routed_network.called)
self.assertFalse(mgr.ensure_logical_node_profile_created.called) self.assertFalse(mgr.ensure_logical_node_profile_created.called)
self.assertFalse(mgr.ensure_static_route_created.called) self.assertFalse(mgr.ensure_static_route_created.called)
@@ -1724,16 +1727,16 @@ class TestL3Policy(ApicMappingTestCase):
self._test_l3p_plugged_to_es_at_creation(shared_es=False, self._test_l3p_plugged_to_es_at_creation(shared_es=False,
shared_l3p=False) shared_l3p=False)
def test_l3p_plugged_to_es_at_creation_asr_mode(self): def test_l3p_plugged_to_es_at_creation_edge_nat_mode(self):
self._test_l3p_plugged_to_es_at_creation(shared_es=False, self._test_l3p_plugged_to_es_at_creation(shared_es=False,
shared_l3p=False, shared_l3p=False,
is_asr_mode=True) is_edge_nat=True)
def _test_l3p_plugged_to_es_at_update(self, shared_es, def _test_l3p_plugged_to_es_at_update(self, shared_es,
shared_l3p, is_asr_mode=False): shared_l3p, is_edge_nat=False):
# Verify L3P is correctly plugged to ES on APIC during update # Verify L3P is correctly plugged to ES on APIC during update
self._mock_external_dict([('supported', '192.168.0.2/24')], self._mock_external_dict([('supported', '192.168.0.2/24')],
is_asr_mode) is_edge_nat)
es = self.create_external_segment( es = self.create_external_segment(
name='supported', cidr='192.168.0.0/24', name='supported', cidr='192.168.0.0/24',
shared=shared_es, shared=shared_es,
@@ -1755,12 +1758,15 @@ class TestL3Policy(ApicMappingTestCase):
mgr = self.driver.apic_manager mgr = self.driver.apic_manager
owner = self.common_tenant if shared_es else es['tenant_id'] owner = self.common_tenant if shared_es else es['tenant_id']
l3p_owner = self.common_tenant if shared_l3p else l3p['tenant_id'] l3p_owner = self.common_tenant if shared_l3p else l3p['tenant_id']
l3out_str = "Shd-%s-%s"
if is_edge_nat:
l3out_str = "Auto-%s-%s"
expected_l3out_calls = [] expected_l3out_calls = []
call_name = mgr.ensure_external_routed_network_created call_name = mgr.ensure_external_routed_network_created
if self.nat_enabled: if self.nat_enabled:
if not is_asr_mode or not self.pre_l3out: if not is_edge_nat or not self.pre_l3out:
expected_l3out_calls.append( expected_l3out_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
owner=l3p_owner, context=l3p['id'], owner=l3p_owner, context=l3p['id'],
transaction=mock.ANY)) transaction=mock.ANY))
if not self.pre_l3out: if not self.pre_l3out:
@@ -1780,7 +1786,7 @@ class TestL3Policy(ApicMappingTestCase):
transaction=mock.ANY)] transaction=mock.ANY)]
self._check_call_list(expected_l3out_calls, call_name.call_args_list) self._check_call_list(expected_l3out_calls, call_name.call_args_list)
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
(self.driver.l3out_vlan_alloc. (self.driver.l3out_vlan_alloc.
reserve_vlan.assert_called_once_with( reserve_vlan.assert_called_once_with(
es['name'], l3p['id'])) es['name'], l3p['id']))
@@ -1802,23 +1808,23 @@ class TestL3Policy(ApicMappingTestCase):
owner=owner, subnet='128.0.0.0/16', owner=owner, subnet='128.0.0.0/16',
transaction=mock.ANY)] transaction=mock.ANY)]
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
expected_set_domain_calls.append( expected_set_domain_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
owner=owner, transaction=mock.ANY)) owner=owner, transaction=mock.ANY))
expected_logic_node_calls.append( expected_logic_node_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
mocked.APIC_EXT_SWITCH, mocked.APIC_EXT_MODULE, mocked.APIC_EXT_SWITCH, mocked.APIC_EXT_MODULE,
mocked.APIC_EXT_PORT, mock.ANY, '192.168.0.2/24', mocked.APIC_EXT_PORT, mock.ANY, '192.168.0.2/24',
owner=owner, router_id=APIC_EXTERNAL_RID, owner=owner, router_id=APIC_EXTERNAL_RID,
transaction=mock.ANY)) transaction=mock.ANY))
expected_route_calls.append( expected_route_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
mocked.APIC_EXT_SWITCH, '192.168.0.254', mocked.APIC_EXT_SWITCH, '192.168.0.254',
owner=owner, subnet='0.0.0.0/0', owner=owner, subnet='0.0.0.0/0',
transaction=mock.ANY)) transaction=mock.ANY))
expected_route_calls.append( expected_route_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es['id']), mock.call(l3out_str % (l3p['id'], es['id']),
mocked.APIC_EXT_SWITCH, '192.168.0.1', mocked.APIC_EXT_SWITCH, '192.168.0.1',
owner=owner, subnet='128.0.0.0/16', owner=owner, subnet='128.0.0.0/16',
transaction=mock.ANY)) transaction=mock.ANY))
@@ -1830,12 +1836,12 @@ class TestL3Policy(ApicMappingTestCase):
self._check_call_list(expected_route_calls, self._check_call_list(expected_route_calls,
mgr.ensure_static_route_created.call_args_list) mgr.ensure_static_route_created.call_args_list)
else: else:
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
final_req = re.sub('Shd-Sub', final_req = re.sub('Shd-Sub',
"Shd-%s-%s" % (l3p['id'], es['id']), self.trimmed_l3out) l3out_str % (l3p['id'], es['id']), self.trimmed_l3out)
mgr.apic.post_body.assert_called_once_with( mgr.apic.post_body.assert_called_once_with(
mgr.apic.l3extOut.mo, final_req, l3p_owner, mgr.apic.l3extOut.mo, final_req, l3p_owner,
"Shd-%s-%s" % (l3p['id'], es['id'])) l3out_str % (l3p['id'], es['id']))
self.assertFalse(mgr.set_domain_for_external_routed_network.called) self.assertFalse(mgr.set_domain_for_external_routed_network.called)
self.assertFalse(mgr.ensure_logical_node_profile_created.called) self.assertFalse(mgr.ensure_logical_node_profile_created.called)
self.assertFalse(mgr.ensure_static_route_created.called) self.assertFalse(mgr.ensure_static_route_created.called)
@@ -1859,16 +1865,16 @@ class TestL3Policy(ApicMappingTestCase):
self._test_l3p_plugged_to_es_at_update(shared_es=False, self._test_l3p_plugged_to_es_at_update(shared_es=False,
shared_l3p=False) shared_l3p=False)
def test_l3p_plugged_to_es_at_update_asr_mode(self): def test_l3p_plugged_to_es_at_update_edge_nat_mode(self):
self._test_l3p_plugged_to_es_at_update(shared_es=False, self._test_l3p_plugged_to_es_at_update(shared_es=False,
shared_l3p=False, shared_l3p=False,
is_asr_mode=True) is_edge_nat=True)
def _test_l3p_unplugged_from_es_on_delete(self, shared_es, def _test_l3p_unplugged_from_es_on_delete(self, shared_es,
shared_l3p, is_asr_mode=False): shared_l3p, is_edge_nat=False):
self._mock_external_dict([('supported1', '192.168.0.2/24'), self._mock_external_dict([('supported1', '192.168.0.2/24'),
('supported2', '192.168.1.2/24')], ('supported2', '192.168.1.2/24')],
is_asr_mode) is_edge_nat)
es1 = self.create_external_segment( es1 = self.create_external_segment(
name='supported1', cidr='192.168.0.0/24', shared=shared_es, name='supported1', cidr='192.168.0.0/24', shared=shared_es,
external_routes=[{'destination': '0.0.0.0/0', external_routes=[{'destination': '0.0.0.0/0',
@@ -1898,8 +1904,11 @@ class TestL3Policy(ApicMappingTestCase):
expected_delete_calls.append( expected_delete_calls.append(
mock.call(es1['id'], owner=owner, transaction=mock.ANY)) mock.call(es1['id'], owner=owner, transaction=mock.ANY))
if self.nat_enabled: if self.nat_enabled:
l3out_str = "Shd-%s-%s"
if is_edge_nat:
l3out_str = "Auto-%s-%s"
expected_delete_calls.append( expected_delete_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es1['id']), mock.call(l3out_str % (l3p['id'], es1['id']),
owner=l3p_owner, transaction=mock.ANY)) owner=l3p_owner, transaction=mock.ANY))
self._check_call_list( self._check_call_list(
expected_delete_calls, expected_delete_calls,
@@ -1913,7 +1922,7 @@ class TestL3Policy(ApicMappingTestCase):
call_name.assert_called_once_with(APIC_PRE_L3OUT_TENANT, call_name.assert_called_once_with(APIC_PRE_L3OUT_TENANT,
es1['name'], None, transaction=mock.ANY) es1['name'], None, transaction=mock.ANY)
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
self.driver.l3out_vlan_alloc.release_vlan.assert_called_once_with( self.driver.l3out_vlan_alloc.release_vlan.assert_called_once_with(
es1['name'], l3p['id']) es1['name'], l3p['id'])
@@ -1939,10 +1948,13 @@ class TestL3Policy(ApicMappingTestCase):
mock.call(es1['id'], owner=owner, transaction=mock.ANY), mock.call(es1['id'], owner=owner, transaction=mock.ANY),
mock.call(es2['id'], owner=owner, transaction=mock.ANY)]) mock.call(es2['id'], owner=owner, transaction=mock.ANY)])
if self.nat_enabled: if self.nat_enabled:
l3out_str = "Shd-%s-%s"
if is_edge_nat:
l3out_str = "Auto-%s-%s"
expected_delete_calls.extend([ expected_delete_calls.extend([
mock.call("Shd-%s-%s" % (l3p['id'], es1['id']), mock.call(l3out_str % (l3p['id'], es1['id']),
owner=l3p_owner, transaction=mock.ANY), owner=l3p_owner, transaction=mock.ANY),
mock.call("Shd-%s-%s" % (l3p['id'], es2['id']), mock.call(l3out_str % (l3p['id'], es2['id']),
owner=l3p_owner, transaction=mock.ANY)]) owner=l3p_owner, transaction=mock.ANY)])
self._check_call_list( self._check_call_list(
expected_delete_calls, expected_delete_calls,
@@ -1967,7 +1979,7 @@ class TestL3Policy(ApicMappingTestCase):
expected_calls, expected_calls,
mgr.set_context_for_external_routed_network.call_args_list) mgr.set_context_for_external_routed_network.call_args_list)
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
expected_release_vlan_calls = [mock.call(es1['name'], l3p['id']), expected_release_vlan_calls = [mock.call(es1['name'], l3p['id']),
mock.call(es2['name'], l3p['id'])] mock.call(es2['name'], l3p['id'])]
self._check_call_list( self._check_call_list(
@@ -1988,16 +2000,16 @@ class TestL3Policy(ApicMappingTestCase):
self._test_l3p_unplugged_from_es_on_delete(shared_es=False, self._test_l3p_unplugged_from_es_on_delete(shared_es=False,
shared_l3p=False) shared_l3p=False)
def test_l3p_unplugged_from_es_on_delete_asr_mode(self): def test_l3p_unplugged_from_es_on_delete_edge_nat_mode(self):
self._test_l3p_unplugged_from_es_on_delete(shared_es=False, self._test_l3p_unplugged_from_es_on_delete(shared_es=False,
shared_l3p=False, shared_l3p=False,
is_asr_mode=True) is_edge_nat=True)
def _test_l3p_unplugged_from_es_on_update(self, shared_es, def _test_l3p_unplugged_from_es_on_update(self, shared_es,
shared_l3p, is_asr_mode=False): shared_l3p, is_edge_nat=False):
self._mock_external_dict([('supported1', '192.168.0.2/24'), self._mock_external_dict([('supported1', '192.168.0.2/24'),
('supported', '192.168.1.2/24')], ('supported', '192.168.1.2/24')],
is_asr_mode) is_edge_nat)
es1 = self.create_external_segment( es1 = self.create_external_segment(
name='supported1', cidr='192.168.0.0/24', shared=shared_es, name='supported1', cidr='192.168.0.0/24', shared=shared_es,
external_routes=[{'destination': '0.0.0.0/0', external_routes=[{'destination': '0.0.0.0/0',
@@ -2028,14 +2040,16 @@ class TestL3Policy(ApicMappingTestCase):
l3p = self.update_l3_policy( l3p = self.update_l3_policy(
l3p['id'], tenant_id=l3p['tenant_id'], expected_res_status=200, l3p['id'], tenant_id=l3p['tenant_id'], expected_res_status=200,
external_segments={es2['id']: ['169.254.0.4']})['l3_policy'] external_segments={es2['id']: ['169.254.0.4']})['l3_policy']
l3out_str = "Shd-%s-%s"
if is_edge_nat:
l3out_str = "Auto-%s-%s"
expected_delete_calls = [] expected_delete_calls = []
if not self.pre_l3out: if not self.pre_l3out:
expected_delete_calls.append( expected_delete_calls.append(
mock.call(es1['id'], owner=owner, transaction=mock.ANY)) mock.call(es1['id'], owner=owner, transaction=mock.ANY))
if self.nat_enabled: if self.nat_enabled:
expected_delete_calls.append( expected_delete_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es1['id']), mock.call(l3out_str % (l3p['id'], es1['id']),
owner=l3p_owner, transaction=mock.ANY)) owner=l3p_owner, transaction=mock.ANY))
self._check_call_list( self._check_call_list(
expected_delete_calls, expected_delete_calls,
@@ -2050,15 +2064,15 @@ class TestL3Policy(ApicMappingTestCase):
expected_calls, expected_calls,
mgr.set_context_for_external_routed_network.call_args_list) mgr.set_context_for_external_routed_network.call_args_list)
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
self.driver.l3out_vlan_alloc.release_vlan.assert_called_once_with( self.driver.l3out_vlan_alloc.release_vlan.assert_called_once_with(
es1['name'], l3p['id']) es1['name'], l3p['id'])
expected_l3out_calls = [] expected_l3out_calls = []
if self.nat_enabled: if self.nat_enabled:
if not is_asr_mode or not self.pre_l3out: if not is_edge_nat or not self.pre_l3out:
expected_l3out_calls.append( expected_l3out_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es2['id']), mock.call(l3out_str % (l3p['id'], es2['id']),
owner=l3p_owner, context=l3p['id'], owner=l3p_owner, context=l3p['id'],
transaction=mock.ANY)) transaction=mock.ANY))
if not self.pre_l3out: if not self.pre_l3out:
@@ -2073,7 +2087,7 @@ class TestL3Policy(ApicMappingTestCase):
self._check_call_list(expected_l3out_calls, self._check_call_list(expected_l3out_calls,
mgr.ensure_external_routed_network_created.call_args_list) mgr.ensure_external_routed_network_created.call_args_list)
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
(self.driver.l3out_vlan_alloc. (self.driver.l3out_vlan_alloc.
reserve_vlan.assert_called_once_with( reserve_vlan.assert_called_once_with(
es2['name'], l3p['id'])) es2['name'], l3p['id']))
@@ -2087,12 +2101,12 @@ class TestL3Policy(ApicMappingTestCase):
mocked.APIC_EXT_ENCAP, '192.168.1.2/24', mocked.APIC_EXT_ENCAP, '192.168.1.2/24',
owner=owner, router_id=APIC_EXTERNAL_RID, owner=owner, router_id=APIC_EXTERNAL_RID,
transaction=mock.ANY)] transaction=mock.ANY)]
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
expected_set_domain_calls.append( expected_set_domain_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es2['id']), mock.call(l3out_str % (l3p['id'], es2['id']),
owner=owner, transaction=mock.ANY)) owner=owner, transaction=mock.ANY))
expected_logic_node_calls.append( expected_logic_node_calls.append(
mock.call("Shd-%s-%s" % (l3p['id'], es2['id']), mock.call(l3out_str % (l3p['id'], es2['id']),
mocked.APIC_EXT_SWITCH, mocked.APIC_EXT_MODULE, mocked.APIC_EXT_SWITCH, mocked.APIC_EXT_MODULE,
mocked.APIC_EXT_PORT, mock.ANY, '192.168.1.2/24', mocked.APIC_EXT_PORT, mock.ANY, '192.168.1.2/24',
owner=owner, router_id=APIC_EXTERNAL_RID, owner=owner, router_id=APIC_EXTERNAL_RID,
@@ -2103,12 +2117,13 @@ class TestL3Policy(ApicMappingTestCase):
self._check_call_list(expected_logic_node_calls, self._check_call_list(expected_logic_node_calls,
mgr.ensure_logical_node_profile_created.call_args_list) mgr.ensure_logical_node_profile_created.call_args_list)
else: else:
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
final_req = re.sub('Shd-Sub', final_req = re.sub('Shd-Sub',
"Shd-%s-%s" % (l3p['id'], es2['id']), self.trimmed_l3out) l3out_str % (l3p['id'], es2['id']),
self.trimmed_l3out)
mgr.apic.post_body.assert_called_once_with( mgr.apic.post_body.assert_called_once_with(
mgr.apic.l3extOut.mo, final_req, l3p_owner, mgr.apic.l3extOut.mo, final_req, l3p_owner,
"Shd-%s-%s" % (l3p['id'], es2['id'])) l3out_str % (l3p['id'], es2['id']))
self.assertFalse(mgr.set_domain_for_external_routed_network.called) self.assertFalse(mgr.set_domain_for_external_routed_network.called)
self.assertFalse(mgr.ensure_logical_node_profile_created.called) self.assertFalse(mgr.ensure_logical_node_profile_created.called)
@@ -2137,9 +2152,9 @@ class TestL3Policy(ApicMappingTestCase):
mock.call(es2['id'], owner=owner, transaction=mock.ANY)]) mock.call(es2['id'], owner=owner, transaction=mock.ANY)])
if self.nat_enabled: if self.nat_enabled:
expected_delete_calls.extend([ expected_delete_calls.extend([
mock.call("Shd-%s-%s" % (l3p['id'], es1['id']), mock.call(l3out_str % (l3p['id'], es1['id']),
owner=l3p_owner, transaction=mock.ANY), owner=l3p_owner, transaction=mock.ANY),
mock.call("Shd-%s-%s" % (l3p['id'], es2['id']), mock.call(l3out_str % (l3p['id'], es2['id']),
owner=l3p_owner, transaction=mock.ANY)]) owner=l3p_owner, transaction=mock.ANY)])
self._check_call_list( self._check_call_list(
expected_delete_calls, expected_delete_calls,
@@ -2164,7 +2179,7 @@ class TestL3Policy(ApicMappingTestCase):
expected_calls, expected_calls,
mgr.set_context_for_external_routed_network.call_args_list) mgr.set_context_for_external_routed_network.call_args_list)
if is_asr_mode and self.nat_enabled: if is_edge_nat and self.nat_enabled:
expected_release_vlan_calls = [mock.call(es1['name'], l3p['id']), expected_release_vlan_calls = [mock.call(es1['name'], l3p['id']),
mock.call(es2['name'], l3p['id'])] mock.call(es2['name'], l3p['id'])]
self._check_call_list( self._check_call_list(
@@ -2185,10 +2200,10 @@ class TestL3Policy(ApicMappingTestCase):
self._test_l3p_unplugged_from_es_on_update(shared_es=False, self._test_l3p_unplugged_from_es_on_update(shared_es=False,
shared_l3p=False) shared_l3p=False)
def test_l3p_unplugged_from_es_on_update_asr_mode(self): def test_l3p_unplugged_from_es_on_update_edge_nat_mode(self):
self._test_l3p_unplugged_from_es_on_update(shared_es=False, self._test_l3p_unplugged_from_es_on_update(shared_es=False,
shared_l3p=False, shared_l3p=False,
is_asr_mode=True) is_edge_nat=True)
def test_verify_unsupported_es_noop(self): def test_verify_unsupported_es_noop(self):
# Verify L3P is correctly plugged to ES on APIC during update # Verify L3P is correctly plugged to ES on APIC during update
@@ -2714,19 +2729,20 @@ class TestExternalSegment(ApicMappingTestCase):
self.assertEqual('PATNotSupportedByApicDriver', self.assertEqual('PATNotSupportedByApicDriver',
res['NeutronError']['type']) res['NeutronError']['type'])
def test_asr_invalid_vlan_range_rejected(self): def test_edge_nat_invalid_vlan_range_rejected(self):
self._mock_external_dict([('supported', '192.168.0.2/24')], self._mock_external_dict([('supported', '192.168.0.2/24')],
is_asr_mode=True) is_edge_nat=True)
self.driver.l3out_vlan_alloc.l3out_vlan_ranges = {} self.driver.l3out_vlan_alloc.l3out_vlan_ranges = {}
res = self.create_external_segment( res = self.create_external_segment(
name='supported', expected_res_status=400) name='supported', expected_res_status=400)
self.assertEqual('ASRBadVlanRange', res['NeutronError']['type']) self.assertEqual('EdgeNatBadVlanRange', res['NeutronError']['type'])
ext_info = self.driver.apic_manager.ext_net_dict.get('supported') ext_info = self.driver.apic_manager.ext_net_dict.get('supported')
del ext_info['vlan_range'] del ext_info['vlan_range']
res = self.create_external_segment( res = self.create_external_segment(
name='supported', expected_res_status=400) name='supported', expected_res_status=400)
self.assertEqual('ASRVlanRangeNotFound', res['NeutronError']['type']) self.assertEqual('EdgeNatVlanRangeNotFound',
res['NeutronError']['type'])
def _test_create_delete(self, shared=False): def _test_create_delete(self, shared=False):
mgr = self.driver.apic_manager mgr = self.driver.apic_manager
@@ -3227,9 +3243,9 @@ class TestExternalSegmentPreL3Out(TestExternalSegment):
tenant_id='some_other_tenant', cidr='192.168.0.2/24', tenant_id='some_other_tenant', cidr='192.168.0.2/24',
expected_res_status=201) expected_res_status=201)
def test_asr_wrong_L3out_IF_type_rejected(self): def test_edge_nat_wrong_L3out_IF_type_rejected(self):
self._mock_external_dict([('supported', '192.168.0.2/24')], self._mock_external_dict([('supported', '192.168.0.2/24')],
is_asr_mode=True) is_edge_nat=True)
self.driver._query_l3out_info.return_value['l3out'] = ( self.driver._query_l3out_info.return_value['l3out'] = (
[{u'l3extLNodeP': [{u'l3extLNodeP':
{u'attributes': {u'attributes':
@@ -3241,11 +3257,12 @@ class TestExternalSegmentPreL3Out(TestExternalSegment):
}}}]}}]}}]) }}}]}}]}}])
res = self.create_external_segment( res = self.create_external_segment(
name='supported', expected_res_status=400) name='supported', expected_res_status=400)
self.assertEqual('ASRWrongL3OutIFType', res['NeutronError']['type']) self.assertEqual('EdgeNatWrongL3OutIFType',
res['NeutronError']['type'])
def test_asr_wrong_L3out_OSPF_Auth_type_rejected(self): def test_edge_nat_wrong_L3out_OSPF_Auth_type_rejected(self):
self._mock_external_dict([('supported', '192.168.0.2/24')], self._mock_external_dict([('supported', '192.168.0.2/24')],
is_asr_mode=True) is_edge_nat=True)
self.driver._query_l3out_info.return_value['l3out'] = ( self.driver._query_l3out_info.return_value['l3out'] = (
[{u'l3extLNodeP': [{u'l3extLNodeP':
{u'attributes': {u'attributes':
@@ -3257,12 +3274,12 @@ class TestExternalSegmentPreL3Out(TestExternalSegment):
}}}]}}]}}]) }}}]}}]}}])
res = self.create_external_segment( res = self.create_external_segment(
name='supported', expected_res_status=400) name='supported', expected_res_status=400)
self.assertEqual('ASRWrongL3OutAuthTypeForOSPF', self.assertEqual('EdgeNatWrongL3OutAuthTypeForOSPF',
res['NeutronError']['type']) res['NeutronError']['type'])
def test_asr_wrong_L3out_BGP_Auth_type_rejected(self): def test_edge_nat_wrong_L3out_BGP_Auth_type_rejected(self):
self._mock_external_dict([('supported', '192.168.0.2/24')], self._mock_external_dict([('supported', '192.168.0.2/24')],
is_asr_mode=True) is_edge_nat=True)
self.driver._query_l3out_info.return_value['l3out'] = ( self.driver._query_l3out_info.return_value['l3out'] = (
[{u'l3extLNodeP': [{u'l3extLNodeP':
{u'attributes': {u'attributes':
@@ -3279,7 +3296,7 @@ class TestExternalSegmentPreL3Out(TestExternalSegment):
{u'type': u'sha1'}}}]}}]}}]) {u'type': u'sha1'}}}]}}]}}])
res = self.create_external_segment( res = self.create_external_segment(
name='supported', expected_res_status=400) name='supported', expected_res_status=400)
self.assertEqual('ASRWrongL3OutAuthTypeForBGP', self.assertEqual('EdgeNatWrongL3OutAuthTypeForBGP',
res['NeutronError']['type']) res['NeutronError']['type'])
# try again with a good input # try again with a good input