x
/
group-based-policy
Code Issues Proposed changes

[apic-aim] Fix unit tests for AIM update 

Now that AIM keeps resources in PENDING state until AID actually
synchronizes them, as it should, the TestSyncState.test_*_synced tests
need to mock get_status to return the SYNCED state.

Also, a new attribute added to the AIM resources was breaking UTs for
the aim-mapping driver.  This new attribute does not need to be
validated and is fixed here.

Change-Id: I84f3181ba769c58773137b34f858888d939f3fcc
This commit is contained in:
Robert Kukura 2016-10-10 22:08:13 -04:00
parent 5c22a9fdc0
commit 7dc9e64c94
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -861,6 +861,11 @@ class TestAimMapping(ApicAimTestCase):
class TestSyncState(ApicAimTestCase):
@staticmethod
def _get_synced_status(self, context, resource):
status = aim_status.AciStatus.SYNCED
return aim_status.AciStatus(sync_status=status)
@staticmethod
def _get_pending_status_for_type(resource, type):
status = (isinstance(resource, type) and
@ -883,7 +888,9 @@ class TestSyncState(ApicAimTestCase):
self.assertEqual(expected_state, net['apic:synchronization_state'])
def test_network_synced(self):
self._test_network('synced')
with mock.patch('aim.aim_manager.AimManager.get_status',
TestSyncState._get_synced_status):
self._test_network('synced')
def test_network_bd_build(self):
def get_status(self, context, resource):
@ -942,7 +949,9 @@ class TestSyncState(ApicAimTestCase):
self.assertEqual(expected_state, scope['apic:synchronization_state'])
def test_address_scope_synced(self):
self._test_address_scope('synced')
with mock.patch('aim.aim_manager.AimManager.get_status',
TestSyncState._get_synced_status):
self._test_address_scope('synced')
def test_address_scope_vrf_build(self):
def get_status(self, context, resource):
@ -969,7 +978,9 @@ class TestSyncState(ApicAimTestCase):
self.assertEqual(expected_state, router['apic:synchronization_state'])
def test_router_synced(self):
self._test_router('synced')
with mock.patch('aim.aim_manager.AimManager.get_status',
TestSyncState._get_synced_status):
self._test_router('synced')
def test_router_contract_build(self):
def get_status(self, context, resource):
@ -1017,7 +1028,9 @@ class TestSyncState(ApicAimTestCase):
self.assertEqual(expected_state, router['apic:synchronization_state'])
def test_router_interface_vrf_synced(self):
self._test_router_interface_vrf('synced')
with mock.patch('aim.aim_manager.AimManager.get_status',
TestSyncState._get_synced_status):
self._test_router_interface_vrf('synced')
def test_router_interface_vrf_build(self):
def get_status(self, context, resource):
@ -1054,7 +1067,9 @@ class TestSyncState(ApicAimTestCase):
self.assertEqual(expected_state, subnet['apic:synchronization_state'])
def test_router_interface_subnet_synced(self):
self._test_router_interface_subnet('synced')
with mock.patch('aim.aim_manager.AimManager.get_status',
TestSyncState._get_synced_status):
self._test_router_interface_subnet('synced')
def test_router_interface_subnet_build(self):
def get_status(self, context, resource):

3
gbpservice/neutron/tests/unit/services/grouppolicy/test_aim_mapping_driver.py
View File

@ -404,7 +404,8 @@ class TestL2PolicyBase(test_nr_base.TestL2Policy, AIMBaseTestCase):
if entry['filter_name'] != 'AnyFilter':
observed_entries_attrs.append(
{k: unicode(entry[k]) for k in entry if k not in [
'name', 'display_name', 'filter_name', 'tenant_name']})
'name', 'display_name', 'filter_name', 'tenant_name',
'monitored']})
self.assertItemsEqual(expected_entries_attrs, observed_entries_attrs)