]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: fix QA failure related to client_config 47726/head
authorNeeraj Pratap Singh <neesingh@redhat.com>
Thu, 13 Oct 2022 16:24:46 +0000 (21:54 +0530)
committerNeeraj Pratap Singh <Neeraj.Pratap.Singh1@ibm.com>
Wed, 11 Jan 2023 13:22:18 +0000 (18:52 +0530)
Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
qa/tasks/cephfs/kernel_mount.py
qa/tasks/cephfs/test_snap_schedules.py

index fbcfc775c0f98b52efa3d6779d489893a06ee5fc..faf0aa19b86f04af8df0050abb1de867e4f299b0 100644 (file)
@@ -28,6 +28,7 @@ class KernelMount(CephFSMount):
             client_keyring_path=client_keyring_path, hostfs_mntpt=hostfs_mntpt,
             cephfs_name=cephfs_name, cephfs_mntpt=cephfs_mntpt, brxnet=brxnet)
 
+        self.client_config = config
         self.rbytes = config.get('rbytes', False)
         self.snapdirname = config.get('snapdirname', '.snap')
         self.inst = None
index aa285820db96702a3c41df39736e7589c57c31d1..f3899d82273d98ed5c482f3009a24ef05bb7a6d2 100644 (file)
@@ -463,7 +463,7 @@ class TestSnapSchedulesSnapdir(TestSnapSchedulesHelper):
         from tasks.cephfs.kernel_mount import KernelMount
 
         if isinstance(self.mount_a, KernelMount):
-            sdn = self.mount_a.config.get('snapdirname', '.snap')
+            sdn = self.mount_a.client_config.get('snapdirname', '.snap')
         elif isinstance(self.mount_a, FuseMount):
             sdn = self.mount_a.client_config.get('client_snapdir', '.snap')
             self.fs.set_ceph_conf('client', 'client snapdir', sdn)