Merge "[S-RBAC] Fix policies for l3_conntrack_helpers" into stable/2025.1

Author: Zuul

neutron/conf/policies/l3_conntrack_helper.py

@@ -30,9 +30,7 @@
 rules = [
     policy.DocumentedRuleDefault(
         name='create_router_conntrack_helper',
-        check_str=neutron_policy.policy_or(
-            base.ADMIN_OR_PROJECT_MEMBER,
-            base.PARENT_OWNER_MEMBER),
+        check_str=base.ADMIN_OR_PARENT_OWNER_MEMBER,
         scope_types=['project'],
         description='Create a router conntrack helper',
         operations=[
@@ -49,9 +47,7 @@
     ),
     policy.DocumentedRuleDefault(
         name='get_router_conntrack_helper',
-        check_str=neutron_policy.policy_or(
-            base.ADMIN_OR_PROJECT_READER,
-            base.PARENT_OWNER_READER),
+        check_str=base.ADMIN_OR_PARENT_OWNER_READER,
         scope_types=['project'],
         description='Get a router conntrack helper',
         operations=[
@@ -72,9 +68,7 @@
     ),
     policy.DocumentedRuleDefault(
         name='update_router_conntrack_helper',
-        check_str=neutron_policy.policy_or(
-            base.ADMIN_OR_PROJECT_MEMBER,
-            base.PARENT_OWNER_MEMBER),
+        check_str=base.ADMIN_OR_PARENT_OWNER_MEMBER,
         scope_types=['project'],
         description='Update a router conntrack helper',
         operations=[
@@ -91,9 +85,7 @@
     ),
     policy.DocumentedRuleDefault(
         name='delete_router_conntrack_helper',
-        check_str=neutron_policy.policy_or(
-            base.ADMIN_OR_PROJECT_MEMBER,
-            base.PARENT_OWNER_MEMBER),
+        check_str=base.ADMIN_OR_PARENT_OWNER_MEMBER,
         scope_types=['project'],
         description='Delete a router conntrack helper',
         operations=[

neutron/tests/unit/conf/policies/test_l3_conntrack_helper.py

@@ -28,17 +28,17 @@ def setUp(self):
         super().setUp()
         self.router = {
             'id': uuidutils.generate_uuid(),
+            'tenant_id': self.project_id,
             'project_id': self.project_id}
         self.alt_router = {
             'id': uuidutils.generate_uuid(),
+            'tenant_id': self.alt_project_id,
             'project_id': self.alt_project_id}
 
         self.target = {
-            'project_id': self.project_id,
             'router_id': self.router['id'],
             'ext_parent_router_id': self.router['id']}
         self.alt_target = {
-            'project_id': self.alt_project_id,
             'router_id': self.alt_router['id'],
             'ext_parent_router_id': self.alt_router['id']}