x/group-based-policy
Code Issues Proposed changes

[apic-aim] set the display_name for the tenant

Browse Source 
This was missing inside the ensure_tenant() call.

Change-Id: I0a6edeec7d1beec26db16d1f5091e5419c526421
This commit is contained in:
Kent Wu
2016-12-20 16:52:28 -08:00
parent 9562609487
commit cccb371d36
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,10 +134,12 @@ class ApicMechanismDriver(api_plus.MechanismDriver):
session = plugin_context.session
with session.begin(subtransactions=True):
tenant_aname = self._get_tenant_name(session, tenant_id)
project_name = self.project_name_cache.get_project_name(tenant_id)
if project_name is None:
project_name = ''
aim_ctx = aim_context.AimContext(session)
tenant = aim_resource.Tenant(name=tenant_aname)
tenant = aim_resource.Tenant(name=tenant_aname,
display_name=aim_utils.sanitize_display_name(project_name))
if not self.aim.get(aim_ctx, tenant):
self.aim.create(aim_ctx, tenant)
ap = aim_resource.ApplicationProfile(tenant_name=tenant_aname,

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

@@ -357,12 +357,12 @@ class TestAimMapping(ApicAimTestCase):
vrf_aname = scope['id']
vrf_dname = scope['name']
vrf_tenant_aname = scope['tenant_id']
vrf_tenant_dname = ''
vrf_tenant_dname = 'TestTenantName'
else:
vrf_aname = 'DefaultVRF'
vrf_dname = 'Default Routed VRF'
vrf_tenant_aname = tenant_aname
vrf_tenant_dname = ''
vrf_tenant_dname = 'TestTenantName'
else:
vrf_aname = 'UnroutedVRF'
vrf_dname = 'Common Unrouted VRF'
@@ -492,12 +492,12 @@ class TestAimMapping(ApicAimTestCase):
vrf_aname = scope['id']
vrf_dname = scope['name']
vrf_tenant_aname = scope['tenant_id']
vrf_tenant_dname = ''
vrf_tenant_dname = 'TestTenantName'
else:
vrf_aname = 'DefaultVRF'
vrf_dname = 'Default Routed VRF'
vrf_tenant_aname = tenant_aname
vrf_tenant_dname = ''
vrf_tenant_dname = 'TestTenantName'
aim_tenant = self._get_tenant(vrf_tenant_aname)
self.assertEqual(vrf_tenant_aname, aim_tenant.name)