]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
tasks/cephfs: make FuseMount.admin_socket public
authorJohn Spray <john.spray@redhat.com>
Thu, 21 Jan 2016 12:18:48 +0000 (12:18 +0000)
committerJohn Spray <john.spray@redhat.com>
Wed, 10 Feb 2016 12:22:05 +0000 (12:22 +0000)
For tests that specifically want to exercise an
asok operation (the test is responsible for
verifying that its mount object really is a
FuseMount and not a KernelMount)

Signed-off-by: John Spray <john.spray@redhat.com>
tasks/cephfs/fuse_mount.py

index 8440bfbdf716f7c3ec8593d4c2c439cf544b1108..e6631b547a615a577abcdc7c054e55087b2ad139 100644 (file)
@@ -335,7 +335,7 @@ class FuseMount(CephFSMount):
     def _prefix(self):
         return ""
 
-    def _admin_socket(self, args):
+    def admin_socket(self, args):
         pyscript = """
 import glob
 import re
@@ -380,21 +380,21 @@ print find_socket("{client_name}")
         Look up the CephFS client ID for this mount
         """
 
-        return self._admin_socket(['mds_sessions'])['id']
+        return self.admin_socket(['mds_sessions'])['id']
 
     def get_osd_epoch(self):
         """
         Return 2-tuple of osd_epoch, osd_epoch_barrier
         """
-        status = self._admin_socket(['status'])
+        status = self.admin_socket(['status'])
         return status['osd_epoch'], status['osd_epoch_barrier']
 
     def get_dentry_count(self):
         """
         Return 2-tuple of dentry_count, dentry_pinned_count
         """
-        status = self._admin_socket(['status'])
+        status = self.admin_socket(['status'])
         return status['dentry_count'], status['dentry_pinned_count']
 
     def set_cache_size(self, size):
-        return self._admin_socket(['config', 'set', 'client_cache_size', str(size)])
+        return self.admin_socket(['config', 'set', 'client_cache_size', str(size)])