Merge pull request #127 from stackhpc/upstream/zed-2024-03-04

Synchronise zed with upstream

Author: markgoddard

neutron/agent/metadata/driver.py

@@ -295,7 +295,7 @@ def spawn_monitored_metadata_proxy(cls, monitor, ns_name, port, conf,
                                                      ns_name=ns_name,
                                                      callback=callback)
         try:
-            pm.enable()
+            pm.enable(ensure_active=True)
         except exceptions.ProcessExecutionError as exec_err:
             LOG.error("Encountered process execution error %(err)s while "
                       "starting process in namespace %(ns)s",

neutron/agent/ovn/metadata/driver.py

@@ -206,7 +206,7 @@ def spawn_monitored_metadata_proxy(cls, monitor, ns_name, port, conf,
                                                      ns_name=ns_name,
                                                      callback=callback)
         try:
-            pm.enable()
+            pm.enable(ensure_active=True)
         except exceptions.ProcessExecutionError as exec_err:
             LOG.error("Encountered process execution error %(err)s while "
                       "starting process in namespace %(ns)s",

neutron/privileged/agent/linux/ip_lib.py

@@ -348,6 +348,10 @@ def set_link_flags(device, namespace, flags):
     _run_iproute_link("set", device, namespace, flags=new_flags)
 
 
+@tenacity.retry(
+    retry=tenacity.retry_if_exception_type(NetworkInterfaceNotFound),
+    wait=tenacity.wait_exponential(multiplier=0.02, max=1),
+    stop=tenacity.stop_after_delay(3), reraise=True)
 @privileged.link_cmd.entrypoint
 def set_link_attribute(device, namespace, **attributes):
     _run_iproute_link("set", device, namespace, **attributes)
@@ -378,7 +382,8 @@ def set_link_bridge_master(device, bridge, namespace=None):
 
 @tenacity.retry(
     retry=tenacity.retry_if_exception_type(
-        netlink_exceptions.NetlinkDumpInterrupted),
+        (netlink_exceptions.NetlinkDumpInterrupted,
+         NetworkInterfaceNotFound)),
     wait=tenacity.wait_exponential(multiplier=0.02, max=1),
     stop=tenacity.stop_after_delay(8),
     reraise=True)

neutron/tests/unit/agent/dhcp/test_agent.py

@@ -637,6 +637,7 @@ def test_dhcp_ready_ports_updates_after_enable_dhcp(self, *args):
                         'IpAddrCommand.wait_until_address_ready') as mock_wait:
             mock_wait.return_value = True
             dhcp = dhcp_agent.DhcpAgent(HOSTNAME)
+            dhcp.update_isolated_metadata_proxy = mock.Mock()
             self.assertEqual(set(), dhcp.dhcp_ready_ports)
             dhcp.configure_dhcp_for_network(fake_network)
             self.assertEqual({fake_port1.id}, dhcp.dhcp_ready_ports)
@@ -834,7 +835,7 @@ def _enable_dhcp_helper(self, network, enable_isolated_metadata=False,
             process_instance.assert_has_calls([
                 mock.call.disable(sig=str(int(signal.SIGTERM))),
                 mock.call.get_pid_file_name(),
-                mock.call.enable()])
+                mock.call.enable(ensure_active=True)])
         else:
             process_instance.assert_has_calls([
                 mock.call.disable(sig=str(int(signal.SIGTERM)))])

neutron/tests/unit/agent/metadata/test_driver.py

@@ -168,7 +168,12 @@ def _test_spawn_metadata_proxy(self, dad_failed=False):
                     'IpAddrCommand.wait_until_address_ready') as mock_wait,\
                 mock.patch(
                     'neutron.agent.linux.ip_lib.'
-                    'delete_ip_address') as mock_del:
+                    'delete_ip_address') as mock_del,\
+                mock.patch(
+                    'neutron.agent.linux.external_process.'
+                    'ProcessManager.active',
+                    new_callable=mock.PropertyMock,
+                    side_effect=[False, True]):
             agent = l3_agent.L3NATAgent('localhost')
             agent.process_monitor = mock.Mock()
             cfg_file = os.path.join(

neutron/tests/unit/agent/ovn/metadata/test_driver.py

@@ -68,7 +68,12 @@ def test_spawn_metadata_proxy(self):
                            return_value=test_utils.FakeUser(self.EUNAME)),\
                 mock.patch('grp.getgrnam',
                            return_value=test_utils.FakeGroup(self.EGNAME)),\
-                mock.patch('os.makedirs'):
+                mock.patch('os.makedirs'),\
+                mock.patch(
+                    'neutron.agent.linux.external_process.'
+                    'ProcessManager.active',
+                    new_callable=mock.PropertyMock,
+                    side_effect=[False, True]):
             cfg_file = os.path.join(
                 metadata_driver.HaproxyConfigurator.get_config_path(
                     cfg.CONF.state_path),

zuul.d/job-templates.yaml

@@ -70,19 +70,6 @@
             voting: true
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
         - openstacksdk-functional-devstack-networking
-        - tripleo-ci-centos-9-content-provider
-        - neutron-centos-9-tripleo-standalone:
-            voting: true
-            vars: &consumer_vars
-              consumer_job: true
-              build_container_images: false
-              remove_tags:
-                - build
-            dependencies: &consumer_deps
-              - tripleo-ci-centos-9-content-provider
-        - neutron-ovn-tripleo-ci-centos-9-containers-multinode:
-            vars: *consumer_vars
-            dependencies: *consumer_deps
         - neutron-linuxbridge-tempest-plugin-nftables
         - neutron-ovs-tempest-plugin-iptables_hybrid-nftables
         - devstack-enforce-scope
@@ -139,19 +126,10 @@
         - neutron-ovn-tempest-ovs-release-ipv6-only
         - neutron-ovs-tempest-fips
         - neutron-ovn-tempest-ovs-release-fips
-        - neutron-ovs-grenade-multinode-tick-tick
         - devstack-tobiko-neutron:
             voting: true
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
         - openstacksdk-functional-devstack-networking
-        - tripleo-ci-centos-9-content-provider
-        - neutron-centos-9-tripleo-standalone:
-            voting: true
-            vars: *consumer_vars
-            dependencies: *consumer_deps
-        - neutron-ovn-tripleo-ci-centos-9-containers-multinode:
-            vars: *consumer_vars
-            dependencies: *consumer_deps
         - neutron-linuxbridge-tempest-plugin-scenario-nftables
         - neutron-ovs-tempest-plugin-scenario-iptables_hybrid-nftables
         - devstack-enforce-scope

zuul.d/project.yaml

@@ -20,8 +20,11 @@
         - neutron-functional-with-uwsgi
         - neutron-fullstack-with-uwsgi
         - neutron-ovs-rally-task
-        - neutron-ovs-grenade-multinode
-        - neutron-ovs-grenade-dvr-multinode
+          # TODO: re enable once jobs fixed
+          #- neutron-ovs-grenade-multinode:
+          #  voting: false
+          #- neutron-ovs-grenade-dvr-multinode:
+          #  voting: false
         - neutron-ovs-tempest-multinode-full
         - neutron-ovs-tempest-dvr-ha-multinode-full
         - neutron-ovn-tempest-ipv6-only
@@ -32,6 +35,8 @@
         - neutron-functional-with-uwsgi
         - neutron-fullstack-with-uwsgi
         - neutron-ovs-tempest-multinode-full
-        - neutron-ovs-grenade-multinode
-        - neutron-ovs-grenade-dvr-multinode
+          #- neutron-ovs-grenade-multinode:
+          #  voting: false
+          #- neutron-ovs-grenade-dvr-multinode:
+          #  voting: false
         - neutron-ovn-tempest-ipv6-only