openstack/neutron
Code Issues Proposed changes

Merge "OVN metadata agent additional_chassis detection"

Browse Source
This commit is contained in:
Zuul 2024-11-08 17:28:15 +00:00 committed by Gerrit Code Review
commit 7e1d4ccbb6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,10 +69,12 @@ def _sync_lock(f):
return wrapped return wrapped
# TODO(jlibosva): Remove the decorator after we depend on OVN version that has
# the schema containing the additional_chassis column
def _match_only_if_additional_chassis_is_supported(f): def _match_only_if_additional_chassis_is_supported(f):
@functools.wraps(f) @functools.wraps(f)
def wrapped(self, row, old): def wrapped(self, row, old):
if not ovn_utils.is_additional_chassis_supported(self.agent.sb_idl): if not hasattr(row, 'additional_chassis'):
return False return False
return f(self, row, old) return f(self, row, old)
return wrapped return wrapped
@ -204,7 +206,9 @@ class PortBindingUpdatedEvent(PortBindingEvent):
def _is_new_chassis_set(self, row, old): def _is_new_chassis_set(self, row, old):
self._log_msg = "Port %s in datapath %s bound to our chassis" self._log_msg = "Port %s in datapath %s bound to our chassis"
try: try:
if ovn_utils.is_additional_chassis_supported(self.agent.sb_idl): # TODO(jlibosva): Remove the check after we depend on OVN version
# that has the schema containing the additional_chassis column
if hasattr(row, 'additional_chassis'):
try: try:
# If the additional chassis used to be in the old version # If the additional chassis used to be in the old version
# the resources are already provisioned # the resources are already provisioned