diff --git a/ocs_ci/ocs/resources/pod.py b/ocs_ci/ocs/resources/pod.py index 19e2f1fb4be9..738b314cf324 100644 --- a/ocs_ci/ocs/resources/pod.py +++ b/ocs_ci/ocs/resources/pod.py @@ -943,16 +943,6 @@ def get_noobaa_endpoint_pods(): return noobaa_endpoint_pods -def get_noobaa_db_pod(): - - noobaa_db = get_pods_having_label( - label=constants.NOOBAA_DB_LABEL_47_AND_ABOVE, - namespace=config.ENV_DATA["cluster_namespace"], - ) - nb_db_pods = [Pod(**pod) for pod in noobaa_db] - return nb_db_pods[0] - - def get_odf_operator_controller_manager( ocs_label=constants.ODF_OPERATOR_CONTROL_MANAGER_LABEL, namespace=None ): diff --git a/tests/conftest.py b/tests/conftest.py index 57c5626bbcd7..c39263174ee9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -55,7 +55,7 @@ from ocs_ci.ocs.ocp import OCP from ocs_ci.ocs.resources import pvc from ocs_ci.ocs.resources.bucket_policy import gen_bucket_policy -from ocs_ci.ocs.resources.mcg_replication_policy import LogBasedReplicationPolicy +from ocs_ci.ocs.resources.mcg_replication_policy import AwsLogBasedReplicationPolicy from ocs_ci.ocs.resources.mockup_bucket_logger import MockupBucketLogger from ocs_ci.ocs.scale_lib import FioPodScale from ocs_ci.ocs.utils import ( @@ -7003,7 +7003,7 @@ def factory(bucketclass_dict=None): platform=constants.AWS_PLATFORM, region=constants.DEFAULT_AWS_REGION, ) - replication_policy = LogBasedReplicationPolicy( + replication_policy = AwsLogBasedReplicationPolicy( destination_bucket=target_bucket.name, sync_deletions=True, logs_bucket=mockup_logger.logs_bucket_uls_name, diff --git a/tests/e2e/system_test/test_mcg_replication_with_disruptions.py b/tests/e2e/system_test/test_mcg_replication_with_disruptions.py index 833e7dbb1e72..fb1f66a6ce6c 100644 --- a/tests/e2e/system_test/test_mcg_replication_with_disruptions.py +++ b/tests/e2e/system_test/test_mcg_replication_with_disruptions.py @@ -241,6 +241,7 @@ def test_replication_with_disruptions( @system_test +@magenta_squad @skipif_vsphere_ipi class TestLogBasedReplicationWithDisruptions: def test_log_based_replication_with_disruptions(