openstack/neutron
Code Issues Proposed changes

Merge "Handle creation of Port_Binding with chassis set"

Browse Source
This commit is contained in:
Zuul 2024-01-04 13:21:40 +00:00 committed by Gerrit Code Review
commit 0c251cce60
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/ovn/extensions/qos_hwol.py
View File

@ -159,13 +159,13 @@ class PortBindingChassisCreatedEvent(_PortBindingChassisEvent):
LOG_MSG = 'Port ID %s, datapath %s, OVS port name: %s (event: %s)' LOG_MSG = 'Port ID %s, datapath %s, OVS port name: %s (event: %s)'
def __init__(self, ovn_agent): def __init__(self, ovn_agent):
events = (self.ROW_UPDATE,) events = (self.ROW_CREATE, self.ROW_UPDATE,)
super().__init__(ovn_agent, events) super().__init__(ovn_agent, events)
def match_fn(self, event, row, old): def match_fn(self, event, row, old):
try: try:
return (row.chassis[0].name == self.ovn_agent.chassis and return (row.chassis[0].name == self.ovn_agent.chassis and
not old.chassis) (event == self.ROW_CREATE or not old.chassis))
except (IndexError, AttributeError): except (IndexError, AttributeError):
return False return False

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

@ -118,6 +118,16 @@ class PortBindingEvent(row_event.RowEvent):
self.agent.resync() self.agent.resync()
class PortBindingCreateWithChassis(PortBindingEvent):
EVENT = PortBindingEvent.ROW_CREATE
def match_fn(self, event, row, old):
self._log_msg = "Port %s in datapath %s bound to our chassis on insert"
if not (super().match_fn(event, row, old) and row.chassis):
return False
return row.chassis[0].name == self.agent.chassis
class PortBindingUpdatedEvent(PortBindingEvent): class PortBindingUpdatedEvent(PortBindingEvent):
EVENT = PortBindingEvent.ROW_UPDATE EVENT = PortBindingEvent.ROW_UPDATE
@ -387,6 +397,7 @@ class MetadataAgent(object):
tables = ('Encap', 'Port_Binding', 'Datapath_Binding', 'SB_Global', tables = ('Encap', 'Port_Binding', 'Datapath_Binding', 'SB_Global',
'Chassis', 'Chassis_Private') 'Chassis', 'Chassis_Private')
events = (PortBindingUpdatedEvent(self), events = (PortBindingUpdatedEvent(self),
PortBindingCreateWithChassis(self),
PortBindingDeletedEvent(self), PortBindingDeletedEvent(self),
SbGlobalUpdateEvent(self), SbGlobalUpdateEvent(self),
ChassisPrivateCreateEvent(self), ChassisPrivateCreateEvent(self),
@ -405,7 +416,8 @@ class MetadataAgent(object):
self._proxy.run() self._proxy.run()
# Do the initial sync. # Do the initial sync.
self.sync() # Provisioning handled by PortBindingCreateWithChassis
self.sync(provision=False)
# Register the agent with its corresponding Chassis # Register the agent with its corresponding Chassis
self.register_metadata_agent() self.register_metadata_agent()
@ -456,7 +468,7 @@ class MetadataAgent(object):
return set(p.datapath for p in self._vif_ports(ports)) return set(p.datapath for p in self._vif_ports(ports))
@_sync_lock @_sync_lock
def sync(self): def sync(self, provision=True):
"""Agent sync. """Agent sync.
This function will make sure that all networks with ports in our This function will make sure that all networks with ports in our
@ -483,6 +495,7 @@ class MetadataAgent(object):
# resync all network namespaces based on the associated datapaths, # resync all network namespaces based on the associated datapaths,
# even those that are already running. This is to make sure # even those that are already running. This is to make sure
# everything within each namespace is up to date. # everything within each namespace is up to date.
if provision:
for datapath in net_datapaths: for datapath in net_datapaths:
self.provision_datapath(datapath) self.provision_datapath(datapath)