From: Neha Ojha <nojha@redhat.com>
Date: Wed, 12 Jun 2019 00:33:53 +0000 (+0000)
Subject: qa/tasks/cbt.py: add support for client_endpoints
X-Git-Tag: v15.1.0~2457^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=143c1da2d28186fe11e616bcb41d1699367f4659;p=ceph.git

qa/tasks/cbt.py: add support for client_endpoints

Note that this will only work for librbdfio for now.

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/qa/tasks/cbt.py b/qa/tasks/cbt.py
index 9f8520f8cc53..e3f35a5b35ba 100644
--- a/qa/tasks/cbt.py
+++ b/qa/tasks/cbt.py
@@ -46,9 +46,9 @@ class CBT(Task):
 
         benchmark_config = self.config.get('benchmarks')
         benchmark_type = benchmark_config.keys()[0]
-        if benchmark_type == 'librbdfio':
+        if benchmark_type in ['librbdfio', 'fio']:
           testdir = misc.get_testdir(self.ctx)
-          benchmark_config['librbdfio']['cmd_path'] = os.path.join(testdir, 'fio/fio')
+          benchmark_config[benchmark_type]['cmd_path'] = os.path.join(testdir, 'fio/fio')
         if benchmark_type == 'cosbench':
             # create cosbench_dir and cosbench_xml_dir
             testdir = misc.get_testdir(self.ctx)
@@ -62,10 +62,12 @@ class CBT(Task):
             ips = [host for (host, port) in
                    (remote.ssh.get_transport().getpeername() for (remote, role_list) in remotes_and_roles)]
             benchmark_config['cosbench']['auth'] = "username=cosbench:operator;password=intel2012;url=http://%s:80/auth/v1.0;retry=9" %(ips[0])
+        client_endpoints_config = self.config.get('client_endpoints', None)
 
         return dict(
             cluster=cluster_config,
             benchmarks=benchmark_config,
+            client_endpoints = client_endpoints_config,
             )
 
     def install_dependencies(self):
@@ -82,7 +84,7 @@ class CBT(Task):
         benchmark_type = self.cbt_config.get('benchmarks').keys()[0]
         self.log.info('benchmark: %s', benchmark_type)
 
-        if benchmark_type == 'librbdfio':
+        if benchmark_type in ['librbdfio', 'fio']:
             # install fio
             testdir = misc.get_testdir(self.ctx)
             self.first_mon.run(
@@ -226,7 +228,7 @@ class CBT(Task):
             ]
         )
         benchmark_type = self.cbt_config.get('benchmarks').keys()[0]
-        if benchmark_type == 'librbdfio':
+        if benchmark_type in ['librbdfio', 'fio']:
             self.first_mon.run(
                 args=[
                     'rm', '--one-file-system', '-rf', '--',