Merge "[OVN] Allow only one physical network per bridge"
This commit is contained in:
commit
c84b8a63f2
|
@ -1210,8 +1210,7 @@ class OVNMechanismDriver(api.MechanismDriver):
|
|||
return False
|
||||
|
||||
br_map = agent.get('configurations', {}).get('bridge-mappings', '')
|
||||
mapping_dict = helpers.parse_mappings(br_map.split(','),
|
||||
unique_values=False)
|
||||
mapping_dict = helpers.parse_mappings(br_map.split(','))
|
||||
return segment['physical_network'] in mapping_dict
|
||||
|
||||
def patch_plugin_merge(self, method_name, new_fn, op=operator.add):
|
||||
|
|
|
@ -44,8 +44,7 @@ def _parse_ovn_cms_options(chassis):
|
|||
def _parse_bridge_mappings(chassis):
|
||||
other_config = ovn_utils.get_ovn_chassis_other_config(chassis)
|
||||
bridge_mappings = other_config.get('ovn-bridge-mappings', '')
|
||||
bridge_mappings = helpers.parse_mappings(bridge_mappings.split(','),
|
||||
unique_values=False)
|
||||
bridge_mappings = helpers.parse_mappings(bridge_mappings.split(','))
|
||||
return {k: [v] for k, v in bridge_mappings.items()}
|
||||
|
||||
|
||||
|
|
|
@ -3089,6 +3089,11 @@ class TestOVNMechanismDriverSegment(MechDriverSetupBase,
|
|||
self.assertTrue(
|
||||
self.mech_driver.check_segment_for_agent(segment, agent))
|
||||
|
||||
agent['configurations'] = {
|
||||
'bridge-mappings': 'physnet1:br-ex1,physnet1:br-ex2'}
|
||||
self.assertRaises(ValueError, self.mech_driver.check_segment_for_agent,
|
||||
segment, agent)
|
||||
|
||||
|
||||
@mock.patch.object(n_net, 'get_random_mac', lambda *_: '01:02:03:04:05:06')
|
||||
class TestOVNMechanismDriverDHCPOptions(OVNMechanismDriverTestCase):
|
||||
|
|
Loading…
Reference in New Issue