From d4b96ec072e4bc4076502731b92087b276772831 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Wed, 25 Sep 2024 07:17:07 +0000 Subject: [PATCH 1/2] Use the declarative attribute ``standard_attr_id`` In those Neutron objects and DB definitions where the declarative attribute ``standard_attr_id`` is defined, use it instead of accessing to the ``standard_attr`` child object. Conflicts: neutron/db/securitygroups_db.py neutron/services/ovn_l3/service_providers/ovn.py Closes-Bug: #2081945 Change-Id: Iadfbeff79c0200c3a6b90f785b910dc391f9deb3 (cherry picked from commit 144e140e750987a286e6adc74ff0ffad1da474d6) (cherry picked from commit 47a69fb0e74ae0b8def2578ebc9f20574b4e1746) Conflicts: neutron/db/securitygroups_db.py --- neutron/db/db_base_plugin_common.py | 6 +++--- neutron/db/l3_db.py | 2 +- neutron/db/securitygroups_db.py | 2 +- neutron/tests/unit/fake_resources.py | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/neutron/db/db_base_plugin_common.py b/neutron/db/db_base_plugin_common.py index b00c88f1917..910a9b1315c 100644 --- a/neutron/db/db_base_plugin_common.py +++ b/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: diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py index 80d47f560cc..51a1982e6d0 100644 --- a/neutron/db/l3_db.py +++ b/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 diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py index f65b1d8fc3e..21c2fc68c36 100644 --- a/neutron/db/securitygroups_db.py +++ b/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: diff --git a/neutron/tests/unit/fake_resources.py b/neutron/tests/unit/fake_resources.py index c7d58710894..e0d4dd22f65 100644 --- a/neutron/tests/unit/fake_resources.py +++ b/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(), } From 641b847fbb3b5013d98d3995a80323ef811ba79e Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Tue, 18 Mar 2025 15:06:57 +0000 Subject: [PATCH 2/2] [stable-only] Fix the Neutron milestones list The patch [1] incorrectly added ``RELEASE_2023_1`` to the ``NEUTRON_MILESTONES`` list, instead of ``ZED`` [1]https://review.opendev.org/c/openstack/neutron/+/859111 Change-Id: Ib2eead41780fea1b61aa52e78a12a4d436e1e097 --- neutron/db/migration/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py index 35fcf018ef7..3c8960c9f0f 100644 --- a/neutron/db/migration/__init__.py +++ b/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 ]