]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/ceph_manager: minor refactor
authorRishabh Dave <ridave@redhat.com>
Fri, 30 Jul 2021 16:12:21 +0000 (21:42 +0530)
committerRishabh Dave <ridave@redhat.com>
Mon, 2 Aug 2021 04:37:23 +0000 (10:07 +0530)
Save the return value of method "teuthology.get_testdir()" instead of
calling it repeatedly in the same class.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
qa/tasks/ceph_manager.py

index abab7261407d47b4a1b7a8e17b3a173116c5c007..15ed5d08b97f18e9db7342280dea8f1ab4238b7f 100644 (file)
@@ -1528,6 +1528,7 @@ class CephManager:
             self.log = tmp
         if self.config is None:
             self.config = dict()
+        self.testdir = teuthology.get_testdir(self.ctx)
         pools = self.list_pools()
         self.pools = {}
         for pool in pools:
@@ -1569,9 +1570,8 @@ class CephManager:
                            stdout=StringIO(),
                            check_status=kwargs.get('check_status', True))
 
-        testdir = teuthology.get_testdir(self.ctx)
         prefix = ['sudo', 'adjust-ulimits', 'ceph-coverage',
-                  f'{testdir}/archive/coverage', 'timeout', '120', 'ceph',
+                  f'{self.testdir}/archive/coverage', 'timeout', '120', 'ceph',
                   '--cluster', self.cluster]
         kwargs['args'] = prefix + list(kwargs['args'])
         return self.controller.run(**kwargs)
@@ -1717,11 +1717,10 @@ class CephManager:
         if remote is None:
             remote = self.controller
 
-        testdir = teuthology.get_testdir(self.ctx)
         pre = [
             'adjust-ulimits',
             'ceph-coverage',
-            '{tdir}/archive/coverage'.format(tdir=testdir),
+           f'{self.testdir}/archive/coverage',
             'rados',
             '--cluster',
             self.cluster,
@@ -1833,12 +1832,11 @@ class CephManager:
         if self.rook:
             assert False, 'not implemented'
 
-        testdir = teuthology.get_testdir(self.ctx)
         args = [
             'sudo',
             'adjust-ulimits',
             'ceph-coverage',
-            '{tdir}/archive/coverage'.format(tdir=testdir),
+           f'{self.testdir}/archive/coverage',
             'timeout',
             str(timeout),
             'ceph',