Merge pull request #975 from xiaoxichen/prefix

fs/volume_client: exercise the configurable prefix and ns_prefix.

Reviewed-by: John Spray <john.spray@redhat.com>

diff --cc tasks/cephfs/test_volume_client.py
index 57eb4aac4f99bffaac723669b856d06b252dc360,7d358ed7c7ddc70f1940def3265d52ad643272d0..58f62f2807be3d63aaeb1ff03179ed25799e690c
--- 1/tasks/cephfs/test_volume_client.py
--- 2/tasks/cephfs/test_volume_client.py
+++ b/tasks/cephfs/test_volume_client.py
@@@ -11,12 -11,16 +11,16 @@@ log = logging.getLogger(__name__
  
  class TestVolumeClient(CephFSTestCase):
      # One for looking at the global filesystem, one for being
 -    # the VolumeClient, one for mounting the created shares
 -    CLIENTS_REQUIRED = 3
 +    # the VolumeClient, two for mounting the created shares
 +    CLIENTS_REQUIRED = 4
  
-     def _volume_client_python(self, client, script):
+     def _volume_client_python(self, client, script, vol_prefix=None, ns_prefix=None):
          # Can't dedent this *and* the script we pass in, because they might have different
          # levels of indentation to begin with, so leave this string zero-indented
+         if vol_prefix:
+             vol_prefix = "\"" + vol_prefix + "\""
+         if ns_prefix:
+             ns_prefix = "\"" + ns_prefix + "\""
          return client.run_python("""
  from ceph_volume_client import CephFSVolumeClient, VolumePath
  import logging