]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: add 'options' parameter support for write_local_config
authorXiubo Li <xiubli@redhat.com>
Tue, 31 Jan 2023 13:58:39 +0000 (21:58 +0800)
committerXiubo Li <xiubli@redhat.com>
Tue, 21 Feb 2023 04:41:33 +0000 (12:41 +0800)
This will allow the fscrypt test case to add dedicated options.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
qa/tasks/cephfs/xfstests_dev.py

index a032272df2775634f5ed65a3f3831f5f14d6cd2d..f606f645ef22806902e58d9e61bf862a38e1b0c7 100644 (file)
@@ -163,7 +163,9 @@ class XFSTestsDev(CephFSTestCase):
                                              '123456-fsgqa'], omit_sudo=False,
                                        check_status=False)
 
-    def write_local_config(self):
+    def write_local_config(self, options=None):
+        _options = '' if not options else ',' + options
+
         mon_sock = self.fs.mon_manager.get_msgrv1_mon_socks()[0]
         self.test_dev = mon_sock + ':/' + self.test_dirname
         self.scratch_dev = mon_sock + ':/' + self.scratch_dirname
@@ -174,9 +176,9 @@ class XFSTestsDev(CephFSTestCase):
             export TEST_DIR={}
             export SCRATCH_DEV={}
             export SCRATCH_MNT={}
-            export CEPHFS_MOUNT_OPTIONS="-o name=admin,secret={}"
+            export CEPHFS_MOUNT_OPTIONS="-o name=admin,secret={}{}"
             ''').format(self.test_dev, self.test_dirs_mount_path, self.scratch_dev,
-                        self.scratch_dirs_mount_path, self.get_admin_key())
+                        self.scratch_dirs_mount_path, self.get_admin_key(), _options)
 
         self.mount_a.client_remote.write_file(join(self.xfstests_repo_path, 'local.config'),
                                               xfstests_config_contents, sudo=True)