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>

diff --cc qa/tasks/cephfs/test_volumes.py
Simple merge

diff --cc src/pybind/mgr/volumes/fs/subvolspec.py
index 56c5128a54cd503007ceee203994cc9e49202e4a,d00c1e4b1352b77feb87e1be599356cc6638118a..6c7df559129671f24b1dcd021c086d64edacc1f0
--- 1/src/pybind/mgr/volumes/fs/subvolspec.py
--- 2/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/fs/volume.py
Simple merge

diff --cc src/pybind/mgr/volumes/module.py
index 5de353ca6800468df952606bdff74017f835ec87,e44574c85773df09469f7c8bcec2f8d32a03beb7..0e710cfd5fc46c9a2d883dafdfc360ea8a2ccdb1
--- 1/src/pybind/mgr/volumes/module.py
--- 2/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 '