openstack/neutron
Code Issues Proposed changes

Merge "[OVN] Set OVN bridge in Chassis_Private in OVN agent" into stable/2025.1

Browse Source
This commit is contained in:
Zuul
2025-07-07 23:28:46 +00:00
committed by Gerrit Code Review
parent 62606a017e 0121f2029a
commit 4437825b35
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/ovn/extensions/metadata.py
View File

@@ -161,6 +161,7 @@ class MetadataExtension(extension_manager.OVNAgentExtension,
Reload the configuration and sync the agent again.
"""
self.agent_api.load_config()
self._update_chassis_private_config()
self.agent_api.update_neutron_sb_cfg_key()
self.sync()
@@ -178,6 +179,7 @@ class MetadataExtension(extension_manager.OVNAgentExtension,
# Register the agent with its corresponding Chassis
self.register_metadata_agent()
self._update_chassis_private_config()
self.agent_api.update_neutron_sb_cfg_key()
# Start the metadata server.

8
neutron/tests/functional/agent/ovn/agent/test_ovn_neutron_agent.py
View File

@@ -135,10 +135,12 @@ class TestOVNNeutronAgentMetadataExtension(TestOVNNeutronAgentBase):
# Check the metadata extension is registered.
chassis_id = uuid.UUID(self.chassis_name)
agent_id = uuid.uuid5(chassis_id, 'metadata_agent')
ext_ids = {ovn_const.OVN_AGENT_METADATA_ID_KEY: str(agent_id),
ovn_const.OVN_AGENT_OVN_BRIDGE: 'br-int',
ovn_const.OVN_AGENT_NEUTRON_SB_CFG_KEY: '0',
}
ch_private = self.sb_api.lookup('Chassis_Private', self.chassis_name)
self.assertEqual(
ch_private.external_ids[ovn_const.OVN_AGENT_METADATA_ID_KEY],
str(agent_id))
self.assertEqual(ext_ids, ch_private.external_ids)
# Check Unix proxy is running.
metadata_extension = self.ovn_agent[METADATA_EXTENSION]