Refactored other tests to use configure

Author: lsierant

docker/mongodb-kubernetes-tests/kubetester/automation_config_tester.py

@@ -13,9 +13,9 @@ class AutomationConfigTester:
     users in MongoDB to be the ones defined in the Automation Config.
     """
 
-    def __init__(self, ac: Optional[Dict] = None):
+    def __init__(self, ac: Optional[Dict] = None, group_name: Optional[str] = None):
         if ac is None:
-            ac = KubernetesTester.get_automation_config()
+            ac = KubernetesTester.get_automation_config(group_name=group_name)
         self.automation_config = ac
 
     def get_replica_set_processes(self, rs_name: str) -> List[Dict]:

docker/mongodb-kubernetes-tests/tests/authentication/mongodb_custom_roles.py

@@ -1,13 +1,11 @@
 from kubetester import (
     find_fixture,
-    random_k8s_name,
     try_load,
     wait_until,
 )
 from kubetester.mongodb import MongoDB, Phase
 from kubetester.mongodb_multi import MongoDBMulti
 from kubetester.mongodb_role import ClusterMongoDBRole, ClusterMongoDBRoleKind
-from kubetester.test_identifiers import set_test_identifier
 from pytest import fixture, mark
 from tests.multicluster.conftest import cluster_spec_list
 

docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_up_cluster.py

@@ -1,14 +1,9 @@
-from operator import truediv
-from typing import List
+from typing import List
 
 import kubernetes
 import pytest
 from kubetester import (
-    create_or_update_configmap,
-    random_k8s_name,
-    read_configmap,
     try_load,
-    wait_until,
 )
 from kubetester.automation_config_tester import AutomationConfigTester
 from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs
@@ -24,26 +19,7 @@
 
 RESOURCE_NAME = "multi-replica-set"
 BUNDLE_SECRET_NAME = f"prefix-{RESOURCE_NAME}-cert"
-
-
-@pytest.fixture(scope="module")
-def project_name_prefix(namespace: str) -> str:
-    return random_k8s_name(f"{namespace}-project-")
-
-
-@pytest.fixture(scope="module")
-def new_project_configmap(namespace: str, project_name_prefix: str) -> str:
-    cm = read_configmap(namespace=namespace, name="my-project")
-    project_name = f"{project_name_prefix}-new-project"
-    return create_or_update_configmap(
-        namespace=namespace,
-        name=project_name,
-        data={
-            "baseUrl": cm["baseUrl"],
-            "projectName": project_name,
-            "orgId": cm["orgId"],
-        },
-    )
+PROJECT_NAME = f"{RESOURCE_NAME}-multi"
 
 
 @pytest.fixture(scope="module")
@@ -55,6 +31,7 @@ def mongodb_multi_unmarshalled(
     custom_mdb_version: str,
 ) -> MongoDBMulti:
     resource = MongoDBMulti.from_yaml(yaml_fixture("mongodb-multi.yaml"), RESOURCE_NAME, namespace)
+    resource.configure(None, PROJECT_NAME)
     resource.set_version(custom_mdb_version)
     # ensure certs are created for the members during scale up
     resource["spec"]["clusterSpecList"] = cluster_spec_list(member_cluster_names, [3, 1, 2])
@@ -179,15 +156,19 @@ def test_scale_up_first_cluster(
         mongodb_multi.assert_reaches_phase(Phase.Running, timeout=600)
 
     def test_change_project(self, mongodb_multi: MongoDBMulti, new_project_configmap: str):
-        oldRsMembers = mongodb_multi.get_automation_config_tester().get_replica_set_members(mongodb_multi.name)
-
-        mongodb_multi["spec"]["opsManager"]["configMapRef"]["name"] = new_project_configmap
+        new_project_name = f"{mongodb_multi.name}-new-project"
+        old_rs_members = mongodb_multi.get_automation_config_tester(group_name=PROJECT_NAME).get_replica_set_members(
+            mongodb_multi.name
+        )
+        mongodb_multi.configure(None, new_project_name)
         mongodb_multi.update()
 
         mongodb_multi.assert_abandons_phase(phase=Phase.Running, timeout=300)
         mongodb_multi.assert_reaches_phase(phase=Phase.Running, timeout=600)
 
-        newRsMembers = mongodb_multi.get_automation_config_tester().get_replica_set_members(mongodb_multi.name)
+        new_rs_members = mongodb_multi.get_automation_config_tester(
+            group_name=new_project_name
+        ).get_replica_set_members(mongodb_multi.name)
 
         # Assert that the replica set member ids have not changed after changing the project.
-        assert oldRsMembers == newRsMembers
+        assert old_rs_members == new_rs_members

docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_snippets.py

@@ -47,7 +47,7 @@ def get_sharded_resources(namespace: str) -> List[MongoDB]:
         # We set the resource name as the file name, but replace _ with - and lowercase,
         # to respect kubernetes naming constraints
         sc = load_resource(namespace, file_path)
-        sc["spec"]["opsManager"]["configMapRef"]["name"] = f"{file_to_resource_name(file_name)}-project-map"
+        sc.configure(None, f"{file_to_resource_name(file_name)}")
         resources.append(sc)
     return resources
 

docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_agent_flags.py

@@ -21,56 +21,21 @@
 
 
 @fixture(scope="module")
-def project_name_prefix(namespace: str) -> str:
-    return random_k8s_name(f"{namespace}-project")
-
-
-@fixture(scope="module")
-def first_project(namespace: str, project_name_prefix: str) -> str:
-    cm = read_configmap(namespace=namespace, name="my-project")
-    project_name = f"{project_name_prefix}-first"
-    return create_or_update_configmap(
-        namespace=namespace,
-        name=project_name,
-        data={
-            "baseUrl": cm["baseUrl"],
-            "projectName": project_name,
-            "orgId": cm["orgId"],
-        },
-    )
-
-
-@fixture(scope="module")
-def second_project(namespace: str, project_name_prefix: str) -> str:
-    cm = read_configmap(namespace=namespace, name="my-project")
-    project_name = project_name_prefix
-    return create_or_update_configmap(
-        namespace=namespace,
-        name=project_name,
-        data={
-            "baseUrl": cm["baseUrl"],
-            "projectName": project_name,
-            "orgId": cm["orgId"],
-        },
-    )
-
-
-@fixture(scope="module")
-def replica_set(namespace: str, first_project: str, custom_mdb_version: str) -> MongoDB:
+def replica_set(namespace: str, custom_mdb_version: str) -> MongoDB:
     resource = MongoDB.from_yaml(find_fixture("replica-set-basic.yaml"), namespace=namespace, name="replica-set")
+    resource.configure(None, f"{resource.name}-first")
     resource.set_version(ensure_ent_version(custom_mdb_version))
     resource.set_architecture_annotation()
-    resource["spec"]["opsManager"]["configMapRef"]["name"] = first_project
 
     resource.update()
     return resource
 
 
 @fixture(scope="module")
-def second_replica_set(namespace: str, second_project: str, custom_mdb_version: str) -> MongoDB:
+def second_replica_set(namespace: str, custom_mdb_version: str) -> MongoDB:
     resource = MongoDB.from_yaml(find_fixture("replica-set-basic.yaml"), namespace=namespace, name="replica-set-2")
+    resource.configure(None, f"{resource.name}-second")
     resource.set_version(ensure_ent_version(custom_mdb_version))
-    resource["spec"]["opsManager"]["configMapRef"]["name"] = second_project
 
     resource.update()
     return resource