Merge pull request #94 from stackhpc/upstream/2023.1-2023-12-11

Synchronise 2023.1 with upstream

Author: markgoddard

doc/source/admin/config-ovs-offload.rst

@@ -355,7 +355,7 @@ Validate Open vSwitch hardware offloading
 
    .. code-block:: bash
 
-      # openstack port create --network private --vnic-type=direct --binding-profile '{"capabilities": ["switchdev"]}' direct_port1
+      # openstack port create --network private --vnic-type=direct direct_port1
 
 
 #. Create an instance using the direct port on 'First Compute Node'
@@ -369,7 +369,7 @@ Validate Open vSwitch hardware offloading
 
    .. code-block:: bash
 
-      # openstack port create --network private --vnic-type=direct --binding-profile '{"capabilities": ["switchdev"]}' direct_port2
+      # openstack port create --network private --vnic-type=direct direct_port2
       # openstack server create --flavor m1.small --image mellanox_fedora --nic port-id=direct_port2 vm2
 
    .. note::

neutron/agent/linux/dhcp.py

@@ -1213,7 +1213,8 @@ def _get_ovn_metadata_port_ip(self, subnet):
         m_ports = [port for port in self.network.ports if
                    self._is_ovn_metadata_port(port, self.network.id)]
         if m_ports:
-            for fixed_ip in m_ports[0].fixed_ips:
+            port = self.device_manager.plugin.get_dhcp_port(m_ports[0].id)
+            for fixed_ip in port.fixed_ips:
                 if fixed_ip.subnet_id == subnet.id:
                     return fixed_ip.ip_address
 
@@ -1289,7 +1290,7 @@ def _generate_opts_per_subnet(self):
                     if subnet_dhcp_ip:
                         metadata_route_ip = subnet_dhcp_ip
 
-                if not isolated_subnets[subnet.id] and gateway:
+                elif not isolated_subnets[subnet.id] and gateway:
                     metadata_route_ip = gateway
 
                 if metadata_route_ip:

neutron/common/ovn/constants.py

@@ -70,6 +70,10 @@
 OVN_PROVNET_PORT_NAME_PREFIX = 'provnet-'
 OVN_NAME_PREFIX = 'neutron-'
 
+# TODO(froyo): Move this to neutron-lib as soon as possible, and when a new
+# release is created and pointed to in the requirements remove this code
+OVN_LB_HM_PORT_DISTRIBUTED = 'ovn-lb-hm:distributed'
+
 # Agent extension constants
 OVN_AGENT_DESC_KEY = 'neutron:description'
 OVN_AGENT_METADATA_SB_CFG_KEY = 'neutron:ovn-metadata-sb-cfg'

neutron/common/ovn/utils.py

@@ -601,6 +601,11 @@ def ovn_metadata_name(id_):
     return 'metadata-%s' % id_
 
 
+def is_ovn_lb_hm_port(port):
+    return (port['device_owner'] == constants.OVN_LB_HM_PORT_DISTRIBUTED and
+            port['device_id'].startswith('ovn-lb-hm'))
+
+
 def is_gateway_chassis_invalid(chassis_name, gw_chassis,
                                physnet, chassis_physnets,
                                az_hints, chassis_with_azs):

neutron/conf/agent/metadata/config.py

@@ -94,7 +94,7 @@
     cfg.IntOpt('metadata_workers',
                sample_default='<num_of_cpus> / 2',
                help=_('Number of separate worker processes for metadata '
-                      'server (defaults to 2 when used with ML2/OVN and half '
+                      'server (defaults to 0 when used with ML2/OVN and half '
                       'of the number of CPUs with other backend drivers)')),
     cfg.IntOpt('metadata_backlog',
                default=4096,

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py

@@ -15,6 +15,7 @@
 import socket
 import uuid
 
+from neutron_lib import constants
 from neutron_lib import exceptions as n_exc
 from neutron_lib.utils import helpers
 from oslo_log import log
@@ -917,7 +918,10 @@ def get_metadata_port_network(self, network):
         except idlutils.RowNotFound:
             return None
         cmd = self.db_find_rows('Port_Binding', ('datapath', '=', dp),
-                                ('type', '=', ovn_const.LSP_TYPE_LOCALPORT))
+                                ('type', '=', ovn_const.LSP_TYPE_LOCALPORT),
+                                ('external_ids', '=', {
+                                    ovn_const.OVN_DEVICE_OWNER_EXT_ID_KEY:
+                                        constants.DEVICE_OWNER_DISTRIBUTED}))
         return next(iter(cmd.execute(check_error=True)), None)
 
     def set_chassis_neutron_description(self, chassis, description,

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py

@@ -380,8 +380,9 @@ def _get_port_options(self, port):
                     cidrs += ' {}/{}'.format(ip['ip_address'],
                                              subnet['cidr'].split('/')[1])
 
-            # Metadata port.
-            if port['device_owner'] == const.DEVICE_OWNER_DISTRIBUTED:
+            # Metadata or OVN LB HM port.
+            if (port['device_owner'] == const.DEVICE_OWNER_DISTRIBUTED or
+                    utils.is_ovn_lb_hm_port(port)):
                 port_type = ovn_const.LSP_TYPE_LOCALPORT
 
             if utils.is_port_external(port):

neutron/services/segments/db.py

@@ -31,6 +31,8 @@
 from oslo_log import log as logging
 from oslo_utils import uuidutils
 
+from neutron.db.models import agent as agent_model
+from neutron.db.models import segment as segment_model
 from neutron.db import segments_db as db
 from neutron import manager
 from neutron.objects import base as base_obj
@@ -243,14 +245,43 @@ def update_segment_host_mapping(context, host, current_segment_ids):
                               entry.segment_id, entry.host)
 
 
-def get_hosts_mapped_with_segments(context):
+def get_hosts_mapped_with_segments(context, include_agent_types=None,
+                                   exclude_agent_types=None):
     """Get hosts that are mapped with segments.
 
     L2 providers can use this method to get an overview of SegmentHostMapping,
     and then delete the stale SegmentHostMapping.
+
+    When using both include_agent_types and exclude_agent_types,
+    exclude_agent_types is most significant.
+    All hosts without agent are excluded when using any agent_type filter.
+
+    :param context: current running context information
+    :param include_agent_types: (set) List of agent types, include hosts
+        with matching agents.
+    :param exclude_agent_types: (set) List of agent types, exclude hosts
+        with matching agents.
     """
-    segment_host_mapping = network.SegmentHostMapping.get_objects(context)
-    return {row.host for row in segment_host_mapping}
+    def add_filter_by_agent_types(qry, include, exclude):
+        qry = qry.join(
+            agent_model.Agent,
+            segment_model.SegmentHostMapping.host == agent_model.Agent.host)
+        if include:
+            qry = qry.filter(agent_model.Agent.agent_type.in_(include))
+        if exclude:
+            qry = qry.filter(agent_model.Agent.agent_type.not_in(exclude))
+
+        return qry
+
+    with db_api.CONTEXT_READER.using(context):
+        query = context.session.query(segment_model.SegmentHostMapping)
+        if include_agent_types or exclude_agent_types:
+            query = add_filter_by_agent_types(query, include_agent_types,
+                                              exclude_agent_types)
+
+        res = query.all()
+
+    return {row.host for row in res}
 
 
 def _get_phys_nets(agent):

neutron/tests/fullstack/base.py

@@ -16,6 +16,7 @@
 import itertools
 import os
 import random
+import time
 
 import netaddr
 from neutron_lib.tests import tools
@@ -96,6 +97,17 @@ def _agent_up():
     def _wait_until_agent_down(self, agent_id):
         def _agent_down():
             agent = self.client.show_agent(agent_id)['agent']
+            if not agent.get('alive'):
+                # NOTE(slaweq): to avoid race between heartbeat written in the
+                # database and response to this API call, lets make sure that
+                # agent is really dead. See bug
+                # https://bugs.launchpad.net/neutron/+bug/2045757
+                # for details.
+                # 2 seconds delay should be more than enough to make sure that
+                # all pending heartbeats are already written in the Neutron
+                # database
+                time.sleep(2)
+                agent = self.client.show_agent(agent_id)['agent']
             return not agent.get('alive')
 
         common_utils.wait_until_true(_agent_down)

neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py

@@ -16,6 +16,7 @@
 import re
 from unittest import mock
 
+from neutron_lib import constants
 from oslo_config import fixture as fixture_config
 from oslo_utils import uuidutils
 from ovsdbapp.backend.ovs_idl import event
@@ -154,7 +155,9 @@ def _create_metadata_port(self, txn, lswitch_name, port_name=None):
                 addresses='AA:AA:AA:AA:AA:AA 192.168.122.123',
                 external_ids={
                     ovn_const.OVN_CIDRS_EXT_ID_KEY: '192.168.122.123/24',
-                    ovn_const.OVN_DEVID_EXT_ID_KEY: 'ovnmeta-' + lswitch_name
+                    ovn_const.OVN_DEVID_EXT_ID_KEY: 'ovnmeta-' + lswitch_name,
+                    ovn_const.OVN_DEVICE_OWNER_EXT_ID_KEY:
+                        constants.DEVICE_OWNER_DISTRIBUTED
                 }))
 
     def _update_metadata_port_ip(self, metadata_port_name):