From: Rishabh Dave <ridave@redhat.com>
Date: Fri, 30 Jul 2021 16:12:21 +0000 (+0530)
Subject: qa/ceph_manager: minor refactor
X-Git-Tag: v17.1.0~995^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4101f76ed6534f8202264ccf45a279f99bc50f77;p=ceph.git

qa/ceph_manager: minor refactor

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>
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index abab7261407d..15ed5d08b97f 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -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',