openstack/neutron
Code Issues Proposed changes

Merge "[OVN] Accept OVS system-id as non UUID formatted string"

Browse Source
This commit is contained in:
Zuul 2021-12-22 11:57:06 +00:00 committed by Gerrit Code Review
commit 19a20eaca8
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/agent/ovn/metadata/agent.py
View File

@ -48,6 +48,8 @@ OVN_VIF_PORT_TYPES = ("", "external", )
MetadataPortInfo = collections.namedtuple('MetadataPortInfo', ['mac',
'ip_addresses'])
OVN_METADATA_UUID_NAMESPACE = uuid.UUID('d34bf9f6-da32-4871-9af8-15a4626b41ab')
def _sync_lock(f):
"""Decorator to block all operations for a global sync call."""
@ -206,13 +208,12 @@ class MetadataAgent(object):
try:
self.chassis_id = uuid.UUID(self.chassis)
except ValueError:
LOG.exception('Chassis name %s is not a correctly formatted UUID '
'string', self.chassis)
raise ConfigException()
# OVS system-id could be a non UUID formatted string.
self.chassis_id = uuid.uuid5(OVN_METADATA_UUID_NAMESPACE,
self.chassis)
self.ovn_bridge = self._get_ovn_bridge()
LOG.debug("Loaded chassis %s and ovn bridge %s.",
self.chassis, self.ovn_bridge)
LOG.debug("Loaded chassis name %s (UUID: %s) and ovn bridge %s.",
self.chassis, self.chassis_id, self.ovn_bridge)
@_sync_lock
def resync(self):

23
neutron/tests/unit/agent/ovn/metadata/test_agent.py
View File

@ -14,10 +14,12 @@
import collections
from unittest import mock
import uuid
from neutron_lib import constants as n_const
from oslo_config import cfg
from oslo_config import fixture as config_fixture
from oslo_utils import uuidutils
from neutron.agent.linux import ip_lib
from neutron.agent.linux.ip_lib import IpAddrCommand as ip_addr
@ -268,3 +270,24 @@ class TestMetadataAgent(base.BaseTestCase):
mock.ANY, 'namespace', 80, mock.ANY,
bind_address=n_const.METADATA_V4_IP, network_id='1')
mock_checksum.assert_called_once_with('namespace')
def test__load_config(self):
# Chassis name UUID formatted string. OVN bridge "br-ovn".
valid_uuid_str = uuidutils.generate_uuid()
self.agent.ovs_idl.db_get.return_value.execute.side_effect = [
{'system-id': valid_uuid_str}, {'ovn-bridge': 'br-ovn'}]
self.agent._load_config()
self.assertEqual(valid_uuid_str, self.agent.chassis)
self.assertEqual(uuid.UUID(valid_uuid_str), self.agent.chassis_id)
self.assertEqual('br-ovn', self.agent.ovn_bridge)
# Chassis name non UUID formatted string. OVN bridge not defined,
# "br-int" assigned by default.
self.agent.ovs_idl.db_get.return_value.execute.side_effect = [
{'system-id': 'RandomName1'}, {}]
self.agent._load_config()
generated_uuid = uuid.uuid5(agent.OVN_METADATA_UUID_NAMESPACE,
'RandomName1')
self.assertEqual('RandomName1', self.agent.chassis)
self.assertEqual(generated_uuid, self.agent.chassis_id)
self.assertEqual('br-int', self.agent.ovn_bridge)