From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 14 Nov 2019 17:37:22 +0000 (-0800)
Subject: Merge PR #30827 into nautilus
X-Git-Tag: v14.2.5~80
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8541e60f59d3804475aa7b9268d10d446a933363;p=ceph.git

Merge PR #30827 into nautilus

* refs/pull/30827/head:
	qa/tasks: tests for ls
	mgr/volumes: list FS subvolumes, subvolume groups and their snapshots

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

8541e60f59d3804475aa7b9268d10d446a933363
diff --cc src/pybind/mgr/volumes/fs/subvolspec.py
index 56c5128a54c,d00c1e4b135..6c7df559129
--- a/src/pybind/mgr/volumes/fs/subvolspec.py
+++ b/src/pybind/mgr/volumes/fs/subvolspec.py
@@@ -90,13 -90,25 +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)
diff --cc src/pybind/mgr/volumes/module.py
index 5de353ca680,e44574c8577..0e710cfd5fc
--- a/src/pybind/mgr/volumes/module.py
+++ b/src/pybind/mgr/volumes/module.py
@@@ -37,11 -37,16 +37,17 @@@ class Module(orchestrator.OrchestratorC
          },
          {
              'cmd': 'fs volume rm '
 -                   'name=vol_name,type=CephString',
 -            'desc': "Delete a CephFS volume",
 +                   'name=vol_name,type=CephString '
 +                   'name=yes-i-really-mean-it,type=CephString,req=false ',
 +            'desc': "Delete a FS volume by passing --yes-i-really-mean-it flag",
              'perm': 'rw'
          },
+         {
+             'cmd': 'fs subvolumegroup ls '
+             'name=vol_name,type=CephString ',
+             'desc': "List subvolumegroups",
+             'perm': 'r'
+         },
          {
              'cmd': 'fs subvolumegroup create '
                     'name=vol_name,type=CephString '