Merge pull request #110 from stackhpc/upstream/yoga-2024-01-15

Synchronise yoga with upstream

Author: markgoddard

neutron/agent/linux/interface.py

@@ -356,7 +356,7 @@ def _add_device_to_namespace(self, ip_wrapper, device, namespace):
         namespace_obj = ip_wrapper.ensure_namespace(namespace)
         for i in range(9):
             try:
-                namespace_obj.add_device_to_namespace(device)
+                namespace_obj.add_device_to_namespace(device, is_ovs_port=True)
                 break
             except ip_lib.NetworkInterfaceNotFound:
                 # NOTE(slaweq): if the exception was NetworkInterfaceNotFound
@@ -365,6 +365,11 @@ def _add_device_to_namespace(self, ip_wrapper, device, namespace):
                 LOG.warning("Failed to set interface %s into namespace %s. "
                             "Interface not found, attempt: %s, retrying.",
                             device, namespace, i + 1)
+                # NOTE(slaweq) In such case it's required to reset device's
+                # namespace as it was already set to the "namespace"
+                # and after retry neutron will look for it in that namespace
+                # which is wrong
+                device.namespace = None
                 time.sleep(1)
             except utils.WaitTimeout:
                 # NOTE(slaweq): if the exception was WaitTimeout then it means

neutron/agent/linux/ip_lib.py

@@ -270,9 +270,9 @@ def garbage_collect_namespace(self):
                 return True
         return False
 
-    def add_device_to_namespace(self, device):
+    def add_device_to_namespace(self, device, is_ovs_port=False):
         if self.namespace:
-            device.link.set_netns(self.namespace)
+            device.link.set_netns(self.namespace, is_ovs_port=is_ovs_port)
 
     def add_vlan(self, name, physical_interface, vlan_id):
         privileged.create_interface(name,
@@ -462,10 +462,15 @@ def set_down(self):
         privileged.set_link_attribute(
             self.name, self._parent.namespace, state='down')
 
-    def set_netns(self, namespace):
+    def set_netns(self, namespace, is_ovs_port=False):
         privileged.set_link_attribute(
             self.name, self._parent.namespace, net_ns_fd=namespace)
         self._parent.namespace = namespace
+        if is_ovs_port:
+            # NOTE(slaweq): because of the "shy port" which may dissapear for
+            # short time after it's moved to the namespace we need to wait
+            # a bit before checking if port really exists in the namespace
+            time.sleep(1)
         common_utils.wait_until_true(lambda: self.exists, timeout=5,
                                      sleep=0.5)
 

neutron/tests/unit/agent/linux/test_interface.py

@@ -468,11 +468,11 @@ def device_exists(dev, namespace=None):
                 expected.extend(
                     [mock.call().ensure_namespace(namespace),
                      mock.call().ensure_namespace().add_device_to_namespace(
-                         mock.ANY),
+                         mock.ANY, is_ovs_port=True),
                      mock.call().ensure_namespace().add_device_to_namespace(
-                         mock.ANY),
+                         mock.ANY, is_ovs_port=True),
                      mock.call().ensure_namespace().add_device_to_namespace(
-                         mock.ANY)])
+                         mock.ANY, is_ovs_port=True)])
             expected.extend([
                 mock.call(namespace=namespace),
                 mock.call().device('tap0'),
@@ -518,6 +518,20 @@ def test_unplug(self):
             ovs_br.assert_has_calls([mock.call('br-int'),
                                      mock.call().delete_port('tap0')])
 
+    def test__add_device_to_namespace_retries(self):
+        ovs = interface.OVSInterfaceDriver(self.conf)
+        namespace_obj = self.ip.return_value.ensure_namespace.return_value
+        self.ip.ensure_namespace.return_value = namespace_obj
+        namespace_obj.add_device_to_namespace.side_effect = (
+            ip_lib.NetworkInterfaceNotFound)
+        device = mock.MagicMock()
+        self.assertRaises(
+            ip_lib.NetworkInterfaceNotFound,
+            ovs._add_device_to_namespace,
+            self.ip, device, "test-ns")
+        self.assertEqual(10, namespace_obj.add_device_to_namespace.call_count)
+        self.assertIsNone(device.namespace)
+
 
 class TestOVSInterfaceDriverWithVeth(TestOVSInterfaceDriver):
 

neutron/tests/unit/agent/linux/test_ip_lib.py

@@ -506,7 +506,8 @@ def fake_create_interface(ifname, namespace, kind, **kwargs):
     def test_add_device_to_namespace(self):
         dev = mock.Mock()
         ip_lib.IPWrapper(namespace='ns').add_device_to_namespace(dev)
-        dev.assert_has_calls([mock.call.link.set_netns('ns')])
+        dev.assert_has_calls(
+            [mock.call.link.set_netns('ns', is_ovs_port=False)])
 
     def test_add_device_to_namespace_is_none(self):
         dev = mock.Mock()