From 07a2ca13afa58855eb0bf43c595d6d7a446cefe7 Mon Sep 17 00:00:00 2001 From: Akarsha Rai Date: Tue, 10 Sep 2024 18:19:13 +0530 Subject: [PATCH] Fix test: test_ceph_manager_stopped (#10428) Signed-off-by: Akarsha-rai --- tests/functional/monitoring/conftest.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/functional/monitoring/conftest.py b/tests/functional/monitoring/conftest.py index 22f5a8e1a12..33aacc2ab03 100644 --- a/tests/functional/monitoring/conftest.py +++ b/tests/functional/monitoring/conftest.py @@ -50,7 +50,6 @@ def measure_stop_ceph_mgr(measurement_dir, threading_lock): threading_lock=threading_lock, ) mgr_deployments = oc.get(selector=constants.MGR_APP_LABEL)["items"] - mgr = mgr_deployments[0]["metadata"]["name"] def stop_mgr(): """ @@ -67,12 +66,14 @@ def stop_mgr(): # run_time of operation run_time = 60 * 7 nonlocal oc - nonlocal mgr - logger.info(f"Downscaling deployment {mgr} to 0") - oc.exec_oc_cmd(f"scale --replicas=0 deployment/{mgr}") + nonlocal mgr_deployments + for mgr_deployment in mgr_deployments: + mgr = mgr_deployment["metadata"]["name"] + logger.info(f"Downscaling deployment {mgr} to 0") + oc.exec_oc_cmd(f"scale --replicas=0 deployment/{mgr}") logger.info(f"Waiting for {run_time} seconds") time.sleep(run_time) - return oc.get(mgr) + return mgr_deployments test_file = os.path.join(measurement_dir, "measure_stop_ceph_mgr.json") if config.ENV_DATA["platform"].lower() in constants.MANAGED_SERVICE_PLATFORMS: @@ -89,9 +90,10 @@ def stop_mgr(): measured_op = measure_operation( stop_mgr, test_file, threading_lock=threading_lock ) - logger.info(f"Upscaling deployment {mgr} back to 1") - oc.exec_oc_cmd(f"scale --replicas=1 deployment/{mgr}") - + for mgr_deployment in mgr_deployments: + mgr = mgr_deployment["metadata"]["name"] + logger.info(f"Upscaling deployment {mgr} back to 1") + oc.exec_oc_cmd(f"scale --replicas=1 deployment/{mgr}") # wait for ceph to return into HEALTH_OK state after mgr deployment # is returned back to normal ceph_health_check(tries=20, delay=15)