Merge pull request #99 from stackhpc/upstream/2023.1-2023-12-18

Synchronise 2023.1 with upstream

Author: markgoddard

neutron/db/db_base_plugin_v2.py

@@ -318,7 +318,7 @@ def _validate_projects_have_access_to_network(self, network, project_ids):
         if project_ids - allowed_projects:
             raise exc.InvalidSharedSetting(network=network.name)
 
-    def _validate_ipv6_attributes(self, subnet, cur_subnet):
+    def _validate_ipv6_attributes(self, subnet, cur_subnet, has_cidr):
         if cur_subnet:
             self._validate_ipv6_update_dhcp(subnet, cur_subnet)
             return
@@ -330,7 +330,7 @@ def _validate_ipv6_attributes(self, subnet, cur_subnet):
         if ra_mode_set and address_mode_set:
             self._validate_ipv6_combination(subnet['ipv6_ra_mode'],
                                             subnet['ipv6_address_mode'])
-        if address_mode_set or ra_mode_set:
+        if has_cidr and (address_mode_set or ra_mode_set):
             self._validate_eui64_applicable(subnet)
 
     def _validate_eui64_applicable(self, subnet):
@@ -607,16 +607,21 @@ def _validate_subnet(self, context, s, cur_subnet=None):
 
         ip_ver = s['ip_version']
 
+        # We could be called without a cidr if a subnet pool is being used,
+        # so remember that since some checks below require one and should
+        # be skipped.
+        has_cidr = False
         if validators.is_attr_set(s.get('cidr')):
             self._validate_ip_version(ip_ver, s['cidr'], 'cidr')
+            has_cidr = True
 
         # TODO(watanabe.isao): After we found a way to avoid the re-sync
         # from the agent side, this restriction could be removed.
         if cur_subnet:
             dhcp_was_enabled = cur_subnet.enable_dhcp
         else:
             dhcp_was_enabled = False
-        if s.get('enable_dhcp') and not dhcp_was_enabled:
+        if has_cidr and s.get('enable_dhcp') and not dhcp_was_enabled:
             subnet_prefixlen = netaddr.IPNetwork(s['cidr']).prefixlen
             error_message = _("Subnet has a prefix length that is "
                               "incompatible with DHCP service enabled")
@@ -640,12 +645,13 @@ def _validate_subnet(self, context, s, cur_subnet=None):
 
         if validators.is_attr_set(s.get('gateway_ip')):
             self._validate_ip_version(ip_ver, s['gateway_ip'], 'gateway_ip')
-            is_gateway_not_valid = (
-                ipam.utils.check_gateway_invalid_in_subnet(
-                    s['cidr'], s['gateway_ip']))
-            if is_gateway_not_valid:
-                error_message = _("Gateway is not valid on subnet")
-                raise exc.InvalidInput(error_message=error_message)
+            if has_cidr:
+                is_gateway_not_valid = (
+                    ipam.utils.check_gateway_invalid_in_subnet(
+                        s['cidr'], s['gateway_ip']))
+                if is_gateway_not_valid:
+                    error_message = _("Gateway is not valid on subnet")
+                    raise exc.InvalidInput(error_message=error_message)
             # Ensure the gateway IP is not assigned to any port
             # skip this check in case of create (s parameter won't have id)
             # NOTE(salv-orlando): There is slight chance of a race, when
@@ -698,7 +704,7 @@ def _validate_subnet(self, context, s, cur_subnet=None):
                     error_message=(_("ipv6_address_mode is not valid when "
                                      "ip_version is 4")))
         if ip_ver == 6:
-            self._validate_ipv6_attributes(s, cur_subnet)
+            self._validate_ipv6_attributes(s, cur_subnet, has_cidr)
 
     def _validate_subnet_for_pd(self, subnet):
         """Validates that subnet parameters are correct for IPv6 PD"""
@@ -860,6 +866,7 @@ def _create_subnet_precommit(self, context, subnet):
             msg = _('a subnetpool must be specified in the absence of a cidr')
             raise exc.BadRequest(resource='subnets', msg=msg)
 
+        validate = True
         if subnetpool_id:
             self.ipam.validate_pools_with_subnetpool(s)
             if subnetpool_id == constants.IPV6_PD_POOL_ID:
@@ -868,16 +875,18 @@ def _create_subnet_precommit(self, context, subnet):
                     # cidr with IPv6 prefix delegation. Set the subnetpool_id
                     # to None and allow the request to continue as normal.
                     subnetpool_id = None
-                    self._validate_subnet(context, s)
                 else:
                     prefix = constants.PROVISIONAL_IPV6_PD_PREFIX
                     subnet['subnet']['cidr'] = prefix
                     self._validate_subnet_for_pd(s)
+                    validate = False
         else:
             if not has_cidr:
                 msg = _('A cidr must be specified in the absence of a '
                         'subnet pool')
                 raise exc.BadRequest(resource='subnets', msg=msg)
+
+        if validate:
             self._validate_subnet(context, s)
 
         with db_api.CONTEXT_WRITER.using(context):

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

@@ -390,6 +390,9 @@ def post_fork_initialize(self, resource, event, trigger, payload=None):
             self._maintenance_thread.start()
             LOG.info("Maintenance task thread has started")
 
+        LOG.info('%s process has finished the post initialization',
+                 worker_class.__name__)
+
     def _create_security_group_precommit(self, resource, event, trigger,
                                          payload):
         context = payload.context

neutron/tests/unit/db/test_db_base_plugin_v2.py

@@ -6641,6 +6641,47 @@ def test_allocate_any_ipv4_subnet_ipv6_pool(self):
             res = req.get_response(self.api)
             self.assertEqual(400, res.status_int)
 
+    def _test_allocate_any_subnet_wrong_dns(self, pool_cidr, ip_version,
+                                            nameservers):
+        with self.network() as network:
+            sp = self._test_create_subnetpool([pool_cidr],
+                                              tenant_id=self._tenant_id,
+                                              name=self._POOL_NAME)
+
+            # Specify a DNS nameserver of the wrong IP version
+            data = {'subnet': {'network_id': network['network']['id'],
+                               'subnetpool_id': sp['subnetpool']['id'],
+                               'ip_version': ip_version,
+                               'dns_nameservers': nameservers,
+                               'tenant_id': network['network']['tenant_id']}}
+            req = self.new_create_request('subnets', data)
+            res = req.get_response(self.api)
+            self.assertEqual(400, res.status_int)
+
+    def test_allocate_any_v4_subnet_wrong_dns_v6(self):
+        self._test_allocate_any_subnet_wrong_dns('10.0.0.0/16',
+            constants.IP_VERSION_4, ['2001:db8:1:2::1'])
+
+    def test_allocate_any_v6_subnet_wrong_dns_v4(self):
+        self._test_allocate_any_subnet_wrong_dns('2001:db8:1:2::/63',
+            constants.IP_VERSION_6, ['10.0.0.1'])
+
+    def test_allocate_any_v4_subnet_wrong_dns_v6_multiple(self):
+        self._test_allocate_any_subnet_wrong_dns('10.0.0.0/16',
+            constants.IP_VERSION_4, ['2001:db8:1:2::1', '2001:db8:2:2::1'])
+
+    def test_allocate_any_v6_subnet_wrong_dns_v4_multiple(self):
+        self._test_allocate_any_subnet_wrong_dns('2001:db8:1:2::/63',
+            constants.IP_VERSION_6, ['11.0.0.11', '12.0.0.12'])
+
+    def test_allocate_any_v4_subnet_wrong_dns_mixed(self):
+        self._test_allocate_any_subnet_wrong_dns('10.0.0.0/16',
+            constants.IP_VERSION_4, ['11.0.0.11', '2001:db8:1:2::1'])
+
+    def test_allocate_any_v6_subnet_wrong_dns_mixed(self):
+        self._test_allocate_any_subnet_wrong_dns('2001:db8:1:2::/63',
+            constants.IP_VERSION_6, ['11.0.0.11', '2001:db8:1:2::1'])
+
 
 class DbModelMixin(object):
     """DB model tests."""