From: Venky Shankar <vshankar@redhat.com>
Date: Mon, 2 Aug 2021 04:24:05 +0000 (-0400)
Subject: test: adjust mirroring tests for `daemon status` change
X-Git-Tag: v17.1.0~876^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11b61b4fb91f731ee1d04cc545bfa4937e844bb5;p=ceph.git

test: adjust mirroring tests for `daemon status` change

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---

diff --git a/qa/tasks/cephfs/test_mirroring.py b/qa/tasks/cephfs/test_mirroring.py
index c3c746a1dff3..91f07fdf4011 100644
--- a/qa/tasks/cephfs/test_mirroring.py
+++ b/qa/tasks/cephfs/test_mirroring.py
@@ -237,8 +237,8 @@ class TestMirroring(CephFSTestCase):
         log.debug(f'command returned={res}')
         return json.loads(res)
 
-    def get_mirror_daemon_status(self, fs_name, fs_id):
-        daemon_status = json.loads(self.mgr_cluster.mon_manager.raw_cluster_cmd("fs", "snapshot", "mirror", "daemon", "status", fs_name))
+    def get_mirror_daemon_status(self):
+        daemon_status = json.loads(self.mgr_cluster.mon_manager.raw_cluster_cmd("fs", "snapshot", "mirror", "daemon", "status"))
         log.debug(f'daemon_status: {daemon_status}')
         # running a single mirror daemon is supported
         status = daemon_status[0]
@@ -657,7 +657,7 @@ class TestMirroring(CephFSTestCase):
         self.peer_add(self.primary_fs_name, self.primary_fs_id, "client.mirror_remote@ceph", self.secondary_fs_name)
 
         time.sleep(30)
-        status = self.get_mirror_daemon_status(self.primary_fs_name, self.primary_fs_id)
+        status = self.get_mirror_daemon_status()
 
         # assumption for this test: mirroring enabled for a single filesystem w/ single
         # peer
@@ -673,7 +673,7 @@ class TestMirroring(CephFSTestCase):
         self.add_directory(self.primary_fs_name, self.primary_fs_id, '/d0')
 
         time.sleep(120)
-        status = self.get_mirror_daemon_status(self.primary_fs_name, self.primary_fs_id)
+        status = self.get_mirror_daemon_status()
         # we added one
         peer = status['filesystems'][0]['peers'][0]
         self.assertEquals(status['filesystems'][0]['directory_count'], 1)
@@ -685,7 +685,7 @@ class TestMirroring(CephFSTestCase):
         self.mount_a.run_shell(["mkdir", "d0"])
 
         time.sleep(120)
-        status = self.get_mirror_daemon_status(self.primary_fs_name, self.primary_fs_id)
+        status = self.get_mirror_daemon_status()
         peer = status['filesystems'][0]['peers'][0]
         self.assertEquals(status['filesystems'][0]['directory_count'], 1)
         # failure and recovery count should be reflected