RGW/test_multi: allow Cluster object to run ceph admin commands

Signed-off-by: Oguzhan Ozmen <oozmen@bloomberg.net>

diff --git a/qa/tasks/rgw_multisite.py b/qa/tasks/rgw_multisite.py
index f93ca017fa2d4d3b7c1f6e390349e9b394c080d7..a4f5dc96a1b958a82034ee882f85233499099fe7 100644 (file)
--- a/qa/tasks/rgw_multisite.py
+++ b/qa/tasks/rgw_multisite.py
@@ -200,6 +200,11 @@ class Cluster(multisite.Cluster):
             assert r == 0
         return s, r
 
+    def ceph_admin(self, args=None, **kwargs):
+        """ ceph command """
+        cluster_manager = self.ctx.managers[self.name]
+        return cluster_manager.raw_cluster_cmd(*args, **kwargs)
+
 class Gateway(multisite.Gateway):
     """ Controls a radosgw instance using its daemon """
     def __init__(self, role, remote, daemon, *args, **kwargs):

diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py
index 77704c01ee5cc1a8b5b57bd87b80b16fd6c534e9..6d60fb1e263fe598d85038d13d9f40b5c0abaedb 100644 (file)
--- a/src/test/rgw/rgw_multi/multisite.py
+++ b/src/test/rgw/rgw_multi/multisite.py
@@ -14,6 +14,10 @@ class Cluster:
         """ execute a radosgw-admin command """
         pass
 
+    def ceph_admin(self, args = None, **kwargs):
+        """ execute a ceph command """
+        pass
+
 class Gateway:
     """ interface to control a single radosgw instance """
     __metaclass__ = ABCMeta

diff --git a/src/test/rgw/test_multi.py b/src/test/rgw/test_multi.py
index 91576c4b64437dcad3e9fa2e0fb26a7a5b6a1bf1..11ef63be4d38ba2a385ffb7a6dad5a92e985dd9d 100644 (file)
--- a/src/test/rgw/test_multi.py
+++ b/src/test/rgw/test_multi.py
@@ -64,6 +64,13 @@ class Cluster(multisite.Cluster):
             cmd += ['--rgw-cache-enabled=false']
         return bash(cmd, **kwargs)
 
+    def ceph_admin(self, args = None, **kwargs):
+        """ ceph command """
+        cmd = [test_path + 'test-rgw-call.sh', 'call_ceph', self.cluster_id]
+        if args:
+            cmd += args
+        return bash(cmd, **kwargs)
+
     def start(self):
         cmd = [mstart_path + 'mstart.sh', self.cluster_id]
         env = None