Merge pull request #32 from stackhpc/upstream/yoga-2023-03-06

Synchronise yoga with upstream

Author: markgoddard

doc/source/ovn/migration.rst

@@ -136,7 +136,7 @@ Perform the following steps in the undercloud
    * VALIDATE_MIGRATION - Create migration resources to validate the
      migration. The migration script, before starting the migration, boot a
      server and validates that the server is reachable after the migration.
-     Default: True.
+     Default: False
 
    * SERVER_USER_NAME - User name to use for logging into the migration
      instances.

etc/oslo-config-generator/neutron.conf

@@ -25,3 +25,4 @@ namespace = oslo.service.service
 namespace = oslo.service.sslutils
 namespace = oslo.service.wsgi
 namespace = keystonemiddleware.auth_token
+namespace = osprofiler

neutron/agent/ovn/metadata/agent.py

@@ -421,6 +421,10 @@ def _ensure_datapath_checksum(self, namespace):
     def _get_port_ips(self, port):
         # Retrieve IPs from the port mac column which is in form
         # ["<port_mac> <ip1> <ip2> ... <ipN>"]
+        if not port.mac:
+            LOG.warning("Port %s MAC column is empty, cannot retrieve IP "
+                        "addresses", port.uuid)
+            return []
         mac_field_attrs = port.mac[0].split()
         ips = mac_field_attrs[1:]
         if not ips:

neutron/common/ovn/constants.py

@@ -168,7 +168,8 @@
         '119': 'domain_search_list',
         '252': 'wpad',
         '210': 'path_prefix',
-        '150': 'tftp_server_address'},
+        '150': 'tftp_server_address',
+        '255': 'next_server'},
     6: {'server-id': 'server_id',
         'dns-server': 'dns_server',
         'domain-search': 'domain_search',

neutron/common/ovn/utils.py

@@ -21,6 +21,7 @@
 from neutron_lib.api.definitions import l3
 from neutron_lib.api.definitions import port_security as psec
 from neutron_lib.api.definitions import portbindings
+from neutron_lib.api.definitions import provider_net
 from neutron_lib.api import validators
 from neutron_lib import constants as const
 from neutron_lib import context as n_context
@@ -618,6 +619,10 @@ def is_gateway_chassis_invalid(chassis_name, gw_chassis,
 
 
 def is_provider_network(network):
+    return network.get(provider_net.PHYSICAL_NETWORK, False)
+
+
+def is_external_network(network):
     return network.get(external_net.EXTERNAL, False)
 
 

neutron/db/l3_hamode_db.py

@@ -69,6 +69,10 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
                          router_az_db.RouterAvailabilityZoneMixin):
     """Mixin class to add high availability capability to routers."""
 
+    router_device_owners = (
+        l3_dvr_db.L3_NAT_with_dvr_db_mixin.router_device_owners +
+        (constants.DEVICE_OWNER_ROUTER_HA_INTF, ))
+
     def _verify_configuration(self):
         self.ha_cidr = cfg.CONF.l3_ha_net_cidr
         try:

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

@@ -833,7 +833,10 @@ def check_vlan_distributed_ports(self):
         # Get router ports belonging to VLAN networks
         vlan_nets = self._ovn_client._plugin.get_networks(
             context, {pnet.NETWORK_TYPE: [n_const.TYPE_VLAN]})
-        vlan_net_ids = [vn['id'] for vn in vlan_nets]
+        # FIXME(ltomasbo): Once Bugzilla 2162756 is fixed the
+        # is_provider_network check should be removed
+        vlan_net_ids = [vn['id'] for vn in vlan_nets
+                        if not utils.is_provider_network(vn)]
         router_ports = self._ovn_client._plugin.get_ports(
             context, {'network_id': vlan_net_ids,
                       'device_owner': n_const.ROUTER_PORT_OWNERS})

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

@@ -1250,7 +1250,7 @@ def _get_nets_and_ipv6_ra_confs_for_router_port(self, context, port):
                 # leak the RAs generated for the tenant networks via the
                 # provider network
                 ipv6_ra_configs['send_periodic'] = 'true'
-                if is_gw_port and utils.is_provider_network(net):
+                if is_gw_port and utils.is_external_network(net):
                     ipv6_ra_configs['send_periodic'] = 'false'
                 ipv6_ra_configs['mtu'] = str(net['mtu'])
 
@@ -1562,9 +1562,12 @@ def _gen_router_port_options(self, port, network=None):
         # logical router port is centralized in the chassis hosting the
         # distributed gateway port.
         # https://github.com/openvswitch/ovs/commit/85706c34d53d4810f54bec1de662392a3c06a996
+        # FIXME(ltomasbo): Once Bugzilla 2162756 is fixed the
+        # is_provider_network check should be removed
         if network.get(pnet.NETWORK_TYPE) == const.TYPE_VLAN:
             options[ovn_const.LRP_OPTIONS_RESIDE_REDIR_CH] = (
-                'false' if ovn_conf.is_ovn_distributed_floating_ip()
+                'false' if (ovn_conf.is_ovn_distributed_floating_ip() and
+                            not utils.is_provider_network(network))
                 else 'true')
 
         is_gw_port = const.DEVICE_OWNER_ROUTER_GW == port.get(
@@ -1979,8 +1982,9 @@ def update_network(self, context, network, original_network=None):
                 for subnet in subnets:
                     self.update_subnet(context, subnet, network, txn)
 
-                if utils.is_provider_network(network):
-                    # make sure to use admin context as this is a providernet
+                if utils.is_external_network(network):
+                    # make sure to use admin context as this is a external
+                    # network
                     self.set_gateway_mtu(n_context.get_admin_context(),
                                          network, txn)
 

neutron/tests/unit/db/test_l3_hamode_db.py

@@ -667,6 +667,18 @@ def test_update_router_ha_interface_port_ip_not_allow(self):
                           self.admin_ctx, ports[0]['id'],
                           port)
 
+    def test_delete_router_ha_interface_port(self):
+        router = self._create_router()
+        network = self.plugin.get_ha_network(self.admin_ctx,
+                                             router['tenant_id'])
+        binding = self.plugin.add_ha_port(
+            self.admin_ctx, router['id'], network.network_id,
+            router['tenant_id'])
+
+        self.assertRaises(n_exc.ServicePortInUse,
+                          self.core_plugin.delete_port,
+                          self.admin_ctx, binding.port_id)
+
     def test_create_ha_network_tenant_binding_raises_duplicate(self):
         router = self._create_router()
         network = self.plugin.get_ha_network(self.admin_ctx,

releasenotes/notes/bug-2003455-b502cc637427560e.yaml

@@ -0,0 +1,19 @@
+---
+fixes:
+  - |
+    [`bug 2003455 <https://bugs.launchpad.net/neutron/+bug/2003455>`_]
+    It is added an extra checking to ensure the "reside-on-redirect-chassis"
+    is set to true for the logical router port associated to vlan provider
+    network despite having the "ovn_distributed_floating_ip" enabled or not.
+    This is needed as there is an OVN bug
+    (https://bugzilla.redhat.com/show_bug.cgi?id=2162756) making it not work
+    as expected. Until that is fixed, we need these workaround
+    that makes the traffic centrallized, but not tunneled, through the node
+    with the gateway port, thus avoiding MTU issues.
+issues:
+  - |
+    Until the OVN bug (https://bugzilla.redhat.com/show_bug.cgi?id=2162756)
+    is fixed, setting the "reside-on-redirect-chassis" to true for the logical
+    router port associated to vlan provider network is needed. This workaround
+    makes the traffic centrallized, but not tunneled, through the node
+    with the gateway port, thus avoiding MTU issues.