From 6e29eebc971194d599c164ce9f4bae355c6967b1 Mon Sep 17 00:00:00 2001 From: Mahesh Shetty Date: Wed, 22 Nov 2023 15:26:13 +0530 Subject: [PATCH] fix up Signed-off-by: Mahesh Shetty --- ocs_ci/ocs/resources/pod.py | 10 ---------- tests/conftest.py | 4 ++-- .../test_mcg_replication_with_disruptions.py | 1 + 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ocs_ci/ocs/resources/pod.py b/ocs_ci/ocs/resources/pod.py index 6eab04fbae14..b8a7f548ce81 100644 --- a/ocs_ci/ocs/resources/pod.py +++ b/ocs_ci/ocs/resources/pod.py @@ -990,16 +990,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 96545fdf711e..f2f1b18400aa 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -56,7 +56,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 ( @@ -7502,7 +7502,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/cross_functional/system_test/test_mcg_replication_with_disruptions.py b/tests/cross_functional/system_test/test_mcg_replication_with_disruptions.py index 3b969abddd22..3e79dc98d9ae 100644 --- a/tests/cross_functional/system_test/test_mcg_replication_with_disruptions.py +++ b/tests/cross_functional/system_test/test_mcg_replication_with_disruptions.py @@ -242,6 +242,7 @@ def test_replication_with_disruptions( @system_test +@magenta_squad @skipif_vsphere_ipi class TestLogBasedReplicationWithDisruptions: def test_log_based_replication_with_disruptions(