import ceph 14.2.5

[ceph.git] / ceph / src / pybind / mgr / volumes / fs / subvolspec.py

diff --git a/ceph/src/pybind/mgr/volumes/fs/subvolspec.py b/ceph/src/pybind/mgr/volumes/fs/subvolspec.py
index 60fb6d06af00921861ec3dbe425c6fb3052c685e..6c7df559129671f24b1dcd021c086d64edacc1f0 100644 (file)
--- a/ceph/src/pybind/mgr/volumes/fs/subvolspec.py
+++ b/ceph/src/pybind/mgr/volumes/fs/subvolspec.py
@@ -90,13 +90,25 @@ class SubvolumeSpec(object):
         """
         return the subvolume snapshot path for a given snapshot name
         """
-        return os.path.join(self.subvolume_path, snapdir, snapname)
+        return os.path.join(self.subvolume_path, snapdir.encode('utf-8'), snapname.encode('utf-8'))
+
+    def make_subvol_snapdir_path(self, snapdir):
+        """
+        return the subvolume snapdir path
+        """
+        return os.path.join(self.subvolume_path, snapdir.encode('utf-8'))
 
     def make_group_snap_path(self, snapdir, snapname):
         """
         return the group snapshot path for a given snapshot name
         """
-        return os.path.join(self.group_path, snapdir, snapname)
+        return os.path.join(self.group_path, snapdir.encode('utf-8'), snapname.encode('utf-8'))
+
+    def make_group_snapdir_path(self, snapdir):
+        """
+        return the group's snapdir path
+        """
+        return os.path.join(self.group_path, snapdir.encode('utf-8'))
 
     def __str__(self):
         return "{0}/{1}".format(self.groupid, self.subvolumeid)