Merge "Change SG rules backref load method to "joined"" into stable/2023.1

Author: Zuul

neutron/db/models/securitygroup.py

@@ -101,9 +101,13 @@ class SecurityGroupRule(standard_attr.HasStandardAttributes, model_base.BASEV2,
     port_range_min = sa.Column(sa.Integer)
     port_range_max = sa.Column(sa.Integer)
     remote_ip_prefix = sa.Column(sa.String(255))
+    # NOTE(ralonsoh): loading method is temporarily changed to "joined" until
+    # a proper way to only load the security groups "shared" field, without
+    # loading the rest of the synthetic fields, is implemented. LP#2052419
+    # description for more information and context.
     security_group = orm.relationship(
         SecurityGroup, load_on_pending=True,
-        backref=orm.backref('rules', cascade='all,delete', lazy='dynamic'),
+        backref=orm.backref('rules', cascade='all,delete', lazy='joined'),
         primaryjoin="SecurityGroup.id==SecurityGroupRule.security_group_id")
     source_group = orm.relationship(
         SecurityGroup,

neutron/tests/unit/db/test_securitygroups_db.py

@@ -347,6 +347,10 @@ def _test_security_group_precommit_create_event(self,
             # Especially we want to check the revision number here.
             sg_dict_got = self.mixin.get_security_group(
                 self.ctx, sg_dict['id'])
+            # Order the SG rules to avoid issues in the assertion.
+            for _sg_dict in (sg_dict, sg_dict_got):
+                _sg_dict['security_group_rules'] = sorted(
+                    _sg_dict['security_group_rules'], key=lambda d: d['id'])
             self.assertEqual(sg_dict, sg_dict_got)
 
     def test_security_group_precommit_create_event_with_revisions(self):