diff --git a/docker/mongodb-kubernetes-tests/kubetester/__init__.py b/docker/mongodb-kubernetes-tests/kubetester/__init__.py index 9a7c2ec63..b14a8d68c 100644 --- a/docker/mongodb-kubernetes-tests/kubetester/__init__.py +++ b/docker/mongodb-kubernetes-tests/kubetester/__init__.py @@ -11,8 +11,6 @@ # Re-exports from .kubetester import fixture as find_fixture -from .mongodb import MongoDB -from .mongodb_community import MongoDBCommunity from .security_context import ( assert_pod_container_security_context, assert_pod_security_context, diff --git a/docker/mongodb-kubernetes-tests/kubetester/certs.py b/docker/mongodb-kubernetes-tests/kubetester/certs.py index a8599977f..1f567aff4 100644 --- a/docker/mongodb-kubernetes-tests/kubetester/certs.py +++ b/docker/mongodb-kubernetes-tests/kubetester/certs.py @@ -21,8 +21,7 @@ read_secret, ) from kubetester.kubetester import KubernetesTester -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.phase import Phase from opentelemetry import trace from tests import test_logger from tests.vaultintegration import ( @@ -379,169 +378,6 @@ def multi_cluster_external_service_fqdns( return service_fqdns -def create_multi_cluster_tls_certs( - multi_cluster_issuer: str, - secret_name: str, - central_cluster_client: kubernetes.client.ApiClient, - member_clients: List[MultiClusterClient], - mongodb_multi: Optional[MongoDBMulti] = None, - namespace: Optional[str] = None, - secret_backend: Optional[str] = None, - additional_domains: Optional[List[str]] = None, - service_fqdns: Optional[List[str]] = None, - clusterwide: bool = False, - spec: Optional[dict] = None, -) -> str: - if service_fqdns is None: - service_fqdns = [f"{mongodb_multi.name}-svc.{mongodb_multi.namespace}.svc.cluster.local"] - - for client in member_clients: - cluster_spec = mongodb_multi.get_item_spec(client.cluster_name) - try: - external_domain = cluster_spec["externalAccess"]["externalDomain"] - except KeyError: - external_domain = None - service_fqdns.extend( - multi_cluster_service_fqdns( - mongodb_multi.name, - mongodb_multi.namespace, - external_domain, - client.cluster_index, - cluster_spec["members"], - ) - ) - - if namespace is None: - namespace = mongodb_multi.namespace - - generate_cert( - namespace=namespace, - pod="tmp", - dns="", - issuer=multi_cluster_issuer, - additional_domains=additional_domains, - multi_cluster_mode=True, - api_client=central_cluster_client, - secret_backend=secret_backend, - secret_name=secret_name, - vault_subpath="database", - dns_list=service_fqdns, - spec=spec, - clusterwide=clusterwide, - ) - - return secret_name - - -def create_multi_cluster_agent_certs( - multi_cluster_issuer: str, - secret_name: str, - central_cluster_client: kubernetes.client.ApiClient, - mongodb_multi: MongoDBMulti, - secret_backend: Optional[str] = None, -) -> str: - agents = ["mms-automation-agent"] - subject = copy.deepcopy(SUBJECT) - subject["organizationalUnits"] = [mongodb_multi.namespace] - - spec = { - "subject": subject, - "usages": ["client auth"], - } - spec["dnsNames"] = agents - spec["commonName"] = "mms-automation-agent" - return generate_cert( - namespace=mongodb_multi.namespace, - pod="tmp", - dns="", - issuer=multi_cluster_issuer, - spec=spec, - multi_cluster_mode=True, - api_client=central_cluster_client, - secret_backend=secret_backend, - secret_name=secret_name, - vault_subpath="database", - ) - - -def create_multi_cluster_x509_agent_certs( - multi_cluster_issuer: str, - secret_name: str, - central_cluster_client: kubernetes.client.ApiClient, - mongodb_multi: MongoDBMulti, - secret_backend: Optional[str] = None, -) -> str: - spec = get_agent_x509_subject(mongodb_multi.namespace) - - return generate_cert( - namespace=mongodb_multi.namespace, - pod="tmp", - dns="", - issuer=multi_cluster_issuer, - spec=spec, - multi_cluster_mode=True, - api_client=central_cluster_client, - secret_backend=secret_backend, - secret_name=secret_name, - vault_subpath="database", - ) - - -def create_multi_cluster_mongodb_tls_certs( - multi_cluster_issuer: str, - bundle_secret_name: str, - member_cluster_clients: List[MultiClusterClient], - central_cluster_client: kubernetes.client.ApiClient, - mongodb_multi: Optional[MongoDBMulti] = None, - namespace: Optional[str] = None, - additional_domains: Optional[List[str]] = None, - service_fqdns: Optional[List[str]] = None, - clusterwide: bool = False, -) -> str: - # create the "source-of-truth" tls cert in central cluster - create_multi_cluster_tls_certs( - multi_cluster_issuer=multi_cluster_issuer, - central_cluster_client=central_cluster_client, - member_clients=member_cluster_clients, - secret_name=bundle_secret_name, - mongodb_multi=mongodb_multi, - namespace=namespace, - additional_domains=additional_domains, - service_fqdns=service_fqdns, - clusterwide=clusterwide, - ) - - return bundle_secret_name - - -def create_multi_cluster_mongodb_x509_tls_certs( - multi_cluster_issuer: str, - bundle_secret_name: str, - member_cluster_clients: List[MultiClusterClient], - central_cluster_client: kubernetes.client.ApiClient, - mongodb_multi: MongoDBMulti, - additional_domains: Optional[List[str]] = None, - service_fqdns: Optional[List[str]] = None, - clusterwide: bool = False, -) -> str: - spec = get_mongodb_x509_subject(mongodb_multi.namespace) - - # create the "source-of-truth" tls cert in central cluster - create_multi_cluster_tls_certs( - multi_cluster_issuer=multi_cluster_issuer, - central_cluster_client=central_cluster_client, - member_clients=member_cluster_clients, - secret_name=bundle_secret_name, - mongodb_multi=mongodb_multi, - additional_domains=additional_domains, - service_fqdns=service_fqdns, - clusterwide=clusterwide, - spec=spec, - ) - - return bundle_secret_name - - def create_x509_mongodb_tls_certs( issuer: str, namespace: str, diff --git a/docker/mongodb-kubernetes-tests/kubetester/certs_mongodb_multi.py b/docker/mongodb-kubernetes-tests/kubetester/certs_mongodb_multi.py new file mode 100644 index 000000000..ac1f6dac1 --- /dev/null +++ b/docker/mongodb-kubernetes-tests/kubetester/certs_mongodb_multi.py @@ -0,0 +1,177 @@ +import copy +from typing import List, Optional + +import kubernetes +from kubeobject import CustomObject +from kubetester.certs import ( + SUBJECT, + generate_cert, + get_agent_x509_subject, + get_mongodb_x509_subject, + multi_cluster_service_fqdns, +) +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient + + +def create_multi_cluster_agent_certs( + multi_cluster_issuer: str, + secret_name: str, + central_cluster_client: kubernetes.client.ApiClient, + mongodb_multi: MongoDBMulti, + secret_backend: Optional[str] = None, +) -> str: + agents = ["mms-automation-agent"] + subject = copy.deepcopy(SUBJECT) + subject["organizationalUnits"] = [mongodb_multi.namespace] + + spec = { + "subject": subject, + "usages": ["client auth"], + } + spec["dnsNames"] = agents + spec["commonName"] = "mms-automation-agent" + return generate_cert( + namespace=mongodb_multi.namespace, + pod="tmp", + dns="", + issuer=multi_cluster_issuer, + spec=spec, + multi_cluster_mode=True, + api_client=central_cluster_client, + secret_backend=secret_backend, + secret_name=secret_name, + vault_subpath="database", + ) + + +def create_multi_cluster_x509_agent_certs( + multi_cluster_issuer: str, + secret_name: str, + central_cluster_client: kubernetes.client.ApiClient, + mongodb_multi: MongoDBMulti, + secret_backend: Optional[str] = None, +) -> str: + spec = get_agent_x509_subject(mongodb_multi.namespace) + + return generate_cert( + namespace=mongodb_multi.namespace, + pod="tmp", + dns="", + issuer=multi_cluster_issuer, + spec=spec, + multi_cluster_mode=True, + api_client=central_cluster_client, + secret_backend=secret_backend, + secret_name=secret_name, + vault_subpath="database", + ) + + +def create_multi_cluster_mongodb_tls_certs( + multi_cluster_issuer: str, + bundle_secret_name: str, + member_cluster_clients: List[MultiClusterClient], + central_cluster_client: kubernetes.client.ApiClient, + mongodb_multi: Optional[MongoDBMulti] = None, + namespace: Optional[str] = None, + additional_domains: Optional[List[str]] = None, + service_fqdns: Optional[List[str]] = None, + clusterwide: bool = False, +) -> str: + # create the "source-of-truth" tls cert in central cluster + create_multi_cluster_tls_certs( + multi_cluster_issuer=multi_cluster_issuer, + central_cluster_client=central_cluster_client, + member_clients=member_cluster_clients, + secret_name=bundle_secret_name, + mongodb_multi=mongodb_multi, + namespace=namespace, + additional_domains=additional_domains, + service_fqdns=service_fqdns, + clusterwide=clusterwide, + ) + + return bundle_secret_name + + +def create_multi_cluster_mongodb_x509_tls_certs( + multi_cluster_issuer: str, + bundle_secret_name: str, + member_cluster_clients: List[MultiClusterClient], + central_cluster_client: kubernetes.client.ApiClient, + mongodb_multi: MongoDBMulti, + additional_domains: Optional[List[str]] = None, + service_fqdns: Optional[List[str]] = None, + clusterwide: bool = False, +) -> str: + spec = get_mongodb_x509_subject(mongodb_multi.namespace) + + # create the "source-of-truth" tls cert in central cluster + create_multi_cluster_tls_certs( + multi_cluster_issuer=multi_cluster_issuer, + central_cluster_client=central_cluster_client, + member_clients=member_cluster_clients, + secret_name=bundle_secret_name, + mongodb_multi=mongodb_multi, + additional_domains=additional_domains, + service_fqdns=service_fqdns, + clusterwide=clusterwide, + spec=spec, + ) + + return bundle_secret_name + + +def create_multi_cluster_tls_certs( + multi_cluster_issuer: str, + secret_name: str, + central_cluster_client: kubernetes.client.ApiClient, + member_clients: List[MultiClusterClient], + mongodb_multi: Optional[CustomObject] = None, + namespace: Optional[str] = None, + secret_backend: Optional[str] = None, + additional_domains: Optional[List[str]] = None, + service_fqdns: Optional[List[str]] = None, + clusterwide: bool = False, + spec: Optional[dict] = None, +) -> str: + if service_fqdns is None: + service_fqdns = [f"{mongodb_multi.name}-svc.{mongodb_multi.namespace}.svc.cluster.local"] + + for client in member_clients: + cluster_spec = mongodb_multi.get_item_spec(client.cluster_name) + try: + external_domain = cluster_spec["externalAccess"]["externalDomain"] + except KeyError: + external_domain = None + service_fqdns.extend( + multi_cluster_service_fqdns( + mongodb_multi.name, + mongodb_multi.namespace, + external_domain, + client.cluster_index, + cluster_spec["members"], + ) + ) + + if namespace is None: + namespace = mongodb_multi.namespace + + generate_cert( + namespace=namespace, + pod="tmp", + dns="", + issuer=multi_cluster_issuer, + additional_domains=additional_domains, + multi_cluster_mode=True, + api_client=central_cluster_client, + secret_backend=secret_backend, + secret_name=secret_name, + vault_subpath="database", + dns_list=service_fqdns, + spec=spec, + clusterwide=clusterwide, + ) + + return secret_name diff --git a/docker/mongodb-kubernetes-tests/kubetester/mongodb.py b/docker/mongodb-kubernetes-tests/kubetester/mongodb.py index 8febe799a..2521d63f6 100644 --- a/docker/mongodb-kubernetes-tests/kubetester/mongodb.py +++ b/docker/mongodb-kubernetes-tests/kubetester/mongodb.py @@ -4,12 +4,12 @@ import re import time import urllib.parse -from enum import Enum -from typing import Dict, List, Optional, Tuple +from typing import Dict, List, Optional import semver from kubeobject import CustomObject from kubernetes import client +from kubetester import create_or_update_configmap, read_configmap from kubetester.kubetester import ( KubernetesTester, build_host_fqdn, @@ -21,53 +21,21 @@ from opentelemetry import trace from tests import test_logger +from .mongodb_common import MongoDBCommon +from .mongodb_utils_state import in_desired_state from .mongotester import ( MongoTester, ReplicaSetTester, ShardedClusterTester, StandaloneTester, ) +from .opsmanager import MongoDBOpsManager +from .phase import Phase logger = test_logger.get_test_logger(__name__) TRACER = trace.get_tracer("evergreen-agent") -class Phase(Enum): - Running = 1 - Pending = 2 - Failed = 3 - Updated = 4 - Disabled = 5 - Unsupported = 6 - - -class MongoDBCommon: - TRACER.start_as_current_span("wait_for") - - def wait_for(self, fn, timeout=None, should_raise=True): - if timeout is None: - timeout = 600 - initial_timeout = timeout - - wait = 3 - while timeout > 0: - try: - self.reload() - except Exception as e: - print(f"Caught error: {e} while waiting for {fn.__name__}") - pass - if fn(self): - return True - timeout -= wait - time.sleep(wait) - - if should_raise: - raise Exception("Timeout ({}) reached while waiting for {}".format(initial_timeout, self)) - - def get_generation(self) -> int: - return self.backing_obj["metadata"]["generation"] - - class MongoDB(CustomObject, MongoDBCommon): def __init__(self, *args, **kwargs): with_defaults = { @@ -616,73 +584,3 @@ class Types: REPLICA_SET = "ReplicaSet" SHARDED_CLUSTER = "ShardedCluster" STANDALONE = "Standalone" - - -def get_pods(podname, qty) -> List[str]: - return [podname.format(i) for i in range(qty)] - - -TRACER.start_as_current_span("in_desired_state") - - -def in_desired_state( - current_state: Phase, - desired_state: Phase, - current_generation: int, - observed_generation: int, - current_message: str, - msg_regexp: Optional[str] = None, - ignore_errors=False, - intermediate_events: Tuple = (), -) -> bool: - """Returns true if the current_state is equal to desired state, fails fast if got into Failed error. - Optionally checks if the message matches the specified regexp expression""" - if current_state is None: - return False - - if current_generation != observed_generation: - # We shouldn't check the status further if the Operator hasn't started working on the new spec yet - return False - - if current_state == Phase.Failed and not desired_state == Phase.Failed and not ignore_errors: - found = False - for event in intermediate_events: - if event in current_message: - found = True - - if not found: - raise AssertionError(f'Got into Failed phase while waiting for Running! ("{current_message}")') - - is_in_desired_state = current_state == desired_state - if msg_regexp is not None: - print("msg_regexp: " + str(msg_regexp)) - regexp = re.compile(msg_regexp) - is_in_desired_state = is_in_desired_state and current_message is not None and regexp.match(current_message) - - return is_in_desired_state - - -def generic_replicaset( - namespace: str, - version: str, - name: Optional[str] = None, - ops_manager: Optional[MongoDBOpsManager] = None, -) -> MongoDB: - if name is None: - name = KubernetesTester.random_k8s_name("rs-") - - rs = MongoDB(namespace=namespace, name=name) - rs["spec"] = { - "members": 3, - "type": "ReplicaSet", - "persistent": False, - "version": version, - } - - if ops_manager is None: - rs["spec"]["credentials"] = "my-credentials" - rs["spec"]["opsManager"] = {"configMapRef": {"name": "my-project"}} - else: - rs.configure(ops_manager, KubernetesTester.random_k8s_name("project-")) - - return rs diff --git a/docker/mongodb-kubernetes-tests/kubetester/mongodb_common.py b/docker/mongodb-kubernetes-tests/kubetester/mongodb_common.py new file mode 100644 index 000000000..f032ed6c1 --- /dev/null +++ b/docker/mongodb-kubernetes-tests/kubetester/mongodb_common.py @@ -0,0 +1,35 @@ +from __future__ import annotations + +import time + +from opentelemetry import trace +from tests import test_logger + +logger = test_logger.get_test_logger(__name__) +TRACER = trace.get_tracer("evergreen-agent") + + +class MongoDBCommon: + @TRACER.start_as_current_span("wait_for") + def wait_for(self, fn, timeout=None, should_raise=True): + if timeout is None: + timeout = 600 + initial_timeout = timeout + + wait = 3 + while timeout > 0: + try: + self.reload() + except Exception as e: + print(f"Caught error: {e} while waiting for {fn.__name__}") + pass + if fn(self): + return True + timeout -= wait + time.sleep(wait) + + if should_raise: + raise Exception("Timeout ({}) reached while waiting for {}".format(initial_timeout, self)) + + def get_generation(self) -> int: + return self.backing_obj["metadata"]["generation"] diff --git a/docker/mongodb-kubernetes-tests/kubetester/mongodb_community.py b/docker/mongodb-kubernetes-tests/kubetester/mongodb_community.py index da51ac3ff..a819d8d78 100644 --- a/docker/mongodb-kubernetes-tests/kubetester/mongodb_community.py +++ b/docker/mongodb-kubernetes-tests/kubetester/mongodb_community.py @@ -3,7 +3,9 @@ import time from kubeobject import CustomObject -from kubetester.mongodb import MongoDB, Phase, in_desired_state +from kubetester.mongodb import MongoDB +from kubetester.mongodb_utils_state import in_desired_state +from kubetester.phase import Phase from opentelemetry import trace from tests import test_logger diff --git a/docker/mongodb-kubernetes-tests/kubetester/mongodb_multi.py b/docker/mongodb-kubernetes-tests/kubetester/mongodb_multi.py index f62882452..b35316c32 100644 --- a/docker/mongodb-kubernetes-tests/kubetester/mongodb_multi.py +++ b/docker/mongodb-kubernetes-tests/kubetester/mongodb_multi.py @@ -2,59 +2,10 @@ from typing import Dict, List, Optional -import kubernetes.client -import pytest from kubernetes import client -from kubetester import MongoDB +from kubetester.mongodb import MongoDB from kubetester.mongotester import MongoTester, MultiReplicaSetTester - - -class MultiClusterClient: - def __init__( - self, - api_client: kubernetes.client.ApiClient, - cluster_name: str, - cluster_index: Optional[int] = None, - ): - self.api_client = api_client - self.cluster_name = cluster_name - self.cluster_index = cluster_index - - def apps_v1_api(self) -> kubernetes.client.AppsV1Api: - return kubernetes.client.AppsV1Api(self.api_client) - - def core_v1_api(self) -> kubernetes.client.CoreV1Api: - return kubernetes.client.CoreV1Api(self.api_client) - - def read_namespaced_stateful_set(self, name: str, namespace: str): - return self.apps_v1_api().read_namespaced_stateful_set(name, namespace) - - def list_namespaced_stateful_sets(self, namespace: str): - return self.apps_v1_api().list_namespaced_stateful_set(namespace) - - def list_namespaced_services(self, namespace: str): - return self.core_v1_api().list_namespaced_service(namespace) - - def read_namespaced_service(self, name: str, namespace: str): - return self.core_v1_api().read_namespaced_service(name, namespace) - - def list_namespaced_config_maps(self, namespace: str): - return self.core_v1_api().list_namespaced_config_map(namespace) - - def read_namespaced_config_map(self, name: str, namespace: str): - return self.core_v1_api().read_namespaced_config_map(name, namespace) - - def read_namespaced_persistent_volume_claim(self, name: str, namespace: str): - return self.core_v1_api().read_namespaced_persistent_volume_claim(name, namespace) - - def assert_sts_members_count(self, sts_name: str, namespace: str, expected_shard_members_in_cluster: int): - try: - sts = self.read_namespaced_stateful_set(sts_name, namespace) - assert sts.spec.replicas == expected_shard_members_in_cluster - except kubernetes.client.ApiException as api_exception: - assert ( - 0 == expected_shard_members_in_cluster and api_exception.status == 404 - ), f"expected {expected_shard_members_in_cluster} members, but received {api_exception.status} exception while reading {namespace}:{sts_name}" +from kubetester.multicluster_client import MultiClusterClient class MongoDBMulti(MongoDB): diff --git a/docker/mongodb-kubernetes-tests/kubetester/mongodb_search.py b/docker/mongodb-kubernetes-tests/kubetester/mongodb_search.py index e7862d4d8..fbc451779 100644 --- a/docker/mongodb-kubernetes-tests/kubetester/mongodb_search.py +++ b/docker/mongodb-kubernetes-tests/kubetester/mongodb_search.py @@ -3,7 +3,9 @@ import time from kubeobject import CustomObject -from kubetester.mongodb import MongoDB, Phase, in_desired_state +from kubetester.mongodb import MongoDB +from kubetester.mongodb_utils_state import in_desired_state +from kubetester.phase import Phase from opentelemetry import trace from tests import test_logger diff --git a/docker/mongodb-kubernetes-tests/kubetester/mongodb_user.py b/docker/mongodb-kubernetes-tests/kubetester/mongodb_user.py index c36807031..63a98c058 100644 --- a/docker/mongodb-kubernetes-tests/kubetester/mongodb_user.py +++ b/docker/mongodb-kubernetes-tests/kubetester/mongodb_user.py @@ -5,7 +5,10 @@ from kubeobject import CustomObject from kubetester import random_k8s_name -from kubetester.mongodb import MongoDB, MongoDBCommon, Phase, in_desired_state +from kubetester.mongodb import MongoDB +from kubetester.mongodb_common import MongoDBCommon +from kubetester.mongodb_utils_state import in_desired_state +from kubetester.phase import Phase class MongoDBUser(CustomObject, MongoDBCommon): diff --git a/docker/mongodb-kubernetes-tests/kubetester/mongodb_utils_replicaset.py b/docker/mongodb-kubernetes-tests/kubetester/mongodb_utils_replicaset.py new file mode 100644 index 000000000..4e9866755 --- /dev/null +++ b/docker/mongodb-kubernetes-tests/kubetester/mongodb_utils_replicaset.py @@ -0,0 +1,33 @@ +from __future__ import annotations + +from typing import Optional + +from kubetester.kubetester import KubernetesTester +from kubetester.mongodb import MongoDB +from kubetester.opsmanager import MongoDBOpsManager + + +def generic_replicaset( + namespace: str, + version: str, + name: Optional[str] = None, + ops_manager: Optional[MongoDBOpsManager] = None, +) -> MongoDB: + if name is None: + name = KubernetesTester.random_k8s_name("rs-") + + rs = MongoDB(namespace=namespace, name=name) + rs["spec"] = { + "members": 3, + "type": "ReplicaSet", + "persistent": False, + "version": version, + } + + if ops_manager is None: + rs["spec"]["credentials"] = "my-credentials" + rs["spec"]["opsManager"] = {"configMapRef": {"name": "my-project"}} + else: + rs.configure(ops_manager, KubernetesTester.random_k8s_name("project-")) + + return rs diff --git a/docker/mongodb-kubernetes-tests/kubetester/mongodb_utils_state.py b/docker/mongodb-kubernetes-tests/kubetester/mongodb_utils_state.py new file mode 100644 index 000000000..5ee557445 --- /dev/null +++ b/docker/mongodb-kubernetes-tests/kubetester/mongodb_utils_state.py @@ -0,0 +1,47 @@ +from __future__ import annotations + +import re +from typing import Optional, Tuple + +from kubetester.phase import Phase +from opentelemetry import trace + +TRACER = trace.get_tracer("evergreen-agent") + + +@TRACER.start_as_current_span("in_desired_state") +def in_desired_state( + current_state: Phase, + desired_state: Phase, + current_generation: int, + observed_generation: int, + current_message: str, + msg_regexp: Optional[str] = None, + ignore_errors=False, + intermediate_events: Tuple = (), +) -> bool: + """Returns true if the current_state is equal to desired state, fails fast if got into Failed error. + Optionally checks if the message matches the specified regexp expression""" + if current_state is None: + return False + + if current_generation != observed_generation: + # We shouldn't check the status further if the Operator hasn't started working on the new spec yet + return False + + if current_state == Phase.Failed and not desired_state == Phase.Failed and not ignore_errors: + found = False + for event in intermediate_events: + if event in current_message: + found = True + + if not found: + raise AssertionError(f'Got into Failed phase while waiting for Running! ("{current_message}")') + + is_in_desired_state = current_state == desired_state + if msg_regexp is not None: + print("msg_regexp: " + str(msg_regexp)) + regexp = re.compile(msg_regexp) + is_in_desired_state = is_in_desired_state and current_message is not None and regexp.match(current_message) + + return is_in_desired_state diff --git a/docker/mongodb-kubernetes-tests/kubetester/multicluster_client.py b/docker/mongodb-kubernetes-tests/kubetester/multicluster_client.py new file mode 100644 index 000000000..36fc743a0 --- /dev/null +++ b/docker/mongodb-kubernetes-tests/kubetester/multicluster_client.py @@ -0,0 +1,53 @@ +from __future__ import annotations + +from typing import Optional + +import kubernetes.client + + +class MultiClusterClient: + def __init__( + self, + api_client: kubernetes.client.ApiClient, + cluster_name: str, + cluster_index: Optional[int] = None, + ): + self.api_client = api_client + self.cluster_name = cluster_name + self.cluster_index = cluster_index + + def apps_v1_api(self) -> kubernetes.client.AppsV1Api: + return kubernetes.client.AppsV1Api(self.api_client) + + def core_v1_api(self) -> kubernetes.client.CoreV1Api: + return kubernetes.client.CoreV1Api(self.api_client) + + def read_namespaced_stateful_set(self, name: str, namespace: str): + return self.apps_v1_api().read_namespaced_stateful_set(name, namespace) + + def list_namespaced_stateful_sets(self, namespace: str): + return self.apps_v1_api().list_namespaced_stateful_set(namespace) + + def list_namespaced_services(self, namespace: str): + return self.core_v1_api().list_namespaced_service(namespace) + + def read_namespaced_service(self, name: str, namespace: str): + return self.core_v1_api().read_namespaced_service(name, namespace) + + def list_namespaced_config_maps(self, namespace: str): + return self.core_v1_api().list_namespaced_config_map(namespace) + + def read_namespaced_config_map(self, name: str, namespace: str): + return self.core_v1_api().read_namespaced_config_map(name, namespace) + + def read_namespaced_persistent_volume_claim(self, name: str, namespace: str): + return self.core_v1_api().read_namespaced_persistent_volume_claim(name, namespace) + + def assert_sts_members_count(self, sts_name: str, namespace: str, expected_shard_members_in_cluster: int): + try: + sts = self.read_namespaced_stateful_set(sts_name, namespace) + assert sts.spec.replicas == expected_shard_members_in_cluster + except kubernetes.client.ApiException as api_exception: + assert ( + 0 == expected_shard_members_in_cluster and api_exception.status == 404 + ), f"expected {expected_shard_members_in_cluster} members, but received {api_exception.status} exception while reading {namespace}:{sts_name}" diff --git a/docker/mongodb-kubernetes-tests/kubetester/opsmanager.py b/docker/mongodb-kubernetes-tests/kubetester/opsmanager.py index fa27b1fe6..e413ddeee 100644 --- a/docker/mongodb-kubernetes-tests/kubetester/opsmanager.py +++ b/docker/mongodb-kubernetes-tests/kubetester/opsmanager.py @@ -20,24 +20,29 @@ from kubetester.kubetester import ( KubernetesTester, build_list_of_hosts, + get_pods, is_default_architecture_static, ) -from kubetester.mongodb import MongoDB, MongoDBCommon, Phase, get_pods, in_desired_state +from kubetester.mongodb_common import MongoDBCommon +from kubetester.mongodb_utils_state import in_desired_state from kubetester.mongotester import MongoTester, MultiReplicaSetTester, ReplicaSetTester from kubetester.omtester import OMContext, OMTester +from kubetester.phase import Phase from opentelemetry import trace from requests.auth import HTTPDigestAuth from tests import test_logger +from tests.common.multicluster.multicluster_utils import ( + multi_cluster_pod_names, + multi_cluster_service_names, +) from tests.conftest import ( LEGACY_CENTRAL_CLUSTER_NAME, get_central_cluster_client, get_member_cluster_api_client, get_member_cluster_client_map, is_member_cluster, - multi_cluster_pod_names, - multi_cluster_service_names, + read_deployment_state, ) -from tests.shardedcluster.conftest import read_deployment_state logger = test_logger.get_test_logger(__name__) TRACER = trace.get_tracer("evergreen-agent") @@ -221,7 +226,9 @@ def agent_is_showing_metrics(): timeout=timeout, ) - def get_appdb_resource(self) -> MongoDB: + def get_appdb_resource(self) -> CustomObject: + from kubetester.mongodb import MongoDB + mdb = MongoDB(name=self.app_db_name(), namespace=self.namespace) # We "artificially" add SCRAM authentication to make syntax match the normal MongoDB - # this will let the mongo_uri() method work correctly @@ -493,7 +500,9 @@ def get_appdb_indexed_cluster_spec_items(self) -> list[tuple[int, dict[str, any] if not self.is_appdb_multi_cluster(): return self.get_legacy_central_cluster(self.get_appdb_members_count()) - cluster_index_mapping = read_deployment_state(self.app_db_name(), self.namespace)["clusterMapping"] + cluster_index_mapping = read_deployment_state(self.app_db_name(), self.namespace, get_central_cluster_client())[ + "clusterMapping" + ] result = [] for cluster_spec_item in self["spec"]["applicationDatabase"].get("clusterSpecList", []): result.append( @@ -512,7 +521,9 @@ def get_om_indexed_cluster_spec_items(self) -> list[tuple[int, dict[str, str]]]: if not self.is_om_multi_cluster(): return self.get_legacy_central_cluster(self.get_total_number_of_om_replicas()) - cluster_mapping = read_deployment_state(self.name, self.namespace)["clusterMapping"] + cluster_mapping = read_deployment_state(self.name, self.namespace, get_central_cluster_client())[ + "clusterMapping" + ] result = [ ( int(cluster_mapping[cluster_spec_item["clusterName"]]), @@ -522,15 +533,6 @@ def get_om_indexed_cluster_spec_items(self) -> list[tuple[int, dict[str, str]]]: ] return sorted(result, key=lambda x: x[0]) - def read_deployment_state(self, resource_name: str) -> dict[str, Any]: - deployment_state_cm = read_configmap( - self.namespace, - f"{resource_name}-state", - get_central_cluster_client(), - ) - state = json.loads(deployment_state_cm["state"]) - return state - @staticmethod def get_legacy_central_cluster(replicas: int) -> list[tuple[int, dict[str, str]]]: return [(0, {"clusterName": LEGACY_CENTRAL_CLUSTER_NAME, "members": str(replicas)})] diff --git a/docker/mongodb-kubernetes-tests/kubetester/phase.py b/docker/mongodb-kubernetes-tests/kubetester/phase.py new file mode 100644 index 000000000..a6f7aa65e --- /dev/null +++ b/docker/mongodb-kubernetes-tests/kubetester/phase.py @@ -0,0 +1,12 @@ +from __future__ import annotations + +from enum import Enum + + +class Phase(Enum): + Running = 1 + Pending = 2 + Failed = 3 + Updated = 4 + Disabled = 5 + Unsupported = 6 diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_agent_ldap.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_agent_ldap.py index 32584f773..d37211199 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_agent_ldap.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_agent_ldap.py @@ -1,8 +1,9 @@ from kubetester import create_secret, find_fixture, try_load from kubetester.kubetester import ensure_ent_version from kubetester.ldap import LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, Role, generic_user +from kubetester.phase import Phase from pytest import fixture, mark USER_NAME = "mms-user-1" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_custom_roles.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_custom_roles.py index d1e976a21..3c0ed9e96 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_custom_roles.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_custom_roles.py @@ -1,7 +1,8 @@ from kubetester import create_secret, find_fixture from kubetester.ldap import LDAP_AUTHENTICATION_MECHANISM, LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, generic_user +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_feature_controls.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_feature_controls.py index 9e201e9d9..9bd8738a3 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_feature_controls.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_feature_controls.py @@ -1,7 +1,8 @@ import kubernetes from kubetester import try_load, wait_until from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import OPERATOR_NAME diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ignore_unkown_users.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ignore_unkown_users.py index 2ba63dbb6..83669d590 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ignore_unkown_users.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ignore_unkown_users.py @@ -1,5 +1,6 @@ from kubetester import find_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap.py index 8e2adf7a2..db38a442b 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap.py @@ -5,8 +5,9 @@ from kubetester.certs import create_mongodb_tls_certs, create_x509_user_cert from kubetester.kubetester import KubernetesTester from kubetester.ldap import LDAP_AUTHENTICATION_MECHANISM, LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, Role, generic_user +from kubetester.phase import Phase from pytest import fixture, mark USER_NAME = "mms-user-1" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_agent_client_certs.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_agent_client_certs.py index fbe511bab..57f54342d 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_agent_client_certs.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_agent_client_certs.py @@ -3,8 +3,9 @@ from kubetester import create_secret, delete_secret, find_fixture, read_secret from kubetester.certs import ISSUER_CA_NAME, create_mongodb_tls_certs, generate_cert from kubetester.ldap import LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, Role, generic_user +from kubetester.phase import Phase from pytest import fixture, mark USER_NAME = "mms-user-1" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_group_dn.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_group_dn.py index 8905d58ab..01c81aa2f 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_group_dn.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_group_dn.py @@ -1,7 +1,8 @@ from kubetester import create_secret, find_fixture from kubetester.ldap import LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, generic_user +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_group_dn_with_x509_agent.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_group_dn_with_x509_agent.py index 6ac8abd06..5be38e868 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_group_dn_with_x509_agent.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_group_dn_with_x509_agent.py @@ -11,8 +11,9 @@ create_x509_mongodb_tls_certs, ) from kubetester.ldap import LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, generic_user +from kubetester.phase import Phase from pytest import fixture, mark MDB_RESOURCE = "ldap-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_tls.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_tls.py index b592ff566..e7359205b 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_tls.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_tls.py @@ -2,8 +2,9 @@ from kubetester import create_or_update_secret, find_fixture, wait_until from kubetester.ldap import LDAP_AUTHENTICATION_MECHANISM, LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, Role, generic_user +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_user_to_dn_mapping.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_user_to_dn_mapping.py index b3163a071..3fdf2ac93 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_user_to_dn_mapping.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_ldap_user_to_dn_mapping.py @@ -1,7 +1,8 @@ from kubetester import create_secret, find_fixture from kubetester.ldap import LDAP_AUTHENTICATION_MECHANISM, LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, Role, generic_user +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_m2m_group.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_m2m_group.py index 8f87ac003..51ac95ca4 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_m2m_group.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_m2m_group.py @@ -3,8 +3,9 @@ from kubetester import find_fixture, try_load, wait_until from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester, ensure_ent_version -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ReplicaSetTester +from kubetester.phase import Phase from pytest import fixture MDB_RESOURCE = "oidc-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_m2m_user.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_m2m_user.py index 6765b2ce8..419c9d523 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_m2m_user.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_m2m_user.py @@ -3,9 +3,10 @@ from kubetester import find_fixture, try_load, wait_until from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester, ensure_ent_version -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.mongotester import ReplicaSetTester +from kubetester.phase import Phase from pytest import fixture MDB_RESOURCE = "oidc-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_workforce.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_workforce.py index a331c96aa..7200fc886 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_workforce.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_oidc_workforce.py @@ -4,9 +4,10 @@ from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.mongotester import ReplicaSetTester +from kubetester.phase import Phase from pytest import fixture MDB_RESOURCE = "oidc-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_256_connectivity.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_256_connectivity.py index 051df5c4c..32317b86d 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_256_connectivity.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_256_connectivity.py @@ -9,8 +9,9 @@ wait_until, ) from kubetester.kubetester import KubernetesTester -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser +from kubetester.phase import Phase from pytest import fixture, mark MDB_RESOURCE = "my-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_256_user_first.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_256_user_first.py index e2fd1394d..9d5e6328d 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_256_user_first.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_256_user_first.py @@ -1,8 +1,9 @@ import pytest from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser +from kubetester.phase import Phase from pytest import fixture MDB_RESOURCE = "my-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_and_x509.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_and_x509.py index cc69b878e..7c5ebb4cd 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_and_x509.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_and_x509.py @@ -9,8 +9,9 @@ ) from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ReplicaSetTester +from kubetester.phase import Phase MDB_RESOURCE = "replica-set-scram-256-and-x509" USER_NAME = "mms-user-1" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_upgrade.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_upgrade.py index 092703641..9f512b44d 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_upgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_sha_upgrade.py @@ -2,8 +2,9 @@ from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ReplicaSetTester +from kubetester.phase import Phase MDB_RESOURCE = "my-replica-set-scram" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_x509_ic_manual_certs.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_x509_ic_manual_certs.py index 8f1d57370..cf0d88d20 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_x509_ic_manual_certs.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_x509_ic_manual_certs.py @@ -1,6 +1,7 @@ from kubetester.certs import SetProperties, create_mongodb_tls_certs from kubetester.kubetester import fixture as _fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark MDB_RESOURCE = "my-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_x509_internal_cluster.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_x509_internal_cluster.py index 62b9b4b0f..aa35812b0 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_x509_internal_cluster.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_scram_x509_internal_cluster.py @@ -7,7 +7,8 @@ ) from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark MDB_RESOURCE = "my-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_update_roles_no_privileges.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_update_roles_no_privileges.py index a9f05c0c0..2453195e5 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_update_roles_no_privileges.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_update_roles_no_privileges.py @@ -1,7 +1,8 @@ from kubetester import create_secret, find_fixture, wait_until from kubetester.ldap import LDAP_AUTHENTICATION_MECHANISM, LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, generic_user +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_x509_to_scram_transition.py b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_x509_to_scram_transition.py index ea23e7cb8..f16917a47 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_x509_to_scram_transition.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/replica_set_x509_to_scram_transition.py @@ -10,9 +10,10 @@ ) from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ReplicaSetTester from kubetester.omtester import get_rs_cert_names +from kubetester.phase import Phase from pytest import fixture MDB_RESOURCE = "replica-set-x509-to-scram-256" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sha1_connectivity_tests.py b/docker/mongodb-kubernetes-tests/tests/authentication/sha1_connectivity_tests.py index d9bd2b264..dbca7b06f 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sha1_connectivity_tests.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sha1_connectivity_tests.py @@ -1,12 +1,13 @@ import kubernetes -from kubetester import MongoDB, create_or_update_secret, try_load +from kubetester import create_or_update_secret, try_load from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import run_periodically -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.mongotester import MongoTester +from kubetester.phase import Phase from pytest import fixture diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_ldap.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_ldap.py index a6bf37e30..032aebdb0 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_ldap.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_ldap.py @@ -5,9 +5,10 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.ldap import LDAPUser, OpenLDAP -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser, Role, generic_user from kubetester.mongotester import ShardedClusterTester +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_oidc_m2m_group.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_oidc_m2m_group.py index d6fa86936..01ea134b3 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_oidc_m2m_group.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_oidc_m2m_group.py @@ -4,8 +4,9 @@ from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ShardedClusterTester +from kubetester.phase import Phase from pytest import fixture MDB_RESOURCE = "oidc-sharded-cluster-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_oidc_m2m_user.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_oidc_m2m_user.py index 2a9cbbeee..c68c33220 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_oidc_m2m_user.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_oidc_m2m_user.py @@ -4,9 +4,10 @@ from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.mongotester import ShardedClusterTester +from kubetester.phase import Phase from pytest import fixture MDB_RESOURCE = "oidc-sharded-cluster-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_256_connectivity.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_256_connectivity.py index 029e91fb2..839ae095d 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_256_connectivity.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_256_connectivity.py @@ -2,8 +2,9 @@ from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ShardedClusterTester +from kubetester.phase import Phase MDB_RESOURCE = "sharded-cluster-scram-sha-256" USER_NAME = "mms-user-1" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_and_x509.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_and_x509.py index c8885aeb0..5f99c2f55 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_and_x509.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_and_x509.py @@ -10,9 +10,10 @@ ) from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.mongotester import ShardedClusterTester +from kubetester.phase import Phase MDB_RESOURCE = "sharded-cluster-tls-scram-sha-256" USER_NAME = "mms-user-1" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_upgrade.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_upgrade.py index 516bae9e5..309267205 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_upgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_sha_upgrade.py @@ -2,8 +2,9 @@ from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ShardedClusterTester +from kubetester.phase import Phase MDB_RESOURCE = "my-sharded-cluster-scram-sha-1" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_x509_ic_manual_certs.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_x509_ic_manual_certs.py index 88a6a6e64..01d3a4854 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_x509_ic_manual_certs.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_x509_ic_manual_certs.py @@ -1,6 +1,7 @@ from kubetester.certs import SetProperties, create_mongodb_tls_certs from kubetester.kubetester import fixture as _fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark MDB_RESOURCE = "sharded-cluster-scram-sha-256" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_x509_internal_cluster.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_x509_internal_cluster.py index f555073b0..0994131db 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_x509_internal_cluster.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_scram_x509_internal_cluster.py @@ -7,8 +7,9 @@ ) from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as find_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.omtester import get_sc_cert_names +from kubetester.phase import Phase from pytest import fixture, mark MDB_RESOURCE_NAME = "sharded-cluster-scram-sha-256" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_x509_internal_cluster_transition.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_x509_internal_cluster_transition.py index 957be146d..c96201830 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_x509_internal_cluster_transition.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_x509_internal_cluster_transition.py @@ -1,6 +1,7 @@ from kubetester import find_fixture from kubetester.certs import create_sharded_cluster_certs, create_x509_agent_tls_certs -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark MDB_RESOURCE_NAME = "sc-internal-cluster-auth-transition" diff --git a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_x509_to_scram_transition.py b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_x509_to_scram_transition.py index 5d3c2a2df..c6298949f 100644 --- a/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_x509_to_scram_transition.py +++ b/docker/mongodb-kubernetes-tests/tests/authentication/sharded_cluster_x509_to_scram_transition.py @@ -11,9 +11,10 @@ ) from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ShardedClusterTester from kubetester.omtester import get_sc_cert_names +from kubetester.phase import Phase from opentelemetry import trace from pytest import fixture from tests import test_logger diff --git a/docker/mongodb-kubernetes-tests/tests/clusterwideoperator/om_multiple.py b/docker/mongodb-kubernetes-tests/tests/clusterwideoperator/om_multiple.py index 8759899e7..f58910e71 100644 --- a/docker/mongodb-kubernetes-tests/tests/clusterwideoperator/om_multiple.py +++ b/docker/mongodb-kubernetes-tests/tests/clusterwideoperator/om_multiple.py @@ -6,9 +6,9 @@ from kubetester.helm import helm_template from kubetester.kubetester import create_testing_namespace from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( get_central_cluster_client, diff --git a/docker/mongodb-kubernetes-tests/tests/common/cert/__init__.py b/docker/mongodb-kubernetes-tests/tests/common/cert/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/docker/mongodb-kubernetes-tests/tests/common/cert/cert_issuer.py b/docker/mongodb-kubernetes-tests/tests/common/cert/cert_issuer.py new file mode 100644 index 000000000..9af13f02e --- /dev/null +++ b/docker/mongodb-kubernetes-tests/tests/common/cert/cert_issuer.py @@ -0,0 +1,49 @@ +from typing import List, Optional + +from kubetester.certs import create_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs +from kubetester.kubetester import is_multi_cluster +from tests.common.multicluster.multicluster_utils import multi_cluster_service_names +from tests.conftest import get_central_cluster_client, get_member_cluster_clients + + +def create_appdb_certs( + namespace: str, + issuer: str, + appdb_name: str, + cluster_index_with_members: list[tuple[int, int]] = None, + cert_prefix="appdb", + clusterwide: bool = False, + additional_domains: Optional[List[str]] = None, +) -> str: + if cluster_index_with_members is None: + cluster_index_with_members = [(0, 1), (1, 2)] + + appdb_cert_name = f"{cert_prefix}-{appdb_name}-cert" + + if is_multi_cluster(): + service_fqdns = [ + f"{svc}.{namespace}.svc.cluster.local" + for svc in multi_cluster_service_names(appdb_name, cluster_index_with_members) + ] + create_multi_cluster_mongodb_tls_certs( + issuer, + appdb_cert_name, + get_member_cluster_clients(), + get_central_cluster_client(), + service_fqdns=service_fqdns, + namespace=namespace, + clusterwide=clusterwide, + additional_domains=additional_domains, + ) + else: + create_mongodb_tls_certs( + issuer, + namespace, + appdb_name, + appdb_cert_name, + clusterwide=clusterwide, + additional_domains=additional_domains, + ) + + return cert_prefix diff --git a/docker/mongodb-kubernetes-tests/tests/common/multicluster/__init__.py b/docker/mongodb-kubernetes-tests/tests/common/multicluster/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/docker/mongodb-kubernetes-tests/tests/common/multicluster/multicluster_utils.py b/docker/mongodb-kubernetes-tests/tests/common/multicluster/multicluster_utils.py new file mode 100644 index 000000000..b50f5665b --- /dev/null +++ b/docker/mongodb-kubernetes-tests/tests/common/multicluster/multicluster_utils.py @@ -0,0 +1,12 @@ +def multi_cluster_pod_names(replica_set_name: str, cluster_index_with_members: list[tuple[int, int]]) -> list[str]: + """List of multi-cluster pod names for given replica set name and a list of member counts in member clusters.""" + result_list = [] + for cluster_index, members in cluster_index_with_members: + result_list.extend([f"{replica_set_name}-{cluster_index}-{pod_idx}" for pod_idx in range(0, members)]) + + return result_list + + +def multi_cluster_service_names(replica_set_name: str, cluster_index_with_members: list[tuple[int, int]]) -> list[str]: + """List of multi-cluster service names for given replica set name and a list of member counts in member clusters.""" + return [f"{pod_name}-svc" for pod_name in multi_cluster_pod_names(replica_set_name, cluster_index_with_members)] diff --git a/docker/mongodb-kubernetes-tests/tests/community/community_replicaset_scale.py b/docker/mongodb-kubernetes-tests/tests/community/community_replicaset_scale.py index b73982c83..f9b4f6bd2 100644 --- a/docker/mongodb-kubernetes-tests/tests/community/community_replicaset_scale.py +++ b/docker/mongodb-kubernetes-tests/tests/community/community_replicaset_scale.py @@ -1,8 +1,8 @@ from kubetester import create_or_update_secret, try_load from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.mongodb_community import MongoDBCommunity from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger diff --git a/docker/mongodb-kubernetes-tests/tests/conftest.py b/docker/mongodb-kubernetes-tests/tests/conftest.py index d9a3da265..433588c0a 100644 --- a/docker/mongodb-kubernetes-tests/tests/conftest.py +++ b/docker/mongodb-kubernetes-tests/tests/conftest.py @@ -15,22 +15,16 @@ get_deployments, get_pod_when_ready, is_pod_ready, + read_configmap, read_secret, update_configmap, ) from kubetester.awss3client import AwsS3Client -from kubetester.certs import ( - Certificate, - ClusterIssuer, - Issuer, - create_mongodb_tls_certs, - create_multi_cluster_mongodb_tls_certs, -) from kubetester.helm import helm_install_from_chart, helm_repo_add from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as _fixture from kubetester.kubetester import running_locally -from kubetester.mongodb_multi import MultiClusterClient +from kubetester.multicluster_client import MultiClusterClient from kubetester.omtester import OMContext, OMTester from kubetester.operator import Operator from opentelemetry.trace import NonRecordingSpan @@ -267,6 +261,11 @@ def intermediate_issuer(cert_manager: str, issuer: str, namespace: str) -> str: This fixture creates an intermediate "Issuer" in the testing namespace """ # Create the Certificate for the intermediate CA based on the issuer fixture + from kubetester.certs import ( + Certificate, + Issuer, + ) + intermediate_ca_cert = Certificate(namespace=namespace, name="intermediate-ca-issuer") intermediate_ca_cert["spec"] = { "isCA": True, @@ -1419,6 +1418,11 @@ def create_issuer( else: raise e + from kubetester.certs import ( + ClusterIssuer, + Issuer, + ) + # And then creates the Issuer if clusterwide: issuer = ClusterIssuer(name="ca-issuer", namespace="") @@ -1449,20 +1453,6 @@ def pod_names(replica_set_name: str, replica_set_members: int) -> list[str]: return [f"{replica_set_name}-{i}" for i in range(0, replica_set_members)] -def multi_cluster_pod_names(replica_set_name: str, cluster_index_with_members: list[tuple[int, int]]) -> list[str]: - """List of multi-cluster pod names for given replica set name and a list of member counts in member clusters.""" - result_list = [] - for cluster_index, members in cluster_index_with_members: - result_list.extend([f"{replica_set_name}-{cluster_index}-{pod_idx}" for pod_idx in range(0, members)]) - - return result_list - - -def multi_cluster_service_names(replica_set_name: str, cluster_index_with_members: list[tuple[int, int]]) -> list[str]: - """List of multi-cluster service names for given replica set name and a list of member counts in member clusters.""" - return [f"{pod_name}-svc" for pod_name in multi_cluster_pod_names(replica_set_name, cluster_index_with_members)] - - def is_member_cluster(cluster_name: Optional[str] = None) -> bool: if cluster_name is not None and cluster_name != LEGACY_CENTRAL_CLUSTER_NAME: return True @@ -1545,48 +1535,6 @@ def coredns_config(tld: str, mappings: str, additional_rules: str = None): """ -def create_appdb_certs( - namespace: str, - issuer: str, - appdb_name: str, - cluster_index_with_members: list[tuple[int, int]] = None, - cert_prefix="appdb", - clusterwide: bool = False, - additional_domains: Optional[List[str]] = None, -) -> str: - if cluster_index_with_members is None: - cluster_index_with_members = [(0, 1), (1, 2)] - - appdb_cert_name = f"{cert_prefix}-{appdb_name}-cert" - - if is_multi_cluster(): - service_fqdns = [ - f"{svc}.{namespace}.svc.cluster.local" - for svc in multi_cluster_service_names(appdb_name, cluster_index_with_members) - ] - create_multi_cluster_mongodb_tls_certs( - issuer, - appdb_cert_name, - get_member_cluster_clients(), - get_central_cluster_client(), - service_fqdns=service_fqdns, - namespace=namespace, - clusterwide=clusterwide, - additional_domains=additional_domains, - ) - else: - create_mongodb_tls_certs( - issuer, - namespace, - appdb_name, - appdb_cert_name, - clusterwide=clusterwide, - additional_domains=additional_domains, - ) - - return cert_prefix - - import pytest from _pytest.main import Session from _pytest.nodes import Node @@ -1844,3 +1792,15 @@ def verify_pvc_expanded( assert journal_pvc.status.capacity["storage"] == resized_storage_size logs_pvc = client.CoreV1Api().read_namespaced_persistent_volume_claim(first_logs_pvc_name, namespace) assert logs_pvc.status.capacity["storage"] == initial_storage_size + + +def read_deployment_state( + resource_name: str, namespace: str, api_client: Optional[kubernetes.client.ApiClient] = None +) -> dict[str, Any]: + deployment_state_cm = read_configmap( + namespace, + f"{resource_name}-state", + api_client=api_client, + ) + state = json.loads(deployment_state_cm["state"]) + return state diff --git a/docker/mongodb-kubernetes-tests/tests/mixed/failures_on_multi_clusters.py b/docker/mongodb-kubernetes-tests/tests/mixed/failures_on_multi_clusters.py index 0a30fad3d..a448b724e 100644 --- a/docker/mongodb-kubernetes-tests/tests/mixed/failures_on_multi_clusters.py +++ b/docker/mongodb-kubernetes-tests/tests/mixed/failures_on_multi_clusters.py @@ -1,6 +1,7 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/__init__.py b/docker/mongodb-kubernetes-tests/tests/multicluster/__init__.py index ce47c402b..13170a09d 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/__init__.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/__init__.py @@ -3,7 +3,7 @@ from kubetester.create_or_replace_from_yaml import create_or_replace_from_yaml from kubetester.helm import helm_template -from kubetester.mongodb_multi import MultiClusterClient +from kubetester.multicluster_client import MultiClusterClient from tests import test_logger logger = test_logger.get_test_logger(__name__) diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/conftest.py b/docker/mongodb-kubernetes-tests/tests/multicluster/conftest.py index 51d1a0123..5b5100fe5 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/conftest.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/conftest.py @@ -18,7 +18,7 @@ ensure_organizational_unit, ldap_initialize, ) -from kubetester.mongodb_multi import MultiClusterClient +from kubetester.multicluster_client import MultiClusterClient from pytest import fixture from tests.authentication.conftest import ( AUTOMATION_AGENT_NAME, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/manual_multi_cluster_tls_no_mesh_2_clusters_eks_gke.py b/docker/mongodb-kubernetes-tests/tests/multicluster/manual_multi_cluster_tls_no_mesh_2_clusters_eks_gke.py index 0569e9608..0cb42037d 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/manual_multi_cluster_tls_no_mesh_2_clusters_eks_gke.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/manual_multi_cluster_tls_no_mesh_2_clusters_eks_gke.py @@ -14,11 +14,12 @@ from typing import List import kubernetes -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_2_cluster_clusterwide_replicaset.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_2_cluster_clusterwide_replicaset.py index 3af1723d9..277f3fc9f 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_2_cluster_clusterwide_replicaset.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_2_cluster_clusterwide_replicaset.py @@ -8,12 +8,13 @@ read_configmap, read_secret, ) -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from . import prepare_multi_cluster_namespaces from .conftest import cluster_spec_list, create_namespace diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_2_cluster_replicaset.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_2_cluster_replicaset.py index cc10e299c..fd3d273aa 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_2_cluster_replicaset.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_2_cluster_replicaset.py @@ -2,14 +2,15 @@ import kubernetes import pytest -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongotester import with_tls +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from .conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_agent_flags.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_agent_flags.py index 4438fc333..1a552f39c 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_agent_flags.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_agent_flags.py @@ -4,9 +4,10 @@ from kubetester import client from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.common.placeholders import placeholders from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_automated_disaster_recovery.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_automated_disaster_recovery.py index bb48b422c..57928b907 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_automated_disaster_recovery.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_automated_disaster_recovery.py @@ -8,9 +8,10 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import run_periodically -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import get_member_cluster_api_client diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore.py index 3faa96011..eea9bb3dc 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore.py @@ -17,12 +17,14 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb import MongoDB +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongodb_user import MongoDBUser +from kubetester.multicluster_client import MultiClusterClient from kubetester.omtester import OMTester from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( assert_data_got_restored, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore_no_mesh.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore_no_mesh.py index 02ad513df..41707aa04 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore_no_mesh.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_backup_restore_no_mesh.py @@ -20,12 +20,14 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb import MongoDB +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongodb_user import MongoDBUser +from kubetester.multicluster_client import MultiClusterClient from kubetester.omtester import OMTester from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import assert_data_got_restored, update_coredns_hosts diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_cli_recover.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_cli_recover.py index f4a2b55ed..75e4e20da 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_cli_recover.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_cli_recover.py @@ -2,11 +2,12 @@ import kubernetes import pytest -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.conftest import ( MULTI_CLUSTER_OPERATOR_NAME, run_kube_config_creation_tool, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_clusterwide.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_clusterwide.py index 60f00caa3..0041bb414 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_clusterwide.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_clusterwide.py @@ -7,9 +7,10 @@ from kubetester import create_or_update_configmap, create_or_update_secret, read_secret from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( MULTI_CLUSTER_OPERATOR_NAME, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_dr_connect.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_dr_connect.py index ed155d6af..a2186995b 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_dr_connect.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_dr_connect.py @@ -5,9 +5,9 @@ import kubernetes import pytest from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.mongodb_multi import MongoDBMulti from kubetester.operator import Operator +from kubetester.phase import Phase TEST_DATA = {"_id": "unique_id", "name": "John", "address": "Highway 37", "age": 30} diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_enable_tls.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_enable_tls.py index 39c3da752..86ae862d7 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_enable_tls.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_enable_tls.py @@ -2,12 +2,13 @@ import kubernetes from kubetester import read_secret -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_ldap.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_ldap.py index 2b30104ea..af460bbbe 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_ldap.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_ldap.py @@ -4,15 +4,16 @@ import kubernetes from kubetester import create_secret, wait_until from kubetester.automation_config_tester import AutomationConfigTester -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_static_containers from kubetester.ldap import LDAP_AUTHENTICATION_MECHANISM, LDAPUser, OpenLDAP -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongodb_user import MongoDBUser, Role, generic_user +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import get_multi_cluster_operator_installation_config from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_ldap_custom_roles.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_ldap_custom_roles.py index 8e0184cc2..6f472e6f2 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_ldap_custom_roles.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_ldap_custom_roles.py @@ -3,15 +3,16 @@ import kubernetes from kubetester import create_secret from kubetester.automation_config_tester import AutomationConfigTester -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_static_containers from kubetester.ldap import LDAP_AUTHENTICATION_MECHANISM, LDAPUser, OpenLDAP -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongodb_user import MongoDBUser, generic_user +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_pvc_resize.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_pvc_resize.py index 7db917ecd..adc9cc668 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_pvc_resize.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_pvc_resize.py @@ -5,9 +5,10 @@ from kubernetes import client from kubetester import get_statefulset, try_load from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list RESOURCE_NAME = "multi-replica-set-pvc-resize" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_reconcile_races.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_reconcile_races.py index 92bfe4d03..f94035895 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_reconcile_races.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_reconcile_races.py @@ -8,11 +8,12 @@ from kubetester import create_or_update_secret, find_fixture, try_load from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongodb_user import MongoDBUser from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from tests.conftest import ( MULTI_CLUSTER_OPERATOR_NAME, TELEMETRY_CONFIGMAP_NAME, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_recover_clusterwide.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_recover_clusterwide.py index 71b269d7c..2751be8d6 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_recover_clusterwide.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_recover_clusterwide.py @@ -16,9 +16,10 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import run_periodically -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( MULTI_CLUSTER_OPERATOR_NAME, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_recover_network_partition.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_recover_network_partition.py index 630a48acd..88ca7bba3 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_recover_network_partition.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_recover_network_partition.py @@ -6,9 +6,9 @@ from kubetester import delete_statefulset, statefulset_is_deleted from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import run_periodically -from kubetester.mongodb import Phase from kubetester.mongodb_multi import MongoDBMulti from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( MULTI_CLUSTER_OPERATOR_NAME, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set.py index 2d02cce6b..599015d46 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set.py @@ -8,9 +8,10 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.conftest import ( assert_log_rotation_process, member_cluster_clients, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_deletion.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_deletion.py index 716c90755..fd387cdda 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_deletion.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_deletion.py @@ -6,9 +6,10 @@ from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests import test_logger from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_ignore_unknown_users.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_ignore_unknown_users.py index c512c2146..6178377ea 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_ignore_unknown_users.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_ignore_unknown_users.py @@ -2,9 +2,9 @@ from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.mongodb_multi import MongoDBMulti from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_member_options.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_member_options.py index 3fd5eda88..7990943e8 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_member_options.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_member_options.py @@ -3,9 +3,9 @@ import kubernetes import pytest from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.mongodb_multi import MongoDBMulti from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_migration.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_migration.py index 43c8023c1..463b41d77 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_migration.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_migration.py @@ -7,10 +7,11 @@ from kubetester.kubetester import assert_statefulset_architecture from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import get_default_architecture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongotester import MongoDBBackgroundTester +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list MDBM_RESOURCE = "multi-replica-set-migration" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_scale_down.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_scale_down.py index 3c34cb17a..398b43ec1 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_scale_down.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_scale_down.py @@ -3,13 +3,14 @@ import kubernetes import pytest from kubetester.automation_config_tester import AutomationConfigTester -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongotester import with_tls +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list RESOURCE_NAME = "multi-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_scale_up.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_scale_up.py index b1388e270..39d190ca8 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_scale_up.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_scale_up.py @@ -3,13 +3,14 @@ import kubernetes import pytest from kubetester.automation_config_tester import AutomationConfigTester -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongotester import with_tls +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list RESOURCE_NAME = "multi-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_test_mtls.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_test_mtls.py index 22aacfd13..5c720264c 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_test_mtls.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_replica_set_test_mtls.py @@ -5,9 +5,10 @@ from kubetester import wait_until from kubetester.kubetester import KubernetesTester, create_testing_namespace from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_down_cluster.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_down_cluster.py index 9eaffe943..38350027f 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_down_cluster.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_down_cluster.py @@ -3,13 +3,14 @@ import kubernetes import pytest from kubetester.automation_config_tester import AutomationConfigTester -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongotester import with_tls +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list RESOURCE_NAME = "multi-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_up_cluster.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_up_cluster.py index bef18930b..f289ea19d 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_up_cluster.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_up_cluster.py @@ -3,13 +3,14 @@ import kubernetes import pytest from kubetester.automation_config_tester import AutomationConfigTester -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongotester import with_tls +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list RESOURCE_NAME = "multi-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_up_cluster_new_cluster.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_up_cluster_new_cluster.py index 71097ee46..87c46add2 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_up_cluster_new_cluster.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scale_up_cluster_new_cluster.py @@ -4,13 +4,14 @@ import pytest from kubernetes import client from kubetester.automation_config_tester import AutomationConfigTester -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongotester import with_tls +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.conftest import MULTI_CLUSTER_OPERATOR_NAME, run_kube_config_creation_tool from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scram.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scram.py index d6a24a74c..402355fa1 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scram.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_scram.py @@ -6,11 +6,12 @@ from kubetester.automation_config_tester import AutomationConfigTester from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongodb_user import MongoDBUser from kubetester.mongotester import with_scram +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list MDB_RESOURCE = "multi-replica-set-scram" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_split_horizon.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_split_horizon.py index 39f29d897..c32b8c38a 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_split_horizon.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_split_horizon.py @@ -2,14 +2,15 @@ import kubernetes import yaml -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongotester import with_tls +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark CERT_SECRET_PREFIX = "clustercert" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_sts_override.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_sts_override.py index 270667602..3a762c580 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_sts_override.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_sts_override.py @@ -4,9 +4,10 @@ import pytest from kubernetes import client from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase @pytest.fixture(scope="module") diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_no_mesh.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_no_mesh.py index 62d651c2b..9932aac29 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_no_mesh.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_no_mesh.py @@ -3,11 +3,12 @@ import kubernetes from kubernetes import client from kubetester import get_service -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.common.placeholders import placeholders from tests.conftest import update_coredns_hosts diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_with_scram.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_with_scram.py index 3b1b5aeae..978ae0832 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_with_scram.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_with_scram.py @@ -3,15 +3,16 @@ import kubernetes from kubetester import create_secret, read_secret from kubetester.automation_config_tester import AutomationConfigTester -from kubetester.certs import create_multi_cluster_mongodb_tls_certs +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongodb_user import MongoDBUser from kubetester.mongotester import with_scram, with_tls +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_with_x509.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_with_x509.py index a68074af2..ba106bb92 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_with_x509.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_with_x509.py @@ -4,17 +4,21 @@ import kubernetes from kubetester.automation_config_tester import AutomationConfigTester from kubetester.certs import ( + Certificate, + create_multi_cluster_x509_user_cert, +) +from kubetester.certs_mongodb_multi import ( create_multi_cluster_mongodb_x509_tls_certs, create_multi_cluster_x509_agent_certs, - create_multi_cluster_x509_user_cert, ) from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongodb_user import MongoDBUser +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_upgrade_downgrade.py b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_upgrade_downgrade.py index 253b54bcc..4aba05a9c 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_upgrade_downgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_upgrade_downgrade.py @@ -4,10 +4,10 @@ from kubetester import try_load from kubetester.kubetester import ensure_ent_version, fcv_from_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.mongodb_multi import MongoDBMulti from kubetester.mongotester import MongoDBBackgroundTester from kubetester.operator import Operator +from kubetester.phase import Phase from tests.multicluster.conftest import cluster_spec_list MDBM_RESOURCE = "multi-replica-set-upgrade" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb.py b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb.py index 2ef31224e..4da71e62b 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb.py @@ -1,10 +1,10 @@ import kubernetes import kubernetes.client from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark -from tests.conftest import create_appdb_certs +from tests.common.cert.cert_issuer import create_appdb_certs from tests.multicluster.conftest import cluster_spec_list CERT_PREFIX = "prefix" diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_disaster_recovery.py b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_disaster_recovery.py index 34eb0e9d9..ece7ea32c 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_disaster_recovery.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_disaster_recovery.py @@ -11,12 +11,12 @@ ) from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import run_periodically -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark +from tests.common.cert.cert_issuer import create_appdb_certs from tests.conftest import ( MULTI_CLUSTER_MEMBER_LIST_CONFIGMAP, - create_appdb_certs, get_member_cluster_api_client, ) from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py index 6d9e1c941..e612d4127 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_s3_based_backup_restore.py @@ -6,10 +6,10 @@ from kubetester import create_or_update_configmap, try_load from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.mongodb_multi import MongoDBMulti from kubetester.omtester import OMTester from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pymongo.errors import ServerSelectionTimeoutError from pytest import fixture, mark from tests.common.constants import ( diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_upgrade_downgrade_v1_27_to_mck.py b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_upgrade_downgrade_v1_27_to_mck.py index 66be1e3b9..72ed67e05 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_upgrade_downgrade_v1_27_to_mck.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_appdb_upgrade_downgrade_v1_27_to_mck.py @@ -4,15 +4,15 @@ import kubernetes.client from kubetester import read_configmap from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger +from tests.common.cert.cert_issuer import create_appdb_certs from tests.conftest import ( LEGACY_MULTI_CLUSTER_OPERATOR_NAME, MULTI_CLUSTER_OPERATOR_NAME, - create_appdb_certs, get_central_cluster_name, get_custom_appdb_version, install_legacy_deployment_state_meko, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_om_networking_clusterwide.py b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_om_networking_clusterwide.py index 541f709ac..47ee80a5a 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_om_networking_clusterwide.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_appdb/multicluster_om_networking_clusterwide.py @@ -2,12 +2,11 @@ from kubetester import read_secret, try_load from kubetester.awss3client import AwsS3Client from kubetester.certs import create_ops_manager_tls_certs -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MultiClusterClient +from kubetester.multicluster_client import MultiClusterClient from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( - create_appdb_certs, create_issuer_ca_configmap, get_central_cluster_client, get_central_cluster_name, @@ -67,6 +66,8 @@ def ops_manager_certs(multi_cluster_clusterissuer: str): @fixture(scope="module") def appdb_certs(multi_cluster_clusterissuer: str): + from tests.common.cert.cert_issuer import create_appdb_certs + return create_appdb_certs( OM_NAMESPACE, multi_cluster_clusterissuer, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_cleanup.py b/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_cleanup.py index 80beea443..54ecefcfb 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_cleanup.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_cleanup.py @@ -6,16 +6,16 @@ from kubetester.awss3client import AwsS3Client from kubetester.certs import create_ops_manager_tls_certs from kubetester.kubetester import ensure_ent_version, run_periodically -from kubetester.mongodb import Phase from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger +from tests.common.cert.cert_issuer import create_appdb_certs from tests.common.ops_manager.multi_cluster import ( ops_manager_multi_cluster_with_tls_s3_backups, ) from tests.conftest import ( - create_appdb_certs, get_central_cluster_client, get_cluster_clients, get_member_cluster_clients, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_no_mesh.py b/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_no_mesh.py index 3f0deb202..b8520cb9a 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_no_mesh.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_no_mesh.py @@ -11,21 +11,21 @@ from kubetester import create_or_update_configmap, create_or_update_service, try_load from kubetester.awss3client import AwsS3Client from kubetester.certs import ( - create_multi_cluster_mongodb_tls_certs, create_ops_manager_tls_certs, ) +from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as _fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( TELEMETRY_CONFIGMAP_NAME, assert_data_got_restored, - create_appdb_certs, get_central_cluster_client, get_member_cluster_clients, update_coredns_hosts, @@ -36,6 +36,7 @@ ) from .. import test_logger +from ..common.cert.cert_issuer import create_appdb_certs from ..common.constants import MEMBER_CLUSTER_1, MEMBER_CLUSTER_2, MEMBER_CLUSTER_3 from ..common.ops_manager.multi_cluster import ( ops_manager_multi_cluster_with_tls_s3_backups, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_clusterwide_operator_not_in_mesh_networking.py b/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_clusterwide_operator_not_in_mesh_networking.py index 62f4d4bb5..eeeee8e6e 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_clusterwide_operator_not_in_mesh_networking.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_clusterwide_operator_not_in_mesh_networking.py @@ -4,15 +4,15 @@ from kubernetes.client.rest import ApiException from kubetester import read_secret, read_service, try_load from kubetester.certs import create_ops_manager_tls_certs -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark +from tests.common.cert.cert_issuer import create_appdb_certs from tests.common.constants import MEMBER_CLUSTER_2, MEMBER_CLUSTER_3 from tests.common.ops_manager.multi_cluster import ( ops_manager_multi_cluster_with_tls_s3_backups, ) from tests.conftest import ( - create_appdb_certs, create_issuer_ca_configmap, get_aws_s3_client, get_central_cluster_client, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/__init__.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/__init__.py index 0f36ca753..4ac0ca677 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/__init__.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/__init__.py @@ -6,7 +6,7 @@ from kubetester import get_statefulset from kubetester.kubetester import KubernetesTester, is_multi_cluster from kubetester.mongodb import MongoDB -from kubetester.mongodb_multi import MultiClusterClient +from kubetester.multicluster_client import MultiClusterClient from tests import test_logger from tests.shardedcluster.conftest import ( get_member_cluster_clients_using_cluster_mapping, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_disaster_recovery.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_disaster_recovery.py index 1a62862d2..0e119fa57 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_disaster_recovery.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_disaster_recovery.py @@ -23,9 +23,10 @@ run_periodically, skip_if_local, ) -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_external_access_no_ext_domain.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_external_access_no_ext_domain.py index 17381250f..553210974 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_external_access_no_ext_domain.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_external_access_no_ext_domain.py @@ -4,8 +4,9 @@ from kubernetes import client from kubetester import find_fixture, try_load from kubetester.kubetester import ensure_ent_version -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.conftest import get_member_cluster_api_client diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_geo_sharding.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_geo_sharding.py index d8f060192..2f906a329 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_geo_sharding.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_geo_sharding.py @@ -1,7 +1,8 @@ from kubetester import find_fixture, try_load from kubetester.kubetester import KubernetesTester -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.conftest import get_member_cluster_names diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_scaling.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_scaling.py index 3be7c000f..f662c516e 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_scaling.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_scaling.py @@ -1,6 +1,7 @@ from kubetester import find_fixture, try_load -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.conftest import get_member_cluster_names diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_scaling_all_shard_overrides.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_scaling_all_shard_overrides.py index 342a416ef..56b913c8a 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_scaling_all_shard_overrides.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_scaling_all_shard_overrides.py @@ -1,8 +1,9 @@ from kubernetes.client import ApiClient from kubetester import find_fixture, try_load from kubetester.kubetester import KubernetesTester -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.conftest import get_member_cluster_names diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_simplest.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_simplest.py index d018f9c9f..f5d9eee84 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_simplest.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_simplest.py @@ -1,7 +1,8 @@ from kubetester import find_fixture, try_load from kubetester.kubetester import ensure_ent_version -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import get_member_cluster_names from tests.multicluster.conftest import cluster_spec_list diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_simplest_no_mesh.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_simplest_no_mesh.py index 503191bef..05b4796ae 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_simplest_no_mesh.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_simplest_no_mesh.py @@ -3,8 +3,9 @@ import kubernetes from kubetester import find_fixture, try_load from kubetester.kubetester import ensure_ent_version, skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import get_member_cluster_names, update_coredns_hosts from tests.shardedcluster.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_snippets.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_snippets.py index d70e7a4cb..1fa4fb48c 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_snippets.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_snippets.py @@ -3,8 +3,9 @@ from kubetester import create_or_update_configmap, read_configmap, try_load from kubetester.kubetester import ensure_ent_version -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import mark from tests import test_logger diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_tls.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_tls.py index 0780621e4..77866c242 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_tls.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_tls.py @@ -2,14 +2,15 @@ from kubetester import try_load from kubetester.certs import ( SetPropertiesMultiCluster, - create_multi_cluster_tls_certs, generate_cert, get_agent_x509_subject, get_mongodb_x509_subject, ) +from kubetester.certs_mongodb_multi import create_multi_cluster_tls_certs from kubetester.kubetester import fixture as _fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( get_central_cluster_client, diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_tls_no_mesh.py b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_tls_no_mesh.py index d6265e112..7d30e08e8 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_tls_no_mesh.py +++ b/docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_tls_no_mesh.py @@ -4,16 +4,17 @@ from kubetester import try_load from kubetester.certs import ( SetPropertiesMultiCluster, - create_multi_cluster_tls_certs, generate_cert, get_agent_x509_subject, get_mongodb_x509_subject, ) +from kubetester.certs_mongodb_multi import create_multi_cluster_tls_certs from kubetester.kubetester import fixture as _fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import with_tls from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( get_central_cluster_client, diff --git a/docker/mongodb-kubernetes-tests/tests/olm/olm_meko_operator_upgrade_with_resources.py b/docker/mongodb-kubernetes-tests/tests/olm/olm_meko_operator_upgrade_with_resources.py index 9224dafdd..29e023b80 100644 --- a/docker/mongodb-kubernetes-tests/tests/olm/olm_meko_operator_upgrade_with_resources.py +++ b/docker/mongodb-kubernetes-tests/tests/olm/olm_meko_operator_upgrade_with_resources.py @@ -2,7 +2,6 @@ import pytest from kubeobject import CustomObject from kubetester import ( - MongoDB, create_or_update_secret, get_default_storage_class, try_load, @@ -12,9 +11,10 @@ from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import get_default_architecture, run_periodically -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests import test_logger from tests.conftest import LEGACY_OPERATOR_NAME, OPERATOR_NAME diff --git a/docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade.py b/docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade.py index 756e223b2..f70937a9c 100644 --- a/docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade.py @@ -1,8 +1,9 @@ import pytest from kubernetes.client.rest import ApiException -from kubetester import MongoDB, read_service, wait_for_webhook +from kubetester import read_service, wait_for_webhook from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import get_default_architecture +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager from tests.conftest import OPERATOR_NAME from tests.olm.olm_test_commons import ( diff --git a/docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade_with_resources.py b/docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade_with_resources.py index 3f6c67264..0cacb3804 100644 --- a/docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade_with_resources.py +++ b/docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade_with_resources.py @@ -2,7 +2,6 @@ import pytest from kubeobject import CustomObject from kubetester import ( - MongoDB, create_or_update_secret, get_default_storage_class, try_load, @@ -12,9 +11,10 @@ from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import get_default_architecture, run_periodically -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests.conftest import OPERATOR_NAME from tests.olm.olm_test_commons import ( diff --git a/docker/mongodb-kubernetes-tests/tests/operator/operator_clusterwide.py b/docker/mongodb-kubernetes-tests/tests/operator/operator_clusterwide.py index 53dfecc9e..f7d2403b7 100644 --- a/docker/mongodb-kubernetes-tests/tests/operator/operator_clusterwide.py +++ b/docker/mongodb-kubernetes-tests/tests/operator/operator_clusterwide.py @@ -9,9 +9,11 @@ from kubetester.kubetester import create_testing_namespace from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import running_locally -from kubetester.mongodb import MongoDB, Phase, generic_replicaset +from kubetester.mongodb import MongoDB +from kubetester.mongodb_utils_replicaset import generic_replicaset from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture """ diff --git a/docker/mongodb-kubernetes-tests/tests/operator/operator_proxy.py b/docker/mongodb-kubernetes-tests/tests/operator/operator_proxy.py index 755cfb476..5e103580e 100644 --- a/docker/mongodb-kubernetes-tests/tests/operator/operator_proxy.py +++ b/docker/mongodb-kubernetes-tests/tests/operator/operator_proxy.py @@ -9,8 +9,9 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as _fixture from kubetester.kubetester import get_pods -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from oauthlib.oauth1.rfc5849.endpoints import resource from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/backup_snapshot_schedule_tests.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/backup_snapshot_schedule_tests.py index ec2162b73..203db0a11 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/backup_snapshot_schedule_tests.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/backup_snapshot_schedule_tests.py @@ -5,9 +5,10 @@ from kubetester import try_load from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.omtester import OMTester from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_appdb_multi_change.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_appdb_multi_change.py index 2457bd8fd..5350f02f7 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_appdb_multi_change.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_appdb_multi_change.py @@ -1,6 +1,6 @@ from kubetester import find_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_appdb_scram.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_appdb_scram.py index 736f59cda..899037b1a 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_appdb_scram.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_appdb_scram.py @@ -4,8 +4,8 @@ from kubetester import create_or_update_secret from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests.conftest import get_central_cluster_client, is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_external_connectivity.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_external_connectivity.py index aaa218a79..e8d193fd8 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_external_connectivity.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_external_connectivity.py @@ -3,8 +3,8 @@ from kubetester import try_load from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_jvm_params.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_jvm_params.py index 91d4a5ec8..69616ae9b 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_jvm_params.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_jvm_params.py @@ -5,8 +5,8 @@ from kubetester import try_load from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import assert_log_rotation_process, is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_localmode_multiple_pv.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_localmode_multiple_pv.py index 27093c71a..688016c5b 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_localmode_multiple_pv.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_localmode_multiple_pv.py @@ -3,8 +3,9 @@ from kubetester import get_default_storage_class from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_localmode_single_pv.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_localmode_single_pv.py index 777778b0b..c8dc2fa05 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_localmode_single_pv.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_localmode_single_pv.py @@ -5,8 +5,9 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import get_member_cluster_api_client, is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_migration.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_migration.py index c22ee1047..d9fa7cd62 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_migration.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_migration.py @@ -5,8 +5,8 @@ from kubetester import try_load from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup.py index ed5764076..15f2bce40 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup.py @@ -16,10 +16,11 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import running_locally, skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.omtester import OMTester from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from kubetester.test_identifiers import set_test_identifier from pytest import fixture, mark from tests.conftest import AWS_REGION, is_multi_cluster diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_delete_sts.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_delete_sts.py index 02c682ba4..0183d2c34 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_delete_sts.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_delete_sts.py @@ -1,11 +1,12 @@ from typing import Optional import semver -from kubetester import MongoDB, wait_until +from kubetester import wait_until from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( assert_log_rotation_backup_monitoring, diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_kmip.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_kmip.py index 496da8dcf..48c07e933 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_kmip.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_kmip.py @@ -1,16 +1,17 @@ from typing import Optional import pymongo -from kubetester import MongoDB, create_or_update_secret, read_secret +from kubetester import create_or_update_secret, read_secret from kubetester.awss3client import AwsS3Client from kubetester.certs import create_tls_certs from kubetester.kmip import KMIPDeployment from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import is_default_architecture_static -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.omtester import OMTester from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pymongo import ReadPreference from pytest import fixture, mark from tests.conftest import is_multi_cluster diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_manual.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_manual.py index 26e1c0a31..a02c8d5c8 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_manual.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_manual.py @@ -12,11 +12,12 @@ from kubetester.awss3client import AwsS3Client, s3_endpoint from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark -from tests.conftest import is_multi_cluster +from tests.conftest import AWS_REGION, is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment HEAD_PATH = "/head/" diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_restore.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_restore.py index 75240a65c..49dbaef73 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_restore.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_restore.py @@ -3,13 +3,14 @@ from typing import Optional import pymongo -from kubetester import MongoDB, try_load +from kubetester import try_load from kubetester.awss3client import AwsS3Client from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.omtester import OMTester from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pymongo import ReadPreference from pymongo.errors import ServerSelectionTimeoutError from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_restore_minio.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_restore_minio.py index 22d9a598c..6a8f4d891 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_restore_minio.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_restore_minio.py @@ -5,7 +5,6 @@ import pymongo from kubetester import ( - MongoDB, create_or_update_namespace, create_or_update_secret, read_secret, @@ -14,15 +13,15 @@ from kubetester.certs import create_mongodb_tls_certs, create_ops_manager_tls_certs from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.omtester import OMTester from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pymongo import ReadPreference -from pymongo.errors import ServerSelectionTimeoutError from pytest import fixture, mark +from tests.common.cert.cert_issuer import create_appdb_certs from tests.conftest import ( assert_data_got_restored, - create_appdb_certs, is_multi_cluster, ) from tests.opsmanager.conftest import mino_operator_install, mino_tenant_install diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_s3_tls.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_s3_tls.py index 1fd54cb02..6c443c276 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_s3_tls.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_s3_tls.py @@ -3,11 +3,12 @@ from kubetester import create_or_update_secret, try_load from kubetester.awss3client import AwsS3Client, s3_endpoint from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark +from tests.common.cert.cert_issuer import create_appdb_certs from tests.common.constants import S3_BLOCKSTORE_NAME, S3_OPLOG_NAME -from tests.conftest import AWS_REGION, create_appdb_certs, is_multi_cluster +from tests.conftest import AWS_REGION, is_multi_cluster from tests.opsmanager.om_ops_manager_backup import create_aws_secret, create_s3_bucket from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_sharded_cluster.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_sharded_cluster.py index ebd523296..97888098d 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_sharded_cluster.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_sharded_cluster.py @@ -12,10 +12,11 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import run_periodically -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.mongotester import MongoTester from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.opsmanager.om_ops_manager_backup import create_aws_secret, create_s3_bucket diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_tls.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_tls.py index f9d5f020b..0b2f96c0c 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_tls.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_tls.py @@ -1,14 +1,15 @@ from typing import Optional -from kubetester import MongoDB, create_or_update_configmap +from kubetester import create_or_update_configmap from kubetester.certs import create_mongodb_tls_certs from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark +from tests.common.cert.cert_issuer import create_appdb_certs from tests.conftest import ( - create_appdb_certs, get_member_cluster_api_client, is_multi_cluster, ) diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_tls_custom_ca.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_tls_custom_ca.py index a99966a9e..4c84a9045 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_tls_custom_ca.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_tls_custom_ca.py @@ -2,15 +2,15 @@ import time from typing import Optional -from kubetester import MongoDB from kubetester.certs import create_mongodb_tls_certs, create_ops_manager_tls_certs from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark +from tests.common.cert.cert_issuer import create_appdb_certs from tests.conftest import ( - create_appdb_certs, default_external_domain, external_domain_fqdns, is_multi_cluster, diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_feature_controls.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_feature_controls.py index c2ca0f1e6..f6b629cdb 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_feature_controls.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_feature_controls.py @@ -3,8 +3,9 @@ import kubernetes from kubetester import try_load, wait_until from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import OPERATOR_NAME, is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https.py index 34aa2e1d0..5ae2f911b 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https.py @@ -5,10 +5,12 @@ from kubetester.certs import create_ops_manager_tls_certs, rotate_cert from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as _fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark -from tests.conftest import create_appdb_certs, is_multi_cluster +from tests.common.cert.cert_issuer import create_appdb_certs +from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_hybrid_mode.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_hybrid_mode.py index 6541157ba..0f4e404f3 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_hybrid_mode.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_hybrid_mode.py @@ -4,10 +4,12 @@ from kubetester.certs import create_mongodb_tls_certs, create_ops_manager_tls_certs from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as _fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark -from tests.conftest import create_appdb_certs, is_multi_cluster +from tests.common.cert.cert_issuer import create_appdb_certs +from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_internet_mode.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_internet_mode.py index 610c7ed84..48f559334 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_internet_mode.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_internet_mode.py @@ -4,10 +4,12 @@ from kubetester.certs import create_ops_manager_tls_certs from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as _fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark -from tests.conftest import create_appdb_certs, is_multi_cluster +from tests.common.cert.cert_issuer import create_appdb_certs +from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_prefix.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_prefix.py index 4bed89004..7b1106f9d 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_prefix.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_https_prefix.py @@ -2,8 +2,8 @@ from kubetester.certs import create_ops_manager_tls_certs from kubetester.kubetester import fixture as _fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_local_mode_enable_and_disable_manually_deleting_sts.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_local_mode_enable_and_disable_manually_deleting_sts.py index eecedde0e..b86e19544 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_local_mode_enable_and_disable_manually_deleting_sts.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_local_mode_enable_and_disable_manually_deleting_sts.py @@ -1,11 +1,12 @@ from typing import Optional -from kubetester import MongoDB, delete_pod, delete_statefulset, get_pod_when_ready +from kubetester import delete_pod, delete_statefulset, get_pod_when_ready from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_static_containers -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import get_member_cluster_api_client, is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_prometheus.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_prometheus.py index 41ce204f2..9e68f41e5 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_prometheus.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_prometheus.py @@ -1,13 +1,15 @@ import time from kubernetes import client -from kubetester import MongoDB, create_or_update_secret, random_k8s_name +from kubetester import create_or_update_secret, random_k8s_name from kubetester.certs import create_mongodb_tls_certs from kubetester.http import https_endpoint_is_reachable from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase, generic_replicaset +from kubetester.mongodb import MongoDB +from kubetester.mongodb_utils_replicaset import generic_replicaset from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_queryable_backup.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_queryable_backup.py index 5f9ee694a..0da4620a8 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_queryable_backup.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_queryable_backup.py @@ -14,10 +14,11 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import running_locally, skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.om_queryable_backups import generate_queryable_pem from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import AWS_REGION, is_multi_cluster from tests.opsmanager.om_ops_manager_backup import create_aws_secret, create_s3_bucket diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_scale.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_scale.py index 7c0b28f0e..a3e19251e 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_scale.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_scale.py @@ -3,9 +3,9 @@ from kubetester import try_load from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase from kubetester.omtester import OMBackgroundTester from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests.conftest import ( get_member_cluster_api_client, diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_update_before_reconciliation.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_update_before_reconciliation.py index c6b5edcd2..4533b94c0 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_update_before_reconciliation.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_update_before_reconciliation.py @@ -5,8 +5,8 @@ import pytest from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_upgrade.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_upgrade.py index f269cc006..a40eabaac 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_upgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_upgrade.py @@ -5,7 +5,7 @@ import semver from kubernetes import client from kubernetes.client.rest import ApiException -from kubetester import MongoDB, try_load +from kubetester import try_load from kubetester.awss3client import AwsS3Client from kubetester.kubetester import ( ensure_ent_version, @@ -16,8 +16,9 @@ run_periodically, skip_if_local, ) -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests import test_logger from tests.conftest import get_member_cluster_clients, is_multi_cluster diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_weak_password.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_weak_password.py index e1dbc94ca..701d85d90 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_weak_password.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_weak_password.py @@ -3,8 +3,8 @@ import pytest from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_remotemode.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_remotemode.py index 7172623a5..d3a8fbe9d 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/om_remotemode.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/om_remotemode.py @@ -5,8 +5,9 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_external_connectivity.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_external_connectivity.py index e4a4dc064..486b55f95 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_external_connectivity.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_external_connectivity.py @@ -4,12 +4,12 @@ from kubetester import create_or_update_secret, get_service from kubetester.certs import create_ops_manager_tls_certs from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark +from tests.common.cert.cert_issuer import create_appdb_certs from tests.common.placeholders import placeholders from tests.conftest import ( - create_appdb_certs, default_external_domain, external_domain_fqdns, update_coredns_hosts, diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_flags_and_config.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_flags_and_config.py index d61944c42..ff483e823 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_flags_and_config.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_flags_and_config.py @@ -2,8 +2,8 @@ from kubetester import find_fixture from kubetester.kubetester import KubernetesTester -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_scale_up_down.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_scale_up_down.py index c490508a9..9a0f64704 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_scale_up_down.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_scale_up_down.py @@ -3,8 +3,8 @@ import pytest from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests.conftest import is_multi_cluster diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_upgrade.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_upgrade.py index 5a971e173..fddda0294 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_upgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_upgrade.py @@ -4,8 +4,8 @@ from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_appdb_monitoring_tls.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_appdb_monitoring_tls.py index a8477c628..a32599d29 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_appdb_monitoring_tls.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_appdb_monitoring_tls.py @@ -5,10 +5,11 @@ from kubetester import create_or_update_secret, try_load from kubetester.certs import create_ops_manager_tls_certs from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark -from tests.conftest import create_appdb_certs, is_multi_cluster +from tests.common.cert.cert_issuer import create_appdb_certs +from tests.conftest import is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment OM_NAME = "om-tls-monitored-appdb" diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_backup_light.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_backup_light.py index 38d03d168..f2a3a05c8 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_backup_light.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_backup_light.py @@ -3,12 +3,13 @@ import jsonpatch import kubernetes.client from kubernetes import client -from kubetester import MongoDB, try_load, wait_until +from kubetester import try_load, wait_until from kubetester.awss3client import AwsS3Client from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( get_central_cluster_client, diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_backup_liveness_probe.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_backup_liveness_probe.py index b21e9aee3..9e426f8f1 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_backup_liveness_probe.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_backup_liveness_probe.py @@ -1,13 +1,14 @@ from typing import Optional from kubernetes import client -from kubetester import MongoDB, try_load +from kubetester import try_load from kubetester.awss3client import AwsS3Client from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import get_member_cluster_api_client, is_multi_cluster from tests.opsmanager.om_ops_manager_backup import ( diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py index 22a1220c5..8d593eedd 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py @@ -11,8 +11,8 @@ from kubetester.custom_podspec import assert_volume_mounts_are_equal from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import is_default_architecture_static -from kubetester.mongodb import Phase from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import APPDB_SA_NAME, OM_SA_NAME, is_multi_cluster from tests.opsmanager.withMonitoredAppDB.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_secure_config.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_secure_config.py index 8402f0cb4..f67f7dc55 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_secure_config.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_secure_config.py @@ -6,8 +6,9 @@ from kubetester import create_or_update_secret, try_load from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture from tests.conftest import get_central_cluster_client, is_multi_cluster from tests.opsmanager.om_ops_manager_backup import BLOCKSTORE_RS_NAME, OPLOG_RS_NAME diff --git a/docker/mongodb-kubernetes-tests/tests/probes/replication_state_awareness.py b/docker/mongodb-kubernetes-tests/tests/probes/replication_state_awareness.py index 0989fe632..95885ea15 100644 --- a/docker/mongodb-kubernetes-tests/tests/probes/replication_state_awareness.py +++ b/docker/mongodb-kubernetes-tests/tests/probes/replication_state_awareness.py @@ -16,8 +16,10 @@ import yaml from kubernetes.client.rest import ApiException from kubetester import find_fixture, wait_until -from kubetester.mongodb import MongoDB, Phase, generic_replicaset +from kubetester.mongodb import MongoDB +from kubetester.mongodb_utils_replicaset import generic_replicaset from kubetester.mongotester import upload_random_data +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/community_and_meko_replicaset_scale.py b/docker/mongodb-kubernetes-tests/tests/replicaset/community_and_meko_replicaset_scale.py index fd1477ce7..8db988640 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/community_and_meko_replicaset_scale.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/community_and_meko_replicaset_scale.py @@ -1,8 +1,9 @@ from kubetester import create_or_update_secret, try_load from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_community import MongoDBCommunity from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/manual/replica_set_override_agent_launcher_script.py b/docker/mongodb-kubernetes-tests/tests/replicaset/manual/replica_set_override_agent_launcher_script.py index c87c2e526..224c1a636 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/manual/replica_set_override_agent_launcher_script.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/manual/replica_set_override_agent_launcher_script.py @@ -3,8 +3,9 @@ from kubetester import find_fixture, try_load from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture # This test is intended for manual run only. diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set.py index c0b6aae41..5ba57314b 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set.py @@ -12,8 +12,9 @@ from kubetester.kubetester import KubernetesTester, fcv_from_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import is_default_architecture_static, skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ReplicaSetTester +from kubetester.phase import Phase from pytest import fixture from tests.conftest import ( DATABASE_SA_NAME, diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_agent_flags.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_agent_flags.py index cf95eb81f..647820f91 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_agent_flags.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_agent_flags.py @@ -7,7 +7,8 @@ read_configmap, ) from kubetester.kubetester import KubernetesTester, ensure_ent_version -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark from tests.pod_logs import ( assert_log_types_in_structured_json_pod_log, diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_config_map.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_config_map.py index d9d30e0a5..a145cc605 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_config_map.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_config_map.py @@ -2,7 +2,8 @@ from kubernetes.client import V1ConfigMap from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase @pytest.fixture(scope="module") diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py index c5c68bedf..145d31e08 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py @@ -3,7 +3,8 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_static_containers -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_sa.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_sa.py index 947e16adc..b17e7e851 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_sa.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_sa.py @@ -1,7 +1,8 @@ from kubetester import create_service_account, delete_service_account from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_exposed_externally.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_exposed_externally.py index 43258e074..65c78f31e 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_exposed_externally.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_exposed_externally.py @@ -2,7 +2,8 @@ from kubernetes import client from kubetester import try_load from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture from tests.common.placeholders import placeholders diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_member_options.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_member_options.py index 7815db55d..943d85ba5 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_member_options.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_member_options.py @@ -1,7 +1,8 @@ import pytest from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture RESOURCE_NAME = "my-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_migration.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_migration.py index e8e022830..69bb129dd 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_migration.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_migration.py @@ -1,11 +1,12 @@ import pymongo import pytest -from kubetester import MongoDB, try_load +from kubetester import try_load from kubetester.kubetester import assert_statefulset_architecture, ensure_ent_version from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import get_default_architecture -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import MongoDBBackgroundTester, MongoTester +from kubetester.phase import Phase from pytest import fixture MDB_RESOURCE_NAME = "replica-set-migration" diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_mongod_options.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_mongod_options.py index 2c3e4286d..41e1f75db 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_mongod_options.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_mongod_options.py @@ -1,5 +1,6 @@ from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import OPERATOR_NAME diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_perf.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_perf.py index 86f30b9a8..c23a906ba 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_perf.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_perf.py @@ -9,8 +9,9 @@ from kubetester import find_fixture, try_load from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from tests.conftest import get_custom_mdb_version diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_process_hostnames.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_process_hostnames.py index c0b015852..83aba9961 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_process_hostnames.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_process_hostnames.py @@ -11,7 +11,8 @@ from kubernetes import client from kubetester import try_load from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture from tests.common.placeholders import placeholders from tests.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv.py index 5a7e14365..cb4a48d10 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv.py @@ -4,7 +4,8 @@ from kubernetes import client from kubetester.kubetester import KubernetesTester, fcv_from_version from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from tests.conftest import LEGACY_OPERATOR_NAME, OPERATOR_NAME diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv_multiple.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv_multiple.py index 0db87808a..c72caed96 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv_multiple.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv_multiple.py @@ -4,7 +4,8 @@ from kubetester import get_default_storage_class from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase @pytest.mark.e2e_replica_set_pv_multiple diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv_resize.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv_resize.py index 050bb660e..689873603 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv_resize.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv_resize.py @@ -2,7 +2,8 @@ from kubetester import get_statefulset, try_load from kubetester.certs import ISSUER_CA_NAME, create_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import verify_pvc_expanded diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_readiness_probe.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_readiness_probe.py index 0d09d57fe..f8b9755a4 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_readiness_probe.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_readiness_probe.py @@ -4,7 +4,8 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import get_pods, skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase RESOURCE_NAME = "my-replica-set-double" diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_report_pending_pods.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_report_pending_pods.py index 2e51d9ecb..deaefcada 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_report_pending_pods.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_report_pending_pods.py @@ -1,6 +1,7 @@ from kubetester import delete_pod, delete_pvc from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_schema_validation.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_schema_validation.py index ad1e90360..8aadb62cc 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_schema_validation.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_schema_validation.py @@ -2,9 +2,9 @@ import pytest from kubernetes.client import ApiException -from kubetester import MongoDB from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture +from kubetester.mongodb import MongoDB def mdb_resource(namespace: str) -> MongoDB: diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_statefulset_status.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_statefulset_status.py index 4f29b42ab..fe97c865c 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_statefulset_status.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_statefulset_status.py @@ -1,5 +1,6 @@ from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_update_delete_parallel.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_update_delete_parallel.py index 6268d1c47..09b6bfc2c 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_update_delete_parallel.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_update_delete_parallel.py @@ -10,7 +10,8 @@ from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import run_periodically -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_upgrade_downgrade.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_upgrade_downgrade.py index 821fc8cd3..7c714614c 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_upgrade_downgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_upgrade_downgrade.py @@ -2,12 +2,13 @@ from kubetester import try_load from kubetester.kubetester import KubernetesTester, fcv_from_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ( MongoDBBackgroundTester, MongoTester, ReplicaSetTester, ) +from kubetester.phase import Phase from pytest import fixture, mark TEST_DATA = {"foo": "bar"} diff --git a/docker/mongodb-kubernetes-tests/tests/search/search_community_basic.py b/docker/mongodb-kubernetes-tests/tests/search/search_community_basic.py index cfa857894..69cbca895 100644 --- a/docker/mongodb-kubernetes-tests/tests/search/search_community_basic.py +++ b/docker/mongodb-kubernetes-tests/tests/search/search_community_basic.py @@ -1,8 +1,8 @@ from kubetester import create_or_update_secret, try_load from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase from kubetester.mongodb_community import MongoDBCommunity from kubetester.mongodb_search import MongoDBSearch +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.common.search import movies_search_helper diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/conftest.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/conftest.py index 255cafa56..a0d24f222 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/conftest.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/conftest.py @@ -1,11 +1,10 @@ -import json from ipaddress import IPv4Address -from typing import Any, List +from typing import List import kubernetes import pytest -from kubetester import MongoDB, read_configmap -from kubetester.mongodb_multi import MultiClusterClient +from kubetester.mongodb import MongoDB +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator from tests.conftest import ( LEGACY_CENTRAL_CLUSTER_NAME, @@ -18,6 +17,7 @@ get_multi_cluster_operator_installation_config, get_operator_installation_config, is_multi_cluster, + read_deployment_state, ) from tests.multicluster.conftest import cluster_spec_list @@ -220,14 +220,14 @@ def setup_cluster_spec_list(resource: MongoDB, cluster_spec_type: str, members_a def get_member_cluster_clients_using_cluster_mapping(resource_name: str, namespace: str) -> List[MultiClusterClient]: - cluster_mapping = read_deployment_state(resource_name, namespace)["clusterMapping"] + cluster_mapping = read_deployment_state(resource_name, namespace, get_central_cluster_client())["clusterMapping"] return get_member_cluster_clients(cluster_mapping) def get_member_cluster_client_using_cluster_mapping( resource_name: str, namespace: str, cluster_name: str ) -> MultiClusterClient: - cluster_mapping = read_deployment_state(resource_name, namespace)["clusterMapping"] + cluster_mapping = read_deployment_state(resource_name, namespace, get_central_cluster_client())["clusterMapping"] for m in get_member_cluster_clients(cluster_mapping): if m.cluster_name == cluster_name: return m @@ -277,13 +277,3 @@ def get_all_shards_pod_names(resource: MongoDB): pod_names.append(pod_name) return pod_names - - -def read_deployment_state(resource_name: str, namespace: str) -> dict[str, Any]: - deployment_state_cm = read_configmap( - namespace, - f"{resource_name}-state", - get_central_cluster_client(), - ) - state = json.loads(deployment_state_cm["state"]) - return state diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster.py index fa7aed218..650bc9275 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster.py @@ -3,8 +3,9 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import run_periodically, skip_if_local, skip_if_multi_cluster -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.conftest import is_multi_cluster diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_agent_flags.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_agent_flags.py index 6e9a5d172..f9a3d66b2 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_agent_flags.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_agent_flags.py @@ -1,7 +1,8 @@ from kubetester import find_fixture, try_load from kubetester.kubetester import KubernetesTester, ensure_ent_version -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.pod_logs import ( diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_custom_podspec.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_custom_podspec.py index 421004450..909bb0761 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_custom_podspec.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_custom_podspec.py @@ -3,8 +3,9 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import is_default_architecture_static -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.shardedcluster.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_migration.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_migration.py index f6c62feab..5a0f7e642 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_migration.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_migration.py @@ -1,7 +1,7 @@ import pymongo import pytest from kubernetes import client -from kubetester import MongoDB, try_load +from kubetester import try_load from kubetester.kubetester import ( assert_statefulset_architecture, ensure_ent_version, @@ -12,9 +12,10 @@ is_multi_cluster, skip_if_multi_cluster, ) -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import MongoDBBackgroundTester, MongoTester from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture from tests.shardedcluster.conftest import ( enable_multi_cluster_deployment, diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_mongod_options.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_mongod_options.py index 06c8ebbb1..3bcbfdccd 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_mongod_options.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_mongod_options.py @@ -1,8 +1,9 @@ from kubetester import try_load from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( OPERATOR_NAME, diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_pv.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_pv.py index 62fc8bb92..f74876326 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_pv.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_pv.py @@ -1,10 +1,11 @@ import kubernetes -from kubetester import MongoDB, try_load +from kubetester import try_load from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import run_periodically -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.shardedcluster.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_pv_resize.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_pv_resize.py index fe066b0ae..f167c289b 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_pv_resize.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_pv_resize.py @@ -1,8 +1,9 @@ -from kubetester import MongoDB, try_load +from kubetester import try_load from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.shardedcluster.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_recovery.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_recovery.py index 5637b0dd1..07832dfdc 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_recovery.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_recovery.py @@ -2,8 +2,9 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import is_multi_cluster -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.shardedcluster.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_scale_shards.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_scale_shards.py index 3d172eee0..7f8511b87 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_scale_shards.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_scale_shards.py @@ -4,8 +4,9 @@ from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import is_multi_cluster -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.shardedcluster.conftest import ( enable_multi_cluster_deployment, diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_secret.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_secret.py index 2fd5a2288..19cd4b3a4 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_secret.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_secret.py @@ -1,8 +1,9 @@ from kubetester import try_load from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.shardedcluster.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_shard_overrides.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_shard_overrides.py index 35f04cd6a..7d84c116d 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_shard_overrides.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_shard_overrides.py @@ -3,11 +3,16 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import is_multi_cluster -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger -from tests.conftest import get_member_cluster_names +from tests.conftest import ( + get_central_cluster_client, + get_member_cluster_names, + read_deployment_state, +) from tests.multicluster.conftest import cluster_spec_list from tests.multicluster_shardedcluster import ( build_expected_statefulsets, @@ -18,7 +23,6 @@ validate_shard_configurations_in_ac, validate_shard_configurations_in_ac_multi, ) -from tests.shardedcluster.conftest import read_deployment_state logger = test_logger.get_test_logger(__name__) @@ -72,7 +76,7 @@ def test_assert_stateful_sets( logger.info("Validating statefulsets in cluster(s)") if is_multi_cluster(): # We need the unique cluster index, stored in the state configmap, for computing expected sts names - cluster_mapping = read_deployment_state(sc.name, namespace)["clusterMapping"] + cluster_mapping = read_deployment_state(sc.name, namespace, get_central_cluster_client())["clusterMapping"] logger.debug(f"Cluster mapping in state: {cluster_mapping}") expected_statefulsets = build_expected_statefulsets_multi(sc, cluster_mapping) validate_correct_sts_in_cluster_multi(expected_statefulsets, namespace, member_cluster_clients) @@ -127,7 +131,7 @@ def test_assert_stateful_sets_after_scaling( logger.info("Validating statefulsets in cluster(s)") if is_multi_cluster(): # We need the unique cluster index, stored in the state configmap, for computing expected sts names - cluster_mapping = read_deployment_state(sc.name, namespace)["clusterMapping"] + cluster_mapping = read_deployment_state(sc.name, namespace, get_central_cluster_client())["clusterMapping"] logger.debug(f"Cluster mapping in state: {cluster_mapping}") expected_statefulsets = build_expected_statefulsets_multi(sc, cluster_mapping) validate_correct_sts_in_cluster_multi(expected_statefulsets, namespace, member_cluster_clients) diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_single_cluster_external_access.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_single_cluster_external_access.py index 7de9bbe0e..7db2eda7d 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_single_cluster_external_access.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_single_cluster_external_access.py @@ -5,8 +5,9 @@ from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_statefulset_status.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_statefulset_status.py index e8658aa23..c42edd402 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_statefulset_status.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_statefulset_status.py @@ -3,8 +3,9 @@ from kubetester import try_load from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.shardedcluster.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_upgrade_downgrade.py b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_upgrade_downgrade.py index 8c6d17b34..6fbc049fa 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_upgrade_downgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_upgrade_downgrade.py @@ -1,10 +1,11 @@ import pymongo -from kubetester import MongoDB, try_load +from kubetester import try_load from kubetester.kubetester import KubernetesTester, ensure_ent_version, fcv_from_version from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import MongoDBBackgroundTester, MongoTester from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import is_multi_cluster from tests.shardedcluster.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_config_map.py b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_config_map.py index 3cf9a94b3..131c1d8da 100644 --- a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_config_map.py +++ b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_config_map.py @@ -3,7 +3,8 @@ from kubernetes.client import V1ConfigMap from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture diff --git a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_custom_podspec.py b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_custom_podspec.py index 5252c9195..66080f0e5 100644 --- a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_custom_podspec.py +++ b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_custom_podspec.py @@ -2,7 +2,8 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import is_default_architecture_static -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_recovery.py b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_recovery.py index c2b5610d4..6b236e8aa 100644 --- a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_recovery.py +++ b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_recovery.py @@ -2,7 +2,8 @@ from kubernetes.client import V1ConfigMap from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase @pytest.fixture(scope="module") diff --git a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_set_agent_flags.py b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_set_agent_flags.py index 4c085914f..43e34f1bd 100644 --- a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_set_agent_flags.py +++ b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_set_agent_flags.py @@ -1,6 +1,7 @@ from kubetester import find_fixture from kubetester.kubetester import KubernetesTester -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_upgrade_downgrade.py b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_upgrade_downgrade.py index 0478a3ad0..47521afa8 100644 --- a/docker/mongodb-kubernetes-tests/tests/standalone/standalone_upgrade_downgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/standalone/standalone_upgrade_downgrade.py @@ -2,8 +2,9 @@ from kubetester.kubetester import KubernetesTester, fcv_from_version from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import StandaloneTester +from kubetester.phase import Phase @pytest.fixture(scope="module") diff --git a/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_rs.py b/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_rs.py index af184f34d..cf3ab1f48 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_rs.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_rs.py @@ -5,9 +5,10 @@ create_mongodb_tls_certs, ) from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ReplicaSetTester from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "my-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_sc.py b/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_sc.py index 7287b22ee..2e0545da6 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_sc.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_sc.py @@ -3,9 +3,10 @@ from kubetester.certs import create_agent_tls_certs, create_sharded_cluster_certs from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import is_multi_cluster -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ShardedClusterTester from kubetester.operator import Operator +from kubetester.phase import Phase from tests.shardedcluster.conftest import ( enable_multi_cluster_deployment, get_mongos_service_names, diff --git a/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_standalone.py b/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_standalone.py index 5b6c4f824..68157ceae 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_standalone.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/e2e_configure_tls_and_x509_simultaneously_standalone.py @@ -5,9 +5,10 @@ create_mongodb_tls_certs, ) from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import StandaloneTester from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "my-standalone" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/e2e_tls_disable_and_scale_up.py b/docker/mongodb-kubernetes-tests/tests/tls/e2e_tls_disable_and_scale_up.py index dc544f154..3eae37813 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/e2e_tls_disable_and_scale_up.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/e2e_tls_disable_and_scale_up.py @@ -1,8 +1,9 @@ import pytest from kubetester.certs import ISSUER_CA_NAME, create_mongodb_tls_certs from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase @pytest.fixture(scope="module") diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_allowssl.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_allowssl.py index f26d27856..afdc67b74 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_allowssl.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_allowssl.py @@ -2,8 +2,9 @@ from kubetester.certs import ISSUER_CA_NAME, create_mongodb_tls_certs from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "test-tls-base-rs-allow-ssl" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_no_status.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_no_status.py index 9337b767f..1a007a13d 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_no_status.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_no_status.py @@ -1,8 +1,9 @@ import pytest from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "test-no-tls-no-status" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_permissions_default.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_permissions_default.py index 654a813db..e4a9cfb2b 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_permissions_default.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_permissions_default.py @@ -1,8 +1,9 @@ from kubetester import find_fixture, try_load from kubetester.certs import create_mongodb_tls_certs from kubetester.kubetester import KubernetesTester -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_permissions_override.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_permissions_override.py index 56bb1a5da..5078fc6fa 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_permissions_override.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_permissions_override.py @@ -1,9 +1,10 @@ from kubetester import find_fixture from kubetester.certs import create_mongodb_tls_certs from kubetester.kubetester import KubernetesTester -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.omtester import get_rs_cert_names from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_preferssl.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_preferssl.py index ca5bde00d..96cce3b46 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_preferssl.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_preferssl.py @@ -2,8 +2,9 @@ from kubetester.certs import ISSUER_CA_NAME, create_mongodb_tls_certs from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "test-tls-base-rs-prefer-ssl" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_replica_set_process_hostnames.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_replica_set_process_hostnames.py index 06e0232b5..a48f528f3 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_replica_set_process_hostnames.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_replica_set_process_hostnames.py @@ -13,8 +13,9 @@ from kubetester.kubetester import assert_statefulset_architecture from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import get_default_architecture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import ( default_external_domain, diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_replicaset_certsSecretPrefix.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_replicaset_certsSecretPrefix.py index ad0597be3..c85292d8c 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_replicaset_certsSecretPrefix.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_replicaset_certsSecretPrefix.py @@ -4,8 +4,9 @@ from kubetester.certs import ISSUER_CA_NAME, create_mongodb_tls_certs from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "test-tls-base-rs-require-ssl" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl.py index 636e6a0e2..12d123314 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl.py @@ -2,8 +2,9 @@ from kubetester.certs import ISSUER_CA_NAME, Certificate, create_mongodb_tls_certs from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "test-tls-base-rs-require-ssl" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_and_disable.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_and_disable.py index 0d9c7070b..dcc0b5543 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_and_disable.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_and_disable.py @@ -1,10 +1,11 @@ import pytest -from kubetester import MongoDB, delete_secret, try_load +from kubetester import delete_secret, try_load from kubetester.certs import ISSUER_CA_NAME, create_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE_NAME = "tls-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_to_allow.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_to_allow.py index 7c337d40f..0f9b8b35c 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_to_allow.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_to_allow.py @@ -1,9 +1,9 @@ -from kubetester import MongoDB from kubetester.certs import create_mongodb_tls_certs from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark MDB_RESOURCE = "test-tls-base-rs-require-ssl" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_upgrade.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_upgrade.py index 027778814..9a98f4f12 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_upgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_requiressl_upgrade.py @@ -3,9 +3,10 @@ from kubetester.kubetester import ensure_ent_version from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ReplicaSetTester from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "test-tls-upgrade" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_additional_certs.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_additional_certs.py index f1c1736f3..a2d6471bf 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_additional_certs.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_additional_certs.py @@ -5,8 +5,9 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE_NAME = "test-tls-additional-domains" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_external_access.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_external_access.py index 37f74607b..48e5f8d2b 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_external_access.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_external_access.py @@ -3,8 +3,9 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase @pytest.fixture(scope="module") diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_external_access_manual_connectivity.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_external_access_manual_connectivity.py index 8316a92fd..692383956 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_external_access_manual_connectivity.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_external_access_manual_connectivity.py @@ -5,8 +5,9 @@ from kubetester.certs import ISSUER_CA_NAME, create_mongodb_tls_certs from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase # This test will set up an environment which will configure a resource with split horizon enabled. diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_intermediate_ca.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_intermediate_ca.py index 68944ef50..bbbebf1c3 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_intermediate_ca.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_rs_intermediate_ca.py @@ -3,8 +3,9 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE_NAME = "test-tls-rs-intermediate-ca" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_sc_additional_certs.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_sc_additional_certs.py index eadfec3b8..5810f096c 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_sc_additional_certs.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_sc_additional_certs.py @@ -6,8 +6,9 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import is_multi_cluster, skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from tests.shardedcluster.conftest import ( enable_multi_cluster_deployment, get_member_cluster_clients_using_cluster_mapping, diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_sc_requiressl_custom_ca.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_sc_requiressl_custom_ca.py index c8c8157fb..d79e795b6 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_sc_requiressl_custom_ca.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_sc_requiressl_custom_ca.py @@ -4,9 +4,10 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import is_multi_cluster, skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ShardedClusterTester from kubetester.operator import Operator +from kubetester.phase import Phase from tests.shardedcluster.conftest import ( enable_multi_cluster_deployment, get_mongos_service_names, diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_sharded_cluster_certs_prefix.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_sharded_cluster_certs_prefix.py index 1b14fd460..1d0823883 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_sharded_cluster_certs_prefix.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_sharded_cluster_certs_prefix.py @@ -4,8 +4,9 @@ from kubetester.kubetester import KubernetesTester, ensure_ent_version from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import is_multi_cluster, skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import central_cluster_client from tests.shardedcluster.conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_configure_all_options_rs.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_configure_all_options_rs.py index f2cdc7b0e..12d6cc888 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_configure_all_options_rs.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_configure_all_options_rs.py @@ -8,8 +8,9 @@ ) from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "test-x509-all-options-rs" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_configure_all_options_sc.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_configure_all_options_sc.py index 3b5c54d4b..a8424e67c 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_configure_all_options_sc.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_configure_all_options_sc.py @@ -7,8 +7,9 @@ rotate_and_assert_certificates, ) from kubetester.kubetester import KubernetesTester, is_multi_cluster -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture from tests import test_logger from tests.shardedcluster.conftest import enable_multi_cluster_deployment diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_rs.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_rs.py index 8f8ff29b6..dc9fbddf5 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_rs.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_rs.py @@ -7,9 +7,10 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ReplicaSetTester from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "test-x509-rs" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_sc.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_sc.py index c2ff55cf7..c54c13704 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_sc.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_sc.py @@ -3,8 +3,9 @@ from kubetester.certs import create_sharded_cluster_certs, create_x509_agent_tls_certs from kubetester.kubetester import fixture as load_fixture from kubetester.kubetester import is_multi_cluster -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.operator import Operator +from kubetester.phase import Phase from tests.shardedcluster.conftest import enable_multi_cluster_deployment MDB_RESOURCE_NAME = "test-x509-sc" diff --git a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_user_connectivity.py b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_user_connectivity.py index 2f4435ca0..8732b5e9a 100644 --- a/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_user_connectivity.py +++ b/docker/mongodb-kubernetes-tests/tests/tls/tls_x509_user_connectivity.py @@ -9,9 +9,10 @@ ) from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as _fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ReplicaSetTester from kubetester.operator import Operator +from kubetester.phase import Phase MDB_RESOURCE = "test-x509-rs" X509_AGENT_SUBJECT = "CN=automation,OU={namespace},O=cert-manager" diff --git a/docker/mongodb-kubernetes-tests/tests/upgrades/appdb_tls_operator_upgrade_v1_32_to_mck.py b/docker/mongodb-kubernetes-tests/tests/upgrades/appdb_tls_operator_upgrade_v1_32_to_mck.py index 479284743..03921d22e 100644 --- a/docker/mongodb-kubernetes-tests/tests/upgrades/appdb_tls_operator_upgrade_v1_32_to_mck.py +++ b/docker/mongodb-kubernetes-tests/tests/upgrades/appdb_tls_operator_upgrade_v1_32_to_mck.py @@ -1,17 +1,17 @@ from kubetester import get_statefulset from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import Phase from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark +from tests.common.cert.cert_issuer import create_appdb_certs from tests.conftest import ( LEGACY_MULTI_CLUSTER_OPERATOR_NAME, LEGACY_OPERATOR_CHART, LEGACY_OPERATOR_IMAGE_NAME, LEGACY_OPERATOR_NAME, MULTI_CLUSTER_OPERATOR_NAME, - create_appdb_certs, get_default_operator, get_multi_cluster_operator, install_official_operator, diff --git a/docker/mongodb-kubernetes-tests/tests/upgrades/meko_mck_upgrade.py b/docker/mongodb-kubernetes-tests/tests/upgrades/meko_mck_upgrade.py index 23f539785..77432c4f2 100644 --- a/docker/mongodb-kubernetes-tests/tests/upgrades/meko_mck_upgrade.py +++ b/docker/mongodb-kubernetes-tests/tests/upgrades/meko_mck_upgrade.py @@ -2,13 +2,15 @@ import kubernetes from kubernetes import client -from kubetester import MongoDB, try_load +from kubetester import try_load from kubetester.certs import create_mongodb_tls_certs from kubetester.helm import helm_uninstall from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase -from kubetester.mongodb_multi import MongoDBMulti, MultiClusterClient +from kubetester.mongodb import MongoDB +from kubetester.mongodb_multi import MongoDBMulti +from kubetester.multicluster_client import MultiClusterClient from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.common.constants import MONGODB_PORT diff --git a/docker/mongodb-kubernetes-tests/tests/upgrades/operator_upgrade_ops_manager.py b/docker/mongodb-kubernetes-tests/tests/upgrades/operator_upgrade_ops_manager.py index 532af4a2a..a9eeca2a3 100644 --- a/docker/mongodb-kubernetes-tests/tests/upgrades/operator_upgrade_ops_manager.py +++ b/docker/mongodb-kubernetes-tests/tests/upgrades/operator_upgrade_ops_manager.py @@ -4,10 +4,11 @@ from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture from kubetester.kubetester import skip_if_local -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import MongoDBBackgroundTester from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from tests.conftest import get_default_operator, operator_installation_config diff --git a/docker/mongodb-kubernetes-tests/tests/upgrades/operator_upgrade_replica_set.py b/docker/mongodb-kubernetes-tests/tests/upgrades/operator_upgrade_replica_set.py index 121291fa0..57289efb3 100644 --- a/docker/mongodb-kubernetes-tests/tests/upgrades/operator_upgrade_replica_set.py +++ b/docker/mongodb-kubernetes-tests/tests/upgrades/operator_upgrade_replica_set.py @@ -1,10 +1,10 @@ -from kubetester import MongoDB from kubetester.certs import create_mongodb_tls_certs from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from tests import test_logger from tests.conftest import get_default_operator diff --git a/docker/mongodb-kubernetes-tests/tests/upgrades/sharded_cluster_operator_upgrade_v1_27_to_mck.py b/docker/mongodb-kubernetes-tests/tests/upgrades/sharded_cluster_operator_upgrade_v1_27_to_mck.py index 9e98bdce7..4ed13d2a9 100644 --- a/docker/mongodb-kubernetes-tests/tests/upgrades/sharded_cluster_operator_upgrade_v1_27_to_mck.py +++ b/docker/mongodb-kubernetes-tests/tests/upgrades/sharded_cluster_operator_upgrade_v1_27_to_mck.py @@ -1,16 +1,21 @@ -from typing import Dict +from typing import Dict, Optional import pytest -from kubetester import read_configmap +from kubeobject import CustomObject +from kubernetes import client +from kubetester import create_or_update_configmap, read_configmap from kubetester.certs import create_sharded_cluster_certs +from kubetester.kubetester import ensure_nested_objects from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongotester import ShardedClusterTester from kubetester.operator import Operator +from kubetester.phase import Phase from tests import test_logger from tests.conftest import ( LEGACY_OPERATOR_NAME, OPERATOR_NAME, + get_central_cluster_client, get_default_operator, install_legacy_deployment_state_meko, log_deployments_info, diff --git a/docker/mongodb-kubernetes-tests/tests/users/users_addition_removal.py b/docker/mongodb-kubernetes-tests/tests/users/users_addition_removal.py index 558707c16..b3b64606d 100644 --- a/docker/mongodb-kubernetes-tests/tests/users/users_addition_removal.py +++ b/docker/mongodb-kubernetes-tests/tests/users/users_addition_removal.py @@ -11,7 +11,8 @@ ) from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB +from kubetester.phase import Phase MDB_RESOURCE = "test-x509-rs" NUM_AGENTS = 2 diff --git a/docker/mongodb-kubernetes-tests/tests/users/users_finalizer.py b/docker/mongodb-kubernetes-tests/tests/users/users_finalizer.py index 55213e060..febf1d9c8 100644 --- a/docker/mongodb-kubernetes-tests/tests/users/users_finalizer.py +++ b/docker/mongodb-kubernetes-tests/tests/users/users_finalizer.py @@ -6,8 +6,9 @@ from kubetester import create_or_update_secret, find_fixture from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser +from kubetester.phase import Phase USER_PASSWORD = "my-password" RESOURCE_NAME = "my-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/users/users_finalizer_removal.py b/docker/mongodb-kubernetes-tests/tests/users/users_finalizer_removal.py index 3761d5f0d..f5f2207a6 100644 --- a/docker/mongodb-kubernetes-tests/tests/users/users_finalizer_removal.py +++ b/docker/mongodb-kubernetes-tests/tests/users/users_finalizer_removal.py @@ -6,8 +6,9 @@ from kubetester import create_or_update_secret, find_fixture from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as load_fixture -from kubetester.mongodb import MongoDB, Phase +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser +from kubetester.phase import Phase USER_PASSWORD = "my-password" RESOURCE_NAME = "my-replica-set" diff --git a/docker/mongodb-kubernetes-tests/tests/vaultintegration/mongodb_deployment_vault.py b/docker/mongodb-kubernetes-tests/tests/vaultintegration/mongodb_deployment_vault.py index 345f5335f..d9dd72b65 100644 --- a/docker/mongodb-kubernetes-tests/tests/vaultintegration/mongodb_deployment_vault.py +++ b/docker/mongodb-kubernetes-tests/tests/vaultintegration/mongodb_deployment_vault.py @@ -6,7 +6,6 @@ from kubernetes import client from kubernetes.client.rest import ApiException from kubetester import ( - MongoDB, create_configmap, delete_secret, get_statefulset, @@ -21,10 +20,11 @@ from kubetester.http import https_endpoint_is_reachable from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.kubetester import is_default_architecture_static -from kubetester.mongodb import Phase, get_pods +from kubetester.kubetester import get_pods, is_default_architecture_static +from kubetester.mongodb import MongoDB from kubetester.mongodb_user import MongoDBUser from kubetester.operator import Operator +from kubetester.phase import Phase from pytest import fixture, mark from ..conftest import DATABASE_SA_NAME, OPERATOR_NAME diff --git a/docker/mongodb-kubernetes-tests/tests/vaultintegration/om_backup_vault.py b/docker/mongodb-kubernetes-tests/tests/vaultintegration/om_backup_vault.py index 47cabe48c..991cd5a82 100644 --- a/docker/mongodb-kubernetes-tests/tests/vaultintegration/om_backup_vault.py +++ b/docker/mongodb-kubernetes-tests/tests/vaultintegration/om_backup_vault.py @@ -17,9 +17,11 @@ from kubetester.http import https_endpoint_is_reachable from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import MongoDB, Phase, get_pods +from kubetester.kubetester import get_pods +from kubetester.mongodb import MongoDB from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from ..conftest import ( diff --git a/docker/mongodb-kubernetes-tests/tests/vaultintegration/om_deployment_vault.py b/docker/mongodb-kubernetes-tests/tests/vaultintegration/om_deployment_vault.py index f8d2cd89c..7d3c87ba6 100644 --- a/docker/mongodb-kubernetes-tests/tests/vaultintegration/om_deployment_vault.py +++ b/docker/mongodb-kubernetes-tests/tests/vaultintegration/om_deployment_vault.py @@ -14,9 +14,10 @@ from kubetester.certs import create_mongodb_tls_certs, create_ops_manager_tls_certs from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.mongodb import Phase, get_pods +from kubetester.kubetester import get_pods from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from ..conftest import APPDB_SA_NAME, OM_SA_NAME, OPERATOR_NAME diff --git a/docker/mongodb-kubernetes-tests/tests/vaultintegration/vault_tls.py b/docker/mongodb-kubernetes-tests/tests/vaultintegration/vault_tls.py index ece8ba03d..86ea083b9 100644 --- a/docker/mongodb-kubernetes-tests/tests/vaultintegration/vault_tls.py +++ b/docker/mongodb-kubernetes-tests/tests/vaultintegration/vault_tls.py @@ -6,10 +6,11 @@ from kubetester.certs import Certificate from kubetester.kubetester import KubernetesTester from kubetester.kubetester import fixture as yaml_fixture -from kubetester.kubetester import is_default_architecture_static -from kubetester.mongodb import MongoDB, Phase, get_pods +from kubetester.kubetester import get_pods, is_default_architecture_static +from kubetester.mongodb import MongoDB from kubetester.operator import Operator from kubetester.opsmanager import MongoDBOpsManager +from kubetester.phase import Phase from pytest import fixture, mark from ..conftest import APPDB_SA_NAME, DATABASE_SA_NAME, OM_SA_NAME, OPERATOR_NAME