Merge pull request #207 from stackhpc/upstream/2023.1-2025-03-24

Synchronise 2023.1 with upstream

Author: priteau

neutron/db/db_base_plugin_common.py

@@ -144,9 +144,9 @@ def _store_ip_allocation(context, ip_address, network_id, subnet_id,
 
     def _make_subnet_dict(self, subnet, fields=None, context=None):
         if isinstance(subnet, subnet_obj.Subnet):
-            standard_attr_id = subnet.db_obj.standard_attr.id
+            standard_attr_id = subnet.db_obj.standard_attr_id
         else:
-            standard_attr_id = subnet.standard_attr.id
+            standard_attr_id = subnet.standard_attr_id
 
         res = {'id': subnet['id'],
                'name': subnet['name'],
@@ -335,7 +335,7 @@ def _make_network_dict(self, network, fields=None,
                'status': network['status'],
                'subnets': [subnet['id']
                            for subnet in network['subnets']],
-               'standard_attr_id': network.standard_attr.id}
+               'standard_attr_id': network.standard_attr_id}
         res['shared'] = self._is_network_shared(context, network.rbac_entries)
         # Call auxiliary extend functions, if any
         if process_extensions:

neutron/db/l3_db.py

@@ -1231,7 +1231,7 @@ def _make_floatingip_dict(self, floatingip, fields=None,
                'port_id': floatingip.fixed_port_id,
                'fixed_ip_address': fixed_ip_address,
                'status': floatingip.status,
-               'standard_attr_id': floatingip.db_obj.standard_attr.id,
+               'standard_attr_id': floatingip.db_obj.standard_attr_id,
                }
         # NOTE(mlavalle): The following assumes this mixin is used in a
         # class inheriting from CommonDbMixin, which is true for all existing

neutron/db/migration/__init__.py

@@ -55,7 +55,7 @@
     WALLABY,
     XENA,
     YOGA,
-    RELEASE_2023_1,
+    ZED,
     # Do not add the milestone until the end of the release
 ]
 

neutron/db/securitygroups_db.py

@@ -330,7 +330,7 @@ def _make_security_group_dict(self, security_group, fields=None):
                'stateful': security_group['stateful'],
                'tenant_id': security_group['tenant_id'],
                'description': security_group['description'],
-               'standard_attr_id': security_group.db_obj.standard_attr.id,
+               'standard_attr_id': security_group.db_obj.standard_attr_id,
                'shared': security_group['shared'],
                }
         if security_group.rules:

neutron/tests/unit/fake_resources.py

@@ -708,6 +708,7 @@ def create_one_fip(attrs=None):
 
         # Set default attributes.
         fake_uuid = uuidutils.generate_uuid()
+        standard_attr = FakeStandardAttribute()
         fip_attrs = {
             'id': 'fip-id-' + fake_uuid,
             'tenant_id': '',
@@ -724,7 +725,8 @@ def create_one_fip(attrs=None):
             'dns_domain': '',
             'dns_name': '',
             'project_id': '',
-            'standard_attr': FakeStandardAttribute(),
+            'standard_attr': standard_attr,
+            'standard_attr_id': standard_attr.id,
             'qos_policy_binding': FakeQosFIPPolicyBinding(),
             'qos_network_policy_binding': FakeQosNetworkPolicyBinding(),
         }