Rename read_crds to read_custom_resource (#1519)

nginxinc · Apr 8, 2021 · c2d5371 · c2d5371
1 parent 35dd67b
commit c2d5371
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 49 deletions.
diff --git a/tests/suite/custom_resources_utils.py b/tests/suite/custom_resources_utils.py
@@ -65,7 +65,7 @@ def delete_crd(api_extensions_v1_beta1: ApiextensionsV1beta1Api, name) -> None:
     print(f"CRD was removed with name '{name}'")
 
 
-def read_crd(custom_objects: CustomObjectsApi, namespace, plural, name) -> object:
+def read_custom_resource(custom_objects: CustomObjectsApi, namespace, plural, name) -> object:
     """
     Get CRD information (kubectl describe output)
 

diff --git a/tests/suite/test_ac_policies.py b/tests/suite/test_ac_policies.py
@@ -2,7 +2,7 @@
 from kubernetes.client.rest import ApiException
 from suite.resources_utils import wait_before_test, replace_configmap_from_yaml
 from suite.custom_resources_utils import (
-    read_crd,
+    read_custom_resource,
     delete_virtual_server,
     create_virtual_server_from_yaml,
     patch_virtual_server_from_yaml,
@@ -122,7 +122,7 @@ def test_deny_policy(
         )
         wait_before_test()
 
-        policy_info = read_crd(kube_apis.custom_objects, test_namespace, "policies", pol_name)
+        policy_info = read_custom_resource(kube_apis.custom_objects, test_namespace, "policies", pol_name)
         print(f"\nUse IP listed in deny block: 10.0.0.1")
         resp1 = requests.get(
             virtual_server_setup.backend_1_url,
@@ -183,7 +183,7 @@ def test_allow_policy(
         )
         wait_before_test()
 
-        policy_info = read_crd(kube_apis.custom_objects, test_namespace, "policies", pol_name)
+        policy_info = read_custom_resource(kube_apis.custom_objects, test_namespace, "policies", pol_name)
         print(f"\nUse IP listed in allow block: 10.0.0.1")
         resp1 = requests.get(
             virtual_server_setup.backend_1_url,
@@ -300,13 +300,13 @@ def test_invalid_policy(
         )
         print(f"Response: {resp.status_code}\n{resp.text}")
 
-        vs_info = read_crd(
+        vs_info = read_custom_resource(
             kube_apis.custom_objects,
             virtual_server_setup.namespace,
             "virtualservers",
             virtual_server_setup.vs_name,
         )
-        policy_info = read_crd(
+        policy_info = read_custom_resource(
             kube_apis.custom_objects, test_namespace, "policies", invalid_pol_name
         )
         delete_policy(kube_apis.custom_objects, invalid_pol_name, test_namespace)
@@ -353,7 +353,7 @@ def test_deleted_policy(
         )
 
         wait_before_test()
-        vs_info = read_crd(
+        vs_info = read_custom_resource(
             kube_apis.custom_objects,
             virtual_server_setup.namespace,
             "virtualservers",
@@ -369,7 +369,7 @@ def test_deleted_policy(
         )
         print(f"Response: {resp.status_code}\n{resp.text}")
 
-        vs_info = read_crd(
+        vs_info = read_custom_resource(
             kube_apis.custom_objects,
             virtual_server_setup.namespace,
             "virtualservers",

diff --git a/tests/suite/test_ac_policies_vsr.py b/tests/suite/test_ac_policies_vsr.py
@@ -2,7 +2,7 @@
 from kubernetes.client.rest import ApiException
 from suite.resources_utils import wait_before_test, replace_configmap_from_yaml
 from suite.custom_resources_utils import (
-    read_crd,
+    read_custom_resource,
     delete_virtual_server,
     create_virtual_server_from_yaml,
     patch_virtual_server_from_yaml,
@@ -123,7 +123,7 @@ def test_deny_policy_vsr(
             v_s_route_setup.route_m.namespace,
         )
         wait_before_test()
-        policy_info = read_crd(
+        policy_info = read_custom_resource(
             kube_apis.custom_objects, v_s_route_setup.route_m.namespace, "policies", pol_name
         )
 
@@ -185,7 +185,7 @@ def test_allow_policy_vsr(
             v_s_route_setup.route_m.namespace,
         )
         wait_before_test()
-        policy_info = read_crd(
+        policy_info = read_custom_resource(
             kube_apis.custom_objects, v_s_route_setup.route_m.namespace, "policies", pol_name
         )
 
@@ -306,7 +306,7 @@ def test_invalid_policy_vsr(
             v_s_route_setup.route_m.namespace,
         )
         wait_before_test()
-        policy_info = read_crd(
+        policy_info = read_custom_resource(
             kube_apis.custom_objects, v_s_route_setup.route_m.namespace, "policies", pol_name
         )
 
@@ -316,7 +316,7 @@ def test_invalid_policy_vsr(
             headers={"host": v_s_route_setup.vs_host, "X-Real-IP": "10.0.0.1"},
         )
         print(f"Response: {resp.status_code}\n{resp.text}")
-        vsr_info = read_crd(
+        vsr_info = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",

diff --git a/tests/suite/test_jwt_policies.py b/tests/suite/test_jwt_policies.py
@@ -8,7 +8,7 @@
     replace_secret,
 )
 from suite.custom_resources_utils import (
-    read_crd,
+    read_custom_resource,
     delete_virtual_server,
     create_virtual_server_from_yaml,
     delete_and_create_vs_from_yaml,
@@ -181,7 +181,7 @@ def test_jwt_policy_secret(
         resp = requests.get(virtual_server_setup.backend_1_url, headers=headers)
         print(resp.status_code)
 
-        crd_info = read_crd(
+        crd_info = read_custom_resource(
             kube_apis.custom_objects,
             virtual_server_setup.namespace,
             "virtualservers",
@@ -226,7 +226,7 @@ def test_jwt_policy(
         )
 
         print(f"Patch vs with policy: {policy}")
-        policy_info = read_crd(kube_apis.custom_objects, test_namespace, "policies", pol_name)
+        policy_info = read_custom_resource(kube_apis.custom_objects, test_namespace, "policies", pol_name)
         if policy == jwt_pol_valid_src:
             vs_src = jwt_vs_single_src
             assert (
@@ -253,7 +253,7 @@ def test_jwt_policy(
         wait_before_test()
         resp = requests.get(virtual_server_setup.backend_1_url, headers=headers)
         print(resp.status_code)
-        crd_info = read_crd(
+        crd_info = read_custom_resource(
             kube_apis.custom_objects,
             virtual_server_setup.namespace,
             "virtualservers",

diff --git a/tests/suite/test_jwt_policies_vsr.py b/tests/suite/test_jwt_policies_vsr.py
@@ -8,7 +8,7 @@
     replace_secret,
 )
 from suite.custom_resources_utils import (
-    read_crd,
+    read_custom_resource,
     delete_virtual_server,
     patch_virtual_server_from_yaml,
     patch_v_s_route_from_yaml,
@@ -208,7 +208,7 @@ def test_jwt_policy_secret(
         resp = requests.get(f"{req_url}{v_s_route_setup.route_m.paths[0]}", headers=headers,)
         print(resp.status_code)
 
-        crd_info = read_crd(
+        crd_info = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",
@@ -277,10 +277,10 @@ def test_jwt_policy(
 
         resp = requests.get(f"{req_url}{v_s_route_setup.route_m.paths[0]}", headers=headers,)
         print(resp.status_code)
-        policy_info = read_crd(
+        policy_info = read_custom_resource(
             kube_apis.custom_objects, v_s_route_setup.route_m.namespace, "policies", pol_name
         )
-        crd_info = read_crd(
+        crd_info = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",
@@ -353,7 +353,7 @@ def test_jwt_policy_delete_secret(
         delete_secret(kube_apis.v1, secret, v_s_route_setup.route_m.namespace)
         resp2 = requests.get(f"{req_url}{v_s_route_setup.route_m.paths[0]}", headers=headers,)
         print(resp2.status_code)
-        crd_info = read_crd(
+        crd_info = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",
@@ -413,7 +413,7 @@ def test_jwt_policy_delete_policy(
 
         resp2 = requests.get(f"{req_url}{v_s_route_setup.route_m.paths[0]}", headers=headers,)
         print(resp2.status_code)
-        crd_info = read_crd(
+        crd_info = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",
@@ -472,7 +472,7 @@ def test_jwt_policy_override(
         resp = requests.get(f"{req_url}{v_s_route_setup.route_m.paths[0]}", headers=headers,)
         print(resp.status_code)
 
-        crd_info = read_crd(
+        crd_info = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",

diff --git a/tests/suite/test_rl_policies.py b/tests/suite/test_rl_policies.py
@@ -2,7 +2,7 @@
 from kubernetes.client.rest import ApiException
 from suite.resources_utils import wait_before_test, replace_configmap_from_yaml
 from suite.custom_resources_utils import (
-    read_crd,
+    read_custom_resource,
     delete_virtual_server,
     create_virtual_server_from_yaml,
     patch_virtual_server_from_yaml,
@@ -76,7 +76,7 @@ def test_rl_policy_1rs(
         )
 
         wait_before_test()
-        policy_info = read_crd(kube_apis.custom_objects, test_namespace, "policies", pol_name)
+        policy_info = read_custom_resource(kube_apis.custom_objects, test_namespace, "policies", pol_name)
         occur = []
         t_end = time.perf_counter() + 1
         resp = requests.get(
@@ -117,7 +117,7 @@ def test_rl_policy_10rs(
         )
 
         wait_before_test()
-        policy_info = read_crd(kube_apis.custom_objects, test_namespace, "policies", pol_name)
+        policy_info = read_custom_resource(kube_apis.custom_objects, test_namespace, "policies", pol_name)
         occur = []
         t_end = time.perf_counter() + 1
         resp = requests.get(
@@ -158,7 +158,7 @@ def test_rl_policy_invalid(
         )
 
         wait_before_test()
-        policy_info = read_crd(
+        policy_info = read_custom_resource(
             kube_apis.custom_objects, test_namespace, "policies", invalid_pol_name
         )
         resp = requests.get(

diff --git a/tests/suite/test_rl_policies_vsr.py b/tests/suite/test_rl_policies_vsr.py
@@ -2,7 +2,7 @@
 from kubernetes.client.rest import ApiException
 from suite.resources_utils import wait_before_test, replace_configmap_from_yaml
 from suite.custom_resources_utils import (
-    read_crd,
+    read_custom_resource,
     delete_virtual_server,
     create_virtual_server_from_yaml,
     patch_virtual_server_from_yaml,
@@ -94,7 +94,7 @@ def test_rl_policy_1rs_vsr(
         )
 
         wait_before_test()
-        policy_info = read_crd(
+        policy_info = read_custom_resource(
             kube_apis.custom_objects, v_s_route_setup.route_m.namespace, "policies", pol_name
         )
         occur = []
@@ -148,7 +148,7 @@ def test_rl_policy_10rs_vsr(
         )
 
         wait_before_test()
-        policy_info = read_crd(
+        policy_info = read_custom_resource(
             kube_apis.custom_objects, v_s_route_setup.route_m.namespace, "policies", pol_name
         )
         occur = []
@@ -292,7 +292,7 @@ def test_rl_policy_invalid_vsr(
         )
 
         wait_before_test()
-        policy_info = read_crd(
+        policy_info = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "policies",

diff --git a/tests/suite/test_v_s_route_rewrites.py b/tests/suite/test_v_s_route_rewrites.py
@@ -3,7 +3,7 @@
 from kubernetes.client.rest import ApiException
 from suite.resources_utils import wait_before_test
 from suite.custom_resources_utils import (
-    read_crd,
+    read_custom_resource,
     patch_virtual_server_from_yaml,
     patch_v_s_route_from_yaml,
     delete_virtual_server,

diff --git a/tests/suite/test_v_s_route_status.py b/tests/suite/test_v_s_route_status.py
@@ -2,7 +2,7 @@
 from kubernetes.client.rest import ApiException
 from suite.resources_utils import wait_before_test
 from suite.custom_resources_utils import (
-    read_crd,
+    read_custom_resource,
     patch_virtual_server_from_yaml,
     patch_v_s_route_from_yaml,
     delete_virtual_server,
@@ -60,13 +60,13 @@ def test_status_valid(
         """
         Test VirtualServerRoute status with a valid fields in yaml
         """
-        response_m = read_crd(
+        response_m = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",
             v_s_route_setup.route_m.name,
         )
-        response_s = read_crd(
+        response_s = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_s.namespace,
             "virtualserverroutes",
@@ -109,13 +109,13 @@ def test_status_invalid(
         )
         wait_before_test()
 
-        response_m = read_crd(
+        response_m = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",
             v_s_route_setup.route_m.name,
         )
-        response_s = read_crd(
+        response_s = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_s.namespace,
             "virtualserverroutes",
@@ -161,13 +161,13 @@ def test_status_invalid_prefix(
         )
         wait_before_test()
 
-        response_m = read_crd(
+        response_m = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",
             v_s_route_setup.route_m.name,
         )
-        response_s = read_crd(
+        response_s = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_s.namespace,
             "virtualserverroutes",
@@ -202,13 +202,13 @@ def test_status_invalid_vsr_in_vs(
         )
         wait_before_test()
 
-        response_m = read_crd(
+        response_m = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",
             v_s_route_setup.route_m.name,
         )
-        response_s = read_crd(
+        response_s = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_s.namespace,
             "virtualserverroutes",
@@ -239,13 +239,13 @@ def test_status_remove_vs(
             kube_apis.custom_objects, v_s_route_setup.vs_name, v_s_route_setup.namespace,
         )
 
-        response_m = read_crd(
+        response_m = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_m.namespace,
             "virtualserverroutes",
             v_s_route_setup.route_m.name,
         )
-        response_s = read_crd(
+        response_s = read_custom_resource(
             kube_apis.custom_objects,
             v_s_route_setup.route_s.namespace,
             "virtualserverroutes",

diff --git a/tests/suite/test_virtual_server_rewrites.py b/tests/suite/test_virtual_server_rewrites.py
@@ -3,7 +3,7 @@
 from kubernetes.client.rest import ApiException
 from suite.resources_utils import wait_before_test
 from suite.custom_resources_utils import (
-    read_crd,
+    read_custom_resource,
     patch_virtual_server_from_yaml,
 )
 from settings import TEST_DATA