From: Kefu Chai <kchai@redhat.com>
Date: Sun, 12 Feb 2017 06:12:25 +0000 (+0800)
Subject: tests: CephManager: add get_config() method
X-Git-Tag: v12.0.1~434^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=995e144e3e3ece5fb061c5ce8ba39f2a7c770bc7;p=ceph.git

tests: CephManager: add get_config() method

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index f4d9d509f066..f896a81b96d9 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -1246,7 +1246,7 @@ class CephManager:
             proc = self.admin_socket(service_type, service_id,
                                      args, check_status=False, stdout=stdout)
             if proc.exitstatus is 0:
-                break
+                return proc
             else:
                 tries += 1
                 if (tries * 5) > timeout:
@@ -1270,6 +1270,16 @@ class CephManager:
                 return i
         assert False
 
+    def get_config(self, service_type, service_id, name):
+        """
+        :param node: like 'mon.a'
+        :param name: the option name
+        """
+        proc = self.wait_run_admin_socket(service_type, service_id,
+                                          ['config', 'show'])
+        j = json.loads(proc.stdout.getvalue())
+        return j[name]
+
     def set_config(self, osdnum, **argdict):
         """
         :param osdnum: osd number