Add defaults/overrides interface

averevki · Jun 18, 2024 · 2f17e45 · 2f17e45
1 parent 7fe6c47
commit 2f17e45
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/testsuite/policy/authorization/auth_policy.py b/testsuite/policy/authorization/auth_policy.py
@@ -35,7 +35,6 @@ def create_instance(
             "metadata": {"name": name, "namespace": openshift.project, "labels": labels},
             "spec": {
                 "targetRef": target.reference,
-                "rules": {},
             },
         }
 

diff --git a/testsuite/policy/authorization/sections.py b/testsuite/policy/authorization/sections.py
@@ -67,10 +67,18 @@ def section(self):
         """The actual dict section which will be edited"""
         return self.obj.auth_section.setdefault(self.section_name, {})
 
-    def add_item(self, name: str, value: dict, **common_features):
+    def add_item(self, name: str, value: dict, *, defaults: bool = False, overrides: bool = False, **common_features):
         """Adds item to the section"""
         add_common_features(value, **common_features)
-        self.section.update({name: value})
+
+        if defaults:
+            section = self.obj.model.spec.setdefault("defaults", {}).setdefault("rules", {})
+        elif overrides:
+            section = self.obj.model.spec.setdefault("overrides", {}).setdefault("rules", {})
+        else:
+            section = self.obj.auth_section
+
+        section.setdefault(self.section_name, {}).update({name: value})
 
     @modify
     def clear_all(self):

diff --git a/testsuite/policy/rate_limit_policy.py b/testsuite/policy/rate_limit_policy.py
@@ -52,7 +52,6 @@ def create_instance(cls, openshift: OpenShiftClient, name, target: Referencable,
             "metadata": {"name": name, "labels": labels},
             "spec": {
                 "targetRef": target.reference,
-                "limits": {},
             },
         }
 
@@ -66,6 +65,8 @@ def add_limit(
         when: Iterable[Rule] = None,
         counters: list[str] = None,
         route_selectors: Iterable[RouteSelector] = None,
+        defaults: bool = False,
+        overrides: bool = False,
     ):
         """Add another limit"""
         limit: dict = {
@@ -77,7 +78,15 @@ def add_limit(
             limit["counters"] = counters
         if route_selectors:
             limit["routeSelectors"] = [asdict(rule) for rule in route_selectors]
-        self.model.spec.limits[name] = limit
+
+        if defaults:
+            section = self.model.spec.setdefault("defaults", {})
+        elif overrides:
+            section = self.model.spec.setdefault("overrides", {})
+        else:
+            section = self.model.spec
+
+        section.setdefault("limits", {})[name] = limit
 
     def wait_for_ready(self):
         """Wait for RLP to be enforced"""