Merge "[APIC-mapping] Fix intermittent UT failure" into stable/mitaka

gbpservice/neutron/tests/unit/services/grouppolicy/test_apic_mapping.py

@@ -330,6 +330,8 @@ class ApicMappingVlanTestCase(ApicMappingTestCase):
         kwargs['default_agent_conf'] = False
         super(ApicMappingVlanTestCase, self).setUp(**kwargs)
         self.non_apic_network = True
+        self.agent_conf['configurations'][
+            'bridge_mappings']['physnet2'] = 'br-eth2'
 
     def _get_ptg_shadow_net(self, ptg):
         net = self._list_resource('networks', self.api,