From: Rishabh Dave <ridave@redhat.com>
Date: Sun, 30 Jul 2023 17:27:37 +0000 (+0530)
Subject: qa/cephfs: CephFSTestCase.create_client() must keyring
X-Git-Tag: v17.2.8~234^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f2892df2ddfed3f7e9c27523fe237e2b13db425;p=ceph.git

qa/cephfs: CephFSTestCase.create_client() must keyring

Replace call to run_ceph_cmd() by call to get_ceph_cmd_stdout() in
method qa.tasks.cephfs.cephfs_test_case.CephFSTestCase.create_client().
run_ceph_cmd() will not return keyring which is wrong.
get_ceph_cmd_stdout() will return the stdout of "ceph auth add"
command, which is the keyring that is expected to be returned by
CephFSTestCase.create_client().

Fixes: https://tracker.ceph.com/issues/62246
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit c9058dc7a57530df592b9945d36cf71459946f4f)

Conflicts:
* qa/tasks/cephfs/cephfs_test_case.py
  Conflict occurred because class RunCephCmd hasn't been backported.
  This PR is getting it done - https://github.com/ceph/ceph/pull/54946.
---

diff --git a/qa/tasks/cephfs/cephfs_test_case.py b/qa/tasks/cephfs/cephfs_test_case.py
index f26b598aa09..dea8a310e31 100644
--- a/qa/tasks/cephfs/cephfs_test_case.py
+++ b/qa/tasks/cephfs/cephfs_test_case.py
@@ -425,4 +425,4 @@ class CephFSTestCase(CephTestCase):
             cmd += ['mds', mdscap]
 
         self.run_ceph_cmd(*cmd)
-        return self.run_ceph_cmd(f'auth get {self.client_name}')
+        return self.get_ceph_cmd_stdout(f'auth get {self.client_name}')