Merge pull request #181 from stackhpc/upstream/yoga-2024-10-07

Synchronise yoga with upstream

Author: priteau

neutron/agent/ovn/metadata/agent.py

@@ -106,14 +106,14 @@ class PortBindingChassisCreatedEvent(PortBindingChassisEvent):
     LOG_MSG = "Port %s in datapath %s bound to our chassis"
 
     def __init__(self, metadata_agent):
-        events = (self.ROW_UPDATE,)
+        events = (self.ROW_CREATE, self.ROW_UPDATE,)
         super(PortBindingChassisCreatedEvent, self).__init__(
             metadata_agent, events)
 
     def match_fn(self, event, row, old):
         try:
             return (row.chassis[0].name == self.agent.chassis and
-                    not old.chassis)
+                    (event == self.ROW_CREATE or not old.chassis))
         except (IndexError, AttributeError):
             return False
 
@@ -297,8 +297,9 @@ def start(self):
             self.conf, self.chassis, sb_idl=self.sb_idl)
         self._proxy.run()
 
-        # Do the initial sync.
-        self.sync()
+        # Do the initial sync. Provisioning handled by
+        # PortBindingChassisCreatedEvent on initial db dump
+        self.sync(provision=False)
 
         # Register the agent with its corresponding Chassis
         self.register_metadata_agent()
@@ -349,7 +350,7 @@ def get_networks_datapaths(self):
         return set(p.datapath for p in self._vif_ports(ports))
 
     @_sync_lock
-    def sync(self):
+    def sync(self, provision=True):
         """Agent sync.
 
         This function will make sure that all networks with ports in our
@@ -379,8 +380,9 @@ def sync(self):
         # resync all network namespaces based on the associated datapaths,
         # even those that are already running. This is to make sure
         # everything within each namespace is up to date.
-        for datapath in net_datapaths:
-            self.provision_datapath(datapath)
+        if provision:
+            for datapath in net_datapaths:
+                self.provision_datapath(datapath)
 
     @staticmethod
     def _get_veth_name(datapath):

tox.ini

@@ -3,6 +3,11 @@ envlist = docs,py38,pep8
 minversion = 3.18.0
 skipsdist = False
 ignore_basepython_conflict = True
+# Cap setuptools via virtualenv to prevent compatibility issue with yoga
+# branch's upper constraint of 'packaging' package (21.3).
+requires =
+  virtualenv<20.26.4
+  tox<4
 
 [testenv]
 basepython = {env:TOX_PYTHON:python3}

zuul.d/job-templates.yaml

@@ -99,7 +99,7 @@
 
 - project-template:
     name: neutron-periodic-jobs
-    periodic:
+    periodic-weekly:
       jobs:
         - neutron-functional
         - neutron-fullstack