openstack
/
neutron
Code Issues Proposed changes

Merge "Revert "Since OVN 20.06, config is stored in "Chassis.other_config"""

This commit is contained in:
Zuul 2022-10-06 18:33:31 +00:00 committed by Gerrit Code Review
parent 3e2fee214d 72dd768a12
commit ee8ed25b5a
19 changed files with 102 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/common/ovn/utils.py
View File

@ -641,8 +641,8 @@ def compute_address_pairs_diff(ovn_port, neutron_port):
def get_ovn_cms_options(chassis):
"""Return the list of CMS options in a Chassis."""
return [opt.strip() for opt in chassis.other_config.get(
constants.OVN_CMS_OPTIONS, '').split(',')]
return [opt.strip() for opt in chassis.external_ids.get(
constants.OVN_CMS_OPTIONS, '').split(',')]
def is_gateway_chassis(chassis):

15
neutron/plugins/ml2/drivers/ovn/agent/neutron_agent.py
View File

@ -89,7 +89,7 @@ class NeutronAgent(abc.ABC):
'configurations': {
'chassis_name': self.chassis.name,
'bridge-mappings':
self.chassis.other_config.get('ovn-bridge-mappings', '')},
self.chassis.external_ids.get('ovn-bridge-mappings', '')},
'start_flag': True,
'agent_type': self.agent_type,
'id': self.agent_id,
@ -141,8 +141,9 @@ class ControllerAgent(NeutronAgent):
@staticmethod # it is by default, but this makes pep8 happy
def __new__(cls, chassis_private, driver):
other_config = cls.chassis_from_private(chassis_private).other_config
if 'enable-chassis-as-gw' in other_config.get('ovn-cms-options', []):
external_ids = cls.chassis_from_private(chassis_private).external_ids
if ('enable-chassis-as-gw' in
external_ids.get('ovn-cms-options', [])):
cls = ControllerGatewayAgent
return super().__new__(cls)
@ -165,8 +166,8 @@ class ControllerAgent(NeutronAgent):
def update(self, chassis_private, clear_down=False):
super().update(chassis_private, clear_down)
other_config = self.chassis_from_private(chassis_private).other_config
if 'enable-chassis-as-gw' in other_config.get('ovn-cms-options', []):
external_ids = self.chassis_from_private(chassis_private).external_ids
if 'enable-chassis-as-gw' in external_ids.get('ovn-cms-options', []):
self.__class__ = ControllerGatewayAgent
@ -175,9 +176,9 @@ class ControllerGatewayAgent(ControllerAgent):
def update(self, chassis_private, clear_down=False):
super().update(chassis_private, clear_down)
other_config = self.chassis_from_private(chassis_private).other_config
external_ids = self.chassis_from_private(chassis_private).external_ids
if ('enable-chassis-as-gw' not in
other_config.get('ovn-cms-options', [])):
external_ids.get('ovn-cms-options', [])):
self.__class__ = ControllerAgent

7
neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
View File

@ -191,7 +191,7 @@ class OVNMechanismDriver(api.MechanismDriver):
def get_supported_vif_types(self):
vif_types = set()
for ch in self.sb_ovn.chassis_list().execute(check_error=True):
dp_type = ch.other_config.get('datapath-type', '')
dp_type = ch.external_ids.get('datapath-type', '')
if dp_type == ovn_const.CHASSIS_DATAPATH_NETDEV:
vif_types.add(portbindings.VIF_TYPE_VHOST_USER)
else:
@ -962,9 +962,8 @@ class OVNMechanismDriver(api.MechanismDriver):
'agent': agent})
return
chassis = agent.chassis
other_config = chassis.other_config
datapath_type = other_config.get('datapath-type', '')
iface_types = other_config.get('iface-types', '')
datapath_type = chassis.external_ids.get('datapath-type', '')
iface_types = chassis.external_ids.get('iface-types', '')
iface_types = iface_types.split(',') if iface_types else []
chassis_physnets = self.sb_ovn._get_chassis_physnets(chassis)
for segment_to_bind in context.segments_to_bind:

2
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/extensions/placement.py
View File

@ -42,7 +42,7 @@ def _parse_ovn_cms_options(chassis):
def _parse_bridge_mappings(chassis):
bridge_mappings = chassis.other_config.get('ovn-bridge-mappings', '')
bridge_mappings = chassis.external_ids.get('ovn-bridge-mappings', '')
bridge_mappings = helpers.parse_mappings(bridge_mappings.split(','),
unique_values=False)
return {k: [v] for k, v in bridge_mappings.items()}

8
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py
View File

@ -847,7 +847,7 @@ class OvsdbSbOvnIdl(sb_impl_idl.OvnSbApiIdlImpl, Backend):
return cls(conn)
def _get_chassis_physnets(self, chassis):
bridge_mappings = chassis.other_config.get('ovn-bridge-mappings', '')
bridge_mappings = chassis.external_ids.get('ovn-bridge-mappings', '')
mapping_dict = helpers.parse_mappings(bridge_mappings.split(','))
return list(mapping_dict.keys())
@ -865,7 +865,7 @@ class OvsdbSbOvnIdl(sb_impl_idl.OvnSbApiIdlImpl, Backend):
return [ch.name if name_only else ch
for ch in self.chassis_list().execute(check_error=True)
if ovn_const.CMS_OPT_CHASSIS_AS_GW in
ch.other_config.get(ovn_const.OVN_CMS_OPTIONS, '').split(',')]
ch.external_ids.get(ovn_const.OVN_CMS_OPTIONS, '').split(',')]
def get_chassis_and_physnets(self):
chassis_info_dict = {}
@ -890,8 +890,8 @@ class OvsdbSbOvnIdl(sb_impl_idl.OvnSbApiIdlImpl, Backend):
if ('{}={}'
.format(ovn_const.CMS_OPT_CARD_SERIAL_NUMBER,
card_serial_number)
in ch.other_config.get(ovn_const.OVN_CMS_OPTIONS,
'').split(',')):
in ch.external_ids.get(
ovn_const.OVN_CMS_OPTIONS, '').split(',')):
return ch
msg = _('Chassis with %s %s %s does not exist'
) % (ovn_const.OVN_CMS_OPTIONS,

26
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py
View File

@ -172,14 +172,12 @@ class ChassisEvent(row_event.RowEvent):
def match_fn(self, event, row, old):
if event != self.ROW_UPDATE:
return True
# NOTE(lucasgomes): If the external_ids column wasn't updated
# (meaning, Chassis "gateway" status didn't change) just returns
if not hasattr(old, 'other_config') and event == self.ROW_UPDATE:
if not hasattr(old, 'external_ids') and event == self.ROW_UPDATE:
return False
old_br_mappings = old.other_config.get('ovn-bridge-mappings')
new_br_mappings = row.other_config.get('ovn-bridge-mappings')
if old_br_mappings != new_br_mappings:
if (old.external_ids.get('ovn-bridge-mappings') !=
row.external_ids.get('ovn-bridge-mappings')):
return True
# Check if either the Gateway status or Availability Zones has
# changed in the Chassis
@ -194,9 +192,8 @@ class ChassisEvent(row_event.RowEvent):
def run(self, event, row, old):
host = row.hostname
phy_nets = []
new_other_config = row.other_config
if event != self.ROW_DELETE:
bridge_mappings = new_other_config.get('ovn-bridge-mappings', '')
bridge_mappings = row.external_ids.get('ovn-bridge-mappings', '')
mapping_dict = helpers.parse_mappings(bridge_mappings.split(','))
phy_nets = list(mapping_dict)
@ -211,10 +208,9 @@ class ChassisEvent(row_event.RowEvent):
if event == self.ROW_DELETE:
kwargs['event_from_chassis'] = row.name
elif event == self.ROW_UPDATE:
old_other_config = old.other_config
old_mappings = old_other_config.get('ovn-bridge-mappings',
old_mappings = old.external_ids.get('ovn-bridge-mappings',
set()) or set()
new_mappings = new_other_config.get('ovn-bridge-mappings',
new_mappings = row.external_ids.get('ovn-bridge-mappings',
set()) or set()
if old_mappings:
old_mappings = set(old_mappings.split(','))
@ -343,13 +339,11 @@ class ChassisAgentTypeChangeEvent(ChassisEvent):
events = (BaseEvent.ROW_UPDATE,)
def match_fn(self, event, row, old=None):
if not getattr(old, 'other_config', False):
if not getattr(old, 'external_ids', False):
return False
chassis = n_agent.NeutronAgent.chassis_from_private(row)
new_other_config = chassis.other_config
old_other_config = old.other_config
agent_type_change = new_other_config.get('ovn-cms-options', []) != (
old_other_config.get('ovn-cms-options', []))
agent_type_change = n_agent.NeutronAgent.chassis_from_private(
row).external_ids.get('ovn-cms-options', []) != (
old.external_ids.get('ovn-cms-options', []))
return agent_type_change
def run(self, event, row, old):

15
neutron/tests/functional/base.py
View File

@ -423,8 +423,7 @@ class TestOVNFunctionalBase(test_plugin.Ml2PluginV2TestCase,
self._start_ovn_northd()
def add_fake_chassis(self, host, physical_nets=None, external_ids=None,
name=None, azs=None, enable_chassis_as_gw=False,
other_config=None):
name=None, azs=None, enable_chassis_as_gw=False):
def append_cms_options(ext_ids, value):
if 'ovn-cms-options' not in ext_ids:
ext_ids['ovn-cms-options'] = value
@ -433,20 +432,19 @@ class TestOVNFunctionalBase(test_plugin.Ml2PluginV2TestCase,
physical_nets = physical_nets or []
external_ids = external_ids or {}
other_config = other_config or {}
if azs is None:
azs = ['ovn']
if azs:
append_cms_options(other_config, 'availability-zones=')
other_config['ovn-cms-options'] += ':'.join(azs)
append_cms_options(external_ids, 'availability-zones=')
external_ids['ovn-cms-options'] += ':'.join(azs)
if enable_chassis_as_gw:
append_cms_options(other_config, 'enable-chassis-as-gw')
append_cms_options(external_ids, 'enable-chassis-as-gw')
bridge_mapping = ",".join(["%s:br-provider%s" % (phys_net, i)
for i, phys_net in enumerate(physical_nets)])
if name is None:
name = uuidutils.generate_uuid()
other_config['ovn-bridge-mappings'] = bridge_mapping
external_ids['ovn-bridge-mappings'] = bridge_mapping
# We'll be using different IP addresses every time for the Encap of
# the fake chassis as the SB schema doesn't allow to have two entries
# with same (ip,type) pairs as of OVS 2.11. This shouldn't have any
@ -457,8 +455,7 @@ class TestOVNFunctionalBase(test_plugin.Ml2PluginV2TestCase,
self._counter += 1
chassis = self.sb_api.chassis_add(
name, ['geneve'], '172.24.4.%d' % self._counter,
external_ids=external_ids, hostname=host,
other_config=other_config).execute(check_error=True)
external_ids=external_ids, hostname=host).execute(check_error=True)
if self.sb_api.is_table_present('Chassis_Private'):
nb_cfg_timestamp = timeutils.utcnow_ts() * 1000
self.sb_api.db_create(

10
neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/extensions/test_placement.py
View File

@ -72,7 +72,7 @@ class TestOVNClientQosExtension(base.TestOVNFunctionalBase):
self.mock_send_batch = mock.patch.object(
placement_extension, '_send_deferred_batch').start()
def _build_other_config(self, bandwidths, inventory_defaults, hypervisors):
def _build_external_ids(self, bandwidths, inventory_defaults, hypervisors):
options = []
if bandwidths:
options.append(n_const.RP_BANDWIDTHS + '=' + bandwidths)
@ -85,17 +85,17 @@ class TestOVNClientQosExtension(base.TestOVNFunctionalBase):
def _create_chassis(self, host, name, physical_nets=None, bandwidths=None,
inventory_defaults=None, hypervisors=None):
other_config = self._build_other_config(bandwidths, inventory_defaults,
external_ids = self._build_external_ids(bandwidths, inventory_defaults,
hypervisors)
self.add_fake_chassis(host, physical_nets=physical_nets,
other_config=other_config, name=name)
external_ids=external_ids, name=name)
def _update_chassis(self, name, bandwidths=None, inventory_defaults=None,
hypervisors=None):
other_config = self._build_other_config(bandwidths, inventory_defaults,
external_ids = self._build_external_ids(bandwidths, inventory_defaults,
hypervisors)
self.sb_api.db_set(
'Chassis', name, ('other_config', other_config)
'Chassis', name, ('external_ids', external_ids)
).execute(check_error=True)
def _check_placement_config(self, expected_chassis):

10
neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_impl_idl.py
View File

@ -52,11 +52,11 @@ class TestSbApi(BaseOvnIdlTest):
super(TestSbApi, self).setUp()
self.data = {
'chassis': [
{'other_config': {'ovn-bridge-mappings':
{'external_ids': {'ovn-bridge-mappings':
'public:br-ex,private:br-0'}},
{'other_config': {'ovn-bridge-mappings':
{'external_ids': {'ovn-bridge-mappings':
'public:br-ex,public2:br-ex2'}},
{'other_config': {'ovn-bridge-mappings':
{'external_ids': {'ovn-bridge-mappings':
'public:br-ex'}},
]
}
@ -70,7 +70,7 @@ class TestSbApi(BaseOvnIdlTest):
txn.add(self.api.chassis_add(
chassis['name'], ['geneve'], chassis['hostname'],
hostname=chassis['hostname'],
other_config=chassis['other_config']))
external_ids=chassis['external_ids']))
def test_get_chassis_hostname_and_physnets(self):
mapping = self.api.get_chassis_hostname_and_physnets()
@ -97,7 +97,7 @@ class TestSbApi(BaseOvnIdlTest):
def test_multiple_physnets_in_one_bridge(self):
self.data = {
'chassis': [
{'other_config': {'ovn-bridge-mappings': 'p1:br-ex,p2:br-ex'}}
{'external_ids': {'ovn-bridge-mappings': 'p1:br-ex,p2:br-ex'}}
]
}
self.load_test_data()

9
neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovsdb_monitor.py
View File

@ -441,8 +441,9 @@ class TestAgentMonitor(base.TestOVNFunctionalBase):
chassis_name, self.mech_driver.agent_chassis_table)
self.mech_driver.sb_ovn.idl.notify_handler.watch_event(row_event)
self.chassis_name = self.add_fake_chassis(
self.FAKE_CHASSIS_HOST, name=chassis_name,
enable_chassis_as_gw=True)
self.FAKE_CHASSIS_HOST,
external_ids={'ovn-cms-options': 'enable-chassis-as-gw'},
name=chassis_name)
self.assertTrue(row_event.wait())
n_utils.wait_until_true(
lambda: len(list(neutron_agent.AgentCache())) == 1)
@ -450,11 +451,11 @@ class TestAgentMonitor(base.TestOVNFunctionalBase):
def test_agent_change_controller(self):
self.assertEqual(neutron_agent.ControllerGatewayAgent,
type(neutron_agent.AgentCache()[self.chassis_name]))
self.sb_api.db_set('Chassis', self.chassis_name, ('other_config',
self.sb_api.db_set('Chassis', self.chassis_name, ('external_ids',
{'ovn-cms-options': ''})).execute(check_error=True)
n_utils.wait_until_true(lambda:
neutron_agent.AgentCache()[self.chassis_name].
chassis.other_config['ovn-cms-options'] == '')
chassis.external_ids['ovn-cms-options'] == '')
self.assertEqual(neutron_agent.ControllerAgent,
type(neutron_agent.AgentCache()[self.chassis_name]))

6
neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py
View File

@ -66,16 +66,16 @@ class TestPortBinding(base.TestOVNFunctionalBase):
self.add_fake_chassis(self.ovs_host)
self.add_fake_chassis(
self.dpdk_host,
other_config={'datapath-type': 'netdev',
external_ids={'datapath-type': 'netdev',
'iface-types': 'dummy,dummy-internal,dpdkvhostuser'})
self.add_fake_chassis(
self.invalid_dpdk_host,
other_config={'datapath-type': 'netdev',
external_ids={'datapath-type': 'netdev',
'iface-types': 'dummy,dummy-internal,geneve,vxlan'})
self.add_fake_chassis(
self.smartnic_dpu_host,
other_config={ovn_const.OVN_CMS_OPTIONS: '{}={}'.format(
external_ids={ovn_const.OVN_CMS_OPTIONS: '{}={}'.format(
ovn_const.CMS_OPT_CARD_SERIAL_NUMBER,
self.smartnic_dpu_serial)})
self.n1 = self._make_network(self.fmt, 'n1', True)

19
neutron/tests/functional/services/ovn_l3/test_plugin.py
View File

@ -135,7 +135,7 @@ class TestRouter(base.TestOVNFunctionalBase):
# Test if chassis3 is selected as candidate or not.
self.chassis3 = self.add_fake_chassis(
'ovs-host3', physical_nets=['physnet1'],
other_config={'ovn-cms-options': 'enable-chassis-as-gw'})
external_ids={'ovn-cms-options': 'enable-chassis-as-gw'})
self._check_gateway_chassis_candidates([self.chassis3])
def test_gateway_chassis_with_cms_and_no_bridge_mappings(self):
@ -143,7 +143,7 @@ class TestRouter(base.TestOVNFunctionalBase):
# chassis3 is having enable-chassis-as-gw, but no bridge mappings.
self.chassis3 = self.add_fake_chassis(
'ovs-host3',
other_config={'ovn-cms-options': 'enable-chassis-as-gw'})
external_ids={'ovn-cms-options': 'enable-chassis-as-gw'})
ovn_client = self.l3_plugin._ovn_client
ext1 = self._create_ext_network(
'ext1', 'vlan', 'physnet1', 1, "10.0.0.1", "10.0.0.0/24")
@ -170,11 +170,11 @@ class TestRouter(base.TestOVNFunctionalBase):
# Test if chassis3 is selected as candidate or not.
self.chassis3 = self.add_fake_chassis(
'ovs-host3', physical_nets=['physnet1'],
other_config={'ovn-cms-options': 'enable-chassis-as-gw'},
external_ids={'ovn-cms-options': 'enable-chassis-as-gw'},
azs=['ovn'])
self.chassis4 = self.add_fake_chassis(
'ovs-host4', physical_nets=['physnet1'],
other_config={'ovn-cms-options': 'enable-chassis-as-gw'},
external_ids={'ovn-cms-options': 'enable-chassis-as-gw'},
azs=['ovn2'])
self._check_gateway_chassis_candidates([self.chassis3],
router_az_hints=['ovn'])
@ -186,10 +186,10 @@ class TestRouter(base.TestOVNFunctionalBase):
# add chassis4 is having azs [ovn2], not match routers az_hints [ovn]
self.chassis3 = self.add_fake_chassis(
'ovs-host3', physical_nets=['physnet1'],
other_config={'ovn-cms-options': 'enable-chassis-as-gw'})
external_ids={'ovn-cms-options': 'enable-chassis-as-gw'})
self.chassis4 = self.add_fake_chassis(
'ovs-host4', physical_nets=['physnet1'],
other_config={'ovn-cms-options': 'enable-chassis-as-gw'},
external_ids={'ovn-cms-options': 'enable-chassis-as-gw'},
azs=['ovn2'])
ovn_client = self.l3_plugin._ovn_client
ext1 = self._create_ext_network(
@ -535,7 +535,7 @@ class TestRouter(base.TestOVNFunctionalBase):
self.skipTest('L3 HA not supported')
ovn_client = self.l3_plugin._ovn_client
chassis4 = self.add_fake_chassis(
'ovs-host4', physical_nets=['physnet4'], other_config={
'ovs-host4', physical_nets=['physnet4'], external_ids={
'ovn-cms-options': 'enable-chassis-as-gw'})
ovn_client._ovn_scheduler = l3_sched.OVNGatewayLeastLoadedScheduler()
ext1 = self._create_ext_network(
@ -567,7 +567,7 @@ class TestRouter(base.TestOVNFunctionalBase):
# Add another chassis as a gateway chassis
chassis5 = self.add_fake_chassis(
'ovs-host5', physical_nets=['physnet4'], other_config={
'ovs-host5', physical_nets=['physnet4'], external_ids={
'ovn-cms-options': 'enable-chassis-as-gw'})
# Add a node as compute node. Compute node wont be
# used to schedule the router gateway ports therefore
@ -597,7 +597,8 @@ class TestRouter(base.TestOVNFunctionalBase):
chassis_list.append(
self.add_fake_chassis(
'ovs-host%s' % i, physical_nets=['physnet1'],
other_config={'ovn-cms-options': 'enable-chassis-as-gw'}))
external_ids={
'ovn-cms-options': 'enable-chassis-as-gw'}))
ext1 = self._create_ext_network(
'ext1', 'vlan', 'physnet1', 1, "10.0.0.1", "10.0.0.0/24")

32
neutron/tests/unit/common/ovn/test_utils.py
View File

@ -62,31 +62,33 @@ class TestUtils(base.BaseTestCase):
def test_is_gateway_chassis(self):
chassis = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'other_config': {'ovn-cms-options': 'enable-chassis-as-gw'}})
'external_ids': {'ovn-cms-options': 'enable-chassis-as-gw'}})
non_gw_chassis_0 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'other_config': {'ovn-cms-options': ''}})
non_gw_chassis_1 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'other_config': {}})
'external_ids': {'ovn-cms-options': ''}})
non_gw_chassis_1 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={})
non_gw_chassis_2 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'external_ids': {}})
self.assertTrue(utils.is_gateway_chassis(chassis))
self.assertFalse(utils.is_gateway_chassis(non_gw_chassis_0))
self.assertFalse(utils.is_gateway_chassis(non_gw_chassis_1))
self.assertFalse(utils.is_gateway_chassis(non_gw_chassis_2))
def test_get_chassis_availability_zones_no_azs(self):
chassis = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'other_config': {'ovn-cms-options': 'enable-chassis-as-gw'}})
'external_ids': {'ovn-cms-options': 'enable-chassis-as-gw'}})
self.assertEqual(set(), utils.get_chassis_availability_zones(chassis))
def test_get_chassis_availability_zones_one_az(self):
chassis = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'other_config': {'ovn-cms-options':
'external_ids': {'ovn-cms-options':
'enable-chassis-as-gw,availability-zones=az0'}})
self.assertEqual(
{'az0'}, utils.get_chassis_availability_zones(chassis))
def test_get_chassis_availability_zones_multiple_az(self):
chassis = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'other_config': {
'external_ids': {
'ovn-cms-options':
'enable-chassis-as-gw,availability-zones=az0:az1 :az2:: :'}})
self.assertEqual(
@ -95,7 +97,7 @@ class TestUtils(base.BaseTestCase):
def test_get_chassis_availability_zones_malformed(self):
chassis = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'other_config': {'ovn-cms-options':
'external_ids': {'ovn-cms-options':
'enable-chassis-as-gw,availability-zones:az0'}})
self.assertEqual(
set(), utils.get_chassis_availability_zones(chassis))
@ -154,16 +156,16 @@ class TestUtils(base.BaseTestCase):
def test_get_chassis_in_azs(self):
ch0 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'name': 'ch0',
'other_config': {
'external_ids': {
'ovn-cms-options':
'enable-chassis-as-gw,availability-zones=az0:az1:az2'}})
ch1 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'name': 'ch1',
'other_config': {
'external_ids': {
'ovn-cms-options': 'enable-chassis-as-gw'}})
ch2 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'name': 'ch2',
'other_config': {
'external_ids': {
'ovn-cms-options':
'enable-chassis-as-gw,availability-zones=az1:az5'}})
@ -181,21 +183,21 @@ class TestUtils(base.BaseTestCase):
def test_get_gateway_chassis_without_azs(self):
ch0 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'name': 'ch0',
'other_config': {
'external_ids': {
'ovn-cms-options':
'enable-chassis-as-gw,availability-zones=az0:az1:az2'}})
ch1 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'name': 'ch1',
'other_config': {
'external_ids': {
'ovn-cms-options': 'enable-chassis-as-gw'}})
ch2 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'name': 'ch2',
'other_config': {
'external_ids': {
'ovn-cms-options':
'enable-chassis-as-gw,availability-zones=az1:az5'}})
ch3 = fakes.FakeOvsdbRow.create_one_ovsdb_row(attrs={
'name': 'ch3',
'other_config': {}})
'external_ids': {}})
chassis_list = [ch0, ch1, ch2, ch3]
self.assertEqual(

13
neutron/tests/unit/fake_resources.py
View File

@ -877,23 +877,20 @@ class FakeChassis(object):
cms_opts.append('%s=%s' % (ovn_const.CMS_OPT_CARD_SERIAL_NUMBER,
card_serial_number))
# NOTE(ralonsoh): LP#1990229, once min OVN version >= 20.06, the CMS
# options and the bridge mappings should be stored only in
# "other_config".
other_config = {}
external_ids = {}
if cms_opts:
other_config[ovn_const.OVN_CMS_OPTIONS] = ','.join(cms_opts)
external_ids[ovn_const.OVN_CMS_OPTIONS] = ','.join(cms_opts)
if bridge_mappings:
other_config['ovn-bridge-mappings'] = ','.join(bridge_mappings)
external_ids['ovn-bridge-mappings'] = ','.join(bridge_mappings)
chassis_attrs = {
'encaps': [],
'external_ids': '',
'external_ids': external_ids,
'hostname': '',
'name': uuidutils.generate_uuid(),
'nb_cfg': 0,
'other_config': other_config,
'other_config': {},
'transport_zones': [],
'vtep_logical_switches': []}

2
neutron/tests/unit/plugins/ml2/drivers/ovn/agent/test_neutron_agent.py
View File

@ -31,7 +31,7 @@ class AgentCacheTestCase(base.BaseTestCase):
self.names_ref = []
for i in range(10): # Add 10 agents.
chassis_private = fakes.FakeOvsdbRow.create_one_ovsdb_row(
attrs={'name': 'chassis' + str(i), 'other_config': {}})
attrs={'name': 'chassis' + str(i)})
self.agent_cache.update(ovn_const.OVN_CONTROLLER_AGENT,
chassis_private)
self.names_ref.append('chassis' + str(i))

2
neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_impl_idl_ovn.py
View File

@ -820,7 +820,7 @@ class TestSBImplIdlOvnBase(TestDBImplIdlOvn):
'chassis': [
{
'hostname': 'fake-smartnic-dpu-chassis.fqdn',
'other_config': {
'external_ids': {
ovn_const.OVN_CMS_OPTIONS: (
'firstoption,'
'card-serial-number=fake-serial,'

39
neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovsdb_monitor.py
View File

@ -81,9 +81,6 @@ OVN_SB_SCHEMA = {
"name": {"type": "string"},
"hostname": {"type": "string"},
"external_ids": {
"type": {"key": "string", "value": "string",
"min": 0, "max": "unlimited"}},
"other_config": {
"type": {"key": "string", "value": "string",
"min": 0, "max": "unlimited"}}},
"isRoot": True,
@ -524,7 +521,7 @@ class TestOvnSbIdlNotifyHandler(test_mech_driver.OVNMechanismDriverTestCase):
self.row_json = {
"name": "fake-name",
"hostname": "fake-hostname",
"other_config": ['map', [["ovn-bridge-mappings",
"external_ids": ['map', [["ovn-bridge-mappings",
"fake-phynet1:fake-br1"]]]
}
self._mock_hash_ring = mock.patch.object(
@ -548,18 +545,14 @@ class TestOvnSbIdlNotifyHandler(test_mech_driver.OVNMechanismDriverTestCase):
self.sb_idl.notify_handler.notify_loop()
def test_chassis_create_event(self):
old_row_json = {'other_config': ['map', []]}
self._test_chassis_helper('create', self.row_json,
old_row_json=old_row_json)
self._test_chassis_helper('create', self.row_json)
self.mech_driver.update_segment_host_mapping.assert_called_once_with(
'fake-hostname', ['fake-phynet1'])
self.l3_plugin.schedule_unhosted_gateways.assert_called_once_with(
event_from_chassis=None)
def test_chassis_delete_event(self):
old_row_json = {'other_config': ['map', []]}
self._test_chassis_helper('delete', self.row_json,
old_row_json=old_row_json)
self._test_chassis_helper('delete', self.row_json)
self.mech_driver.update_segment_host_mapping.assert_called_once_with(
'fake-hostname', [])
self.l3_plugin.schedule_unhosted_gateways.assert_called_once_with(
@ -567,7 +560,7 @@ class TestOvnSbIdlNotifyHandler(test_mech_driver.OVNMechanismDriverTestCase):
def test_chassis_update_event(self):
old_row_json = copy.deepcopy(self.row_json)
old_row_json['other_config'][1][0][1] = (
old_row_json['external_ids'][1][0][1] = (
"fake-phynet2:fake-br2")
self._test_chassis_helper('update', self.row_json, old_row_json)
self.mech_driver.update_segment_host_mapping.assert_called_once_with(
@ -576,9 +569,9 @@ class TestOvnSbIdlNotifyHandler(test_mech_driver.OVNMechanismDriverTestCase):
event_from_chassis=None)
def test_chassis_update_event_reschedule_not_needed(self):
self.row_json['other_config'][1].append(['foo_field', 'foo_value_new'])
self.row_json['external_ids'][1].append(['foo_field', 'foo_value_new'])
old_row_json = copy.deepcopy(self.row_json)
old_row_json['other_config'][1][1][1] = (
old_row_json['external_ids'][1][1][1] = (
"foo_value")
self._test_chassis_helper('update', self.row_json, old_row_json)
self.mech_driver.update_segment_host_mapping.assert_not_called()
@ -586,14 +579,14 @@ class TestOvnSbIdlNotifyHandler(test_mech_driver.OVNMechanismDriverTestCase):
def test_chassis_update_event_reschedule_lost_physnet(self):
old_row_json = copy.deepcopy(self.row_json)
self.row_json['other_config'][1][0][1] = ''
self.row_json['external_ids'][1][0][1] = ''
self._test_chassis_helper('update', self.row_json, old_row_json)
self.l3_plugin.schedule_unhosted_gateways.assert_called_once_with(
event_from_chassis='fake-name')
def test_chassis_update_event_reschedule_add_physnet(self):
old_row_json = copy.deepcopy(self.row_json)
self.row_json['other_config'][1][0][1] += ',foo_physnet:foo_br'
self.row_json['external_ids'][1][0][1] += ',foo_physnet:foo_br'
self._test_chassis_helper('update', self.row_json, old_row_json)
self.mech_driver.update_segment_host_mapping.assert_called_once_with(
'fake-hostname', ['fake-phynet1', 'foo_physnet'])
@ -602,7 +595,7 @@ class TestOvnSbIdlNotifyHandler(test_mech_driver.OVNMechanismDriverTestCase):
def test_chassis_update_event_reschedule_add_and_remove_physnet(self):
old_row_json = copy.deepcopy(self.row_json)
self.row_json['other_config'][1][0][1] = 'foo_physnet:foo_br'
self.row_json['external_ids'][1][0][1] = 'foo_physnet:foo_br'
self._test_chassis_helper('update', self.row_json, old_row_json)
self.mech_driver.update_segment_host_mapping.assert_called_once_with(
'fake-hostname', ['foo_physnet'])
@ -611,7 +604,7 @@ class TestOvnSbIdlNotifyHandler(test_mech_driver.OVNMechanismDriverTestCase):
def test_chassis_update_empty_no_external_ids(self):
old_row_json = copy.deepcopy(self.row_json)
old_row_json.pop('other_config')
old_row_json.pop('external_ids')
with mock.patch(
'neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb.'
'ovsdb_monitor.ChassisEvent.'
@ -644,10 +637,10 @@ class TestChassisEvent(base.BaseTestCase):
def _test_handle_ha_chassis_group_changes_create(self, event):
# Chassis
other_config = {
ext_ids = {
'ovn-cms-options': 'enable-chassis-as-gw,availability-zones=az-0'}
row = fakes.FakeOvsdbTable.create_one_ovsdb_table(
attrs={'name': 'SpongeBob', 'other_config': other_config})
attrs={'name': 'SpongeBob', 'external_ids': ext_ids})
# HA Chassis
ch0 = fakes.FakeOvsdbTable.create_one_ovsdb_table(
attrs={'priority': 10})
@ -679,10 +672,10 @@ class TestChassisEvent(base.BaseTestCase):
def _test_handle_ha_chassis_group_changes_delete(self, event):
# Chassis
other_config = {
ext_ids = {
'ovn-cms-options': 'enable-chassis-as-gw,availability-zones=az-0'}
row = fakes.FakeOvsdbTable.create_one_ovsdb_table(
attrs={'name': 'SpongeBob', 'other_config': other_config})
attrs={'name': 'SpongeBob', 'external_ids': ext_ids})
# HA Chassis
ha_ch = fakes.FakeOvsdbTable.create_one_ovsdb_table(
attrs={'priority': 10})
@ -706,10 +699,10 @@ class TestChassisEvent(base.BaseTestCase):
def test_handle_ha_chassis_group_changes_update_no_changes(self):
# Assert nothing was done because the update didn't
# change the gateway chassis status or the availability zones
other_config = {
ext_ids = {
'ovn-cms-options': 'enable-chassis-as-gw,availability-zones=az-0'}
new = fakes.FakeOvsdbTable.create_one_ovsdb_table(
attrs={'name': 'SpongeBob', 'other_config': other_config})
attrs={'name': 'SpongeBob', 'external_ids': ext_ids})
old = new
self.assertIsNone(self.event.handle_ha_chassis_group_changes(
self.event.ROW_UPDATE, new, old))

1
neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py
View File

@ -112,7 +112,6 @@ class MechDriverSetupBase(abc.ABC):
chassis_private.nb_cfg_timestamp, mock.Mock):
del chassis_private.nb_cfg_timestamp
chassis_private.external_ids = {}
chassis_private.other_config = {}
if agent_type == ovn_const.OVN_METADATA_AGENT:
chassis_private.external_ids.update({
ovn_const.OVN_AGENT_METADATA_SB_CFG_KEY: nb_cfg,

13
releasenotes/notes/ovn-chassis-other-config-7db15b9d10bf7f04.yaml
View File

@ -1,13 +0,0 @@
---
deprecations:
- |
ML2/OVN plugin does not support versions below 20.06. The Neutron plugin
expects to read the "Chassis" register configuration in "other_config"
field only.
other:
- |
Since OVN 20.06, the "Chassis" register configuration is stored in the
"other_config" field and replicated into "external_ids". This replication
is stopped in OVN 22.09. The ML2/OVN plugin retrieves the "Chassi"
configuration from the "other_config" field only. That makes Neutron
not compatible with OVN versions below 20.06.