import 15.2.2 octopus source

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

diff --git a/ceph/src/pybind/mgr/volumes/fs/volume.py b/ceph/src/pybind/mgr/volumes/fs/volume.py
index 2f2d4e20e55b65407d0466686ec9ddbd5f2293bd..5568d8b588dceb41f8538a3e6538db6030e27e2e 100644 (file)
--- a/ceph/src/pybind/mgr/volumes/fs/volume.py
+++ b/ceph/src/pybind/mgr/volumes/fs/volume.py
@@ -211,6 +211,29 @@ class VolumeClient(object):
             ret = self.volume_exception_to_retval(ve)
         return ret
 
+    def subvolume_info(self, **kwargs):
+        ret        = None
+        volname    = kwargs['vol_name']
+        subvolname = kwargs['sub_name']
+        groupname  = kwargs['group_name']
+
+        try:
+            with open_volume(self, volname) as fs_handle:
+                with open_group(fs_handle, self.volspec, groupname) as group:
+                    with open_subvol(fs_handle, self.volspec, group, subvolname) as subvolume:
+                        mon_addr_lst = []
+                        mon_map_mons = self.mgr.get('mon_map')['mons']
+                        for mon in mon_map_mons:
+                            ip_port = mon['addr'].split("/")[0]
+                            mon_addr_lst.append(ip_port)
+
+                        subvol_info_dict = subvolume.info()
+                        subvol_info_dict["mon_addrs"] = mon_addr_lst
+                        ret = 0, json.dumps(subvol_info_dict, indent=4, sort_keys=True), ""
+        except VolumeException as ve:
+            ret = self.volume_exception_to_retval(ve)
+        return ret
+
     def list_subvolumes(self, **kwargs):
         ret        = 0, "", ""
         volname    = kwargs['vol_name']