x/group-based-policy
Code Issues Proposed changes

Merge "[AIM] Remove spaces from hard-coded display-names"

Browse Source
This commit is contained in:
Jenkins
2016-12-20 22:26:20 +00:00
committed by Gerrit Code Review
parent 948ae0c53d bba300ec9b
commit 54c43d7dd4
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gbpservice/neutron/plugins/ml2plus/drivers/apic_aim/mechanism_driver.py
View File

@@ -167,15 +167,15 @@ class ApicMechanismDriver(api_plus.MechanismDriver):
self.aim.create(aim_ctx, ap)
filter = aim_resource.Filter(tenant_name=tenant_aname,
name=ANY_FILTER_NAME,
display_name='Any Filter')
name=ANY_FILTER_NAME,
display_name=aim_utils.sanitize_display_name('AnyFilter'))
if not self.aim.get(aim_ctx, filter):
self.aim.create(aim_ctx, filter)
entry = aim_resource.FilterEntry(tenant_name=tenant_aname,
filter_name=ANY_FILTER_NAME,
name=ANY_FILTER_ENTRY_NAME,
display_name='Any FilterEntry')
filter_name=ANY_FILTER_NAME,
name=ANY_FILTER_ENTRY_NAME,
display_name=aim_utils.sanitize_display_name('AnyFilterEntry'))
if not self.aim.get(aim_ctx, entry):
self.aim.create(aim_ctx, entry)
@@ -401,7 +401,7 @@ class ApicMechanismDriver(api_plus.MechanismDriver):
router_db = self.l3_plugin._get_router(context._plugin_context,
router_id)
dname = aim_utils.sanitize_display_name(
router_db.name + " - " +
router_db.name + "-" +
(current['name'] or current['cidr']))
sn = self._map_subnet(current, gw_ip, bd)
@@ -599,7 +599,7 @@ class ApicMechanismDriver(api_plus.MechanismDriver):
one())
dname = aim_utils.sanitize_display_name(
name + " - " + (subnet_db.name or subnet_db.cidr))
name + "-" + (subnet_db.name or subnet_db.cidr))
bd = self._map_network(session, network_db, True)
sn = self._map_subnet(subnet_db, intf.ip_address, bd)
@@ -745,7 +745,7 @@ class ApicMechanismDriver(api_plus.MechanismDriver):
gw_ip = self._ip_for_subnet(subnet, port['fixed_ips'])
dname = aim_utils.sanitize_display_name(
router['name'] + " - " +
router['name'] + "-" +
(subnet['name'] or subnet['cidr']))
sn = self._map_subnet(subnet, gw_ip, bd)
@@ -1258,7 +1258,7 @@ class ApicMechanismDriver(api_plus.MechanismDriver):
def _ensure_common_tenant(self, aim_ctx):
attrs = aim_resource.Tenant(name=COMMON_TENANT_NAME,
display_name='Common Tenant')
display_name=aim_utils.sanitize_display_name('CommonTenant'))
tenant = self.aim.get(aim_ctx, attrs)
if not tenant:
LOG.info(_LI("Creating common tenant"))
@@ -1270,7 +1270,8 @@ class ApicMechanismDriver(api_plus.MechanismDriver):
attrs = self._map_unrouted_vrf()
vrf = self.aim.get(aim_ctx, attrs)
if not vrf:
attrs.display_name = 'Common Unrouted VRF'
attrs.display_name = (
aim_utils.sanitize_display_name('CommonUnroutedVRF'))
LOG.info(_LI("Creating common unrouted VRF"))
vrf = self.aim.create(aim_ctx, attrs)
return vrf
@@ -1279,7 +1280,8 @@ class ApicMechanismDriver(api_plus.MechanismDriver):
attrs = self._map_default_vrf(aim_ctx.db_session, router)
vrf = self.aim.get(aim_ctx, attrs)
if not vrf:
attrs.display_name = 'Default Routed VRF'
attrs.display_name = (
aim_utils.sanitize_display_name('DefaultRoutedVRF'))
LOG.info(_LI("Creating default VRF for %s"), attrs.tenant_name)
vrf = self.aim.create(aim_ctx, attrs)
return vrf

14
gbpservice/neutron/tests/unit/plugins/ml2plus/test_apic_aim.py
View File

@@ -367,14 +367,14 @@ class TestAimMapping(ApicAimTestCase):
vrf_tenant_dname = ''
else:
vrf_aname = 'DefaultVRF'
vrf_dname = 'Default Routed VRF'
vrf_dname = 'DefaultRoutedVRF'
vrf_tenant_aname = tenant_aname
vrf_tenant_dname = ''
else:
vrf_aname = self.driver.apic_system_id + '_UnroutedVRF'
vrf_dname = 'Common Unrouted VRF'
vrf_dname = 'CommonUnroutedVRF'
vrf_tenant_aname = 'common'
vrf_tenant_dname = 'Common Tenant'
vrf_tenant_dname = 'CommonTenant'
aim_bd = self._get_bd(aname, tenant_aname)
self.assertEqual(tenant_aname, aim_bd.tenant_name)
@@ -434,7 +434,7 @@ class TestAimMapping(ApicAimTestCase):
self.assertEqual(net_aname, aim_subnet.bd_name)
self.assertEqual(gw_ip_mask, aim_subnet.gw_ip_mask)
self.assertEqual('public', aim_subnet.scope)
display_name = ("%s_-_%s" %
display_name = ("%s-%s" %
(router['name'],
(subnet['name'] or subnet['cidr'])))
self.assertEqual(display_name, aim_subnet.display_name)
@@ -502,7 +502,7 @@ class TestAimMapping(ApicAimTestCase):
vrf_tenant_dname = ''
else:
vrf_aname = 'DefaultVRF'
vrf_dname = 'Default Routed VRF'
vrf_dname = 'DefaultRoutedVRF'
vrf_tenant_aname = tenant_aname
vrf_tenant_dname = ''
@@ -540,14 +540,14 @@ class TestAimMapping(ApicAimTestCase):
aim_filter = self._get_filter('AnyFilter', tenant_aname)
self.assertEqual(tenant_aname, aim_filter.tenant_name)
self.assertEqual('AnyFilter', aim_filter.name)
self.assertEqual('Any Filter', aim_filter.display_name)
self.assertEqual('AnyFilter', aim_filter.display_name)
aim_entry = self._get_filter_entry('AnyFilterEntry', 'AnyFilter',
tenant_aname)
self.assertEqual(tenant_aname, aim_entry.tenant_name)
self.assertEqual('AnyFilter', aim_entry.filter_name)
self.assertEqual('AnyFilterEntry', aim_entry.name)
self.assertEqual('Any FilterEntry', aim_entry.display_name)
self.assertEqual('AnyFilterEntry', aim_entry.display_name)
self.assertEqual('unspecified', aim_entry.arp_opcode)
self.assertEqual('unspecified', aim_entry.ether_type)
self.assertEqual('unspecified', aim_entry.ip_protocol)