From: Venky Shankar Date: Tue, 23 Aug 2022 16:03:09 +0000 (+0530) Subject: Merge pull request #45949 from neesingh-rh/feature-51434 X-Git-Tag: v18.0.0~187 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1ca282f60029a551b09180a86ac262a7a68866d;p=ceph.git Merge pull request #45949 from neesingh-rh/feature-51434 mgr/volumes: Add volume info command Reviewed-by: Venky Shankar Reviewed-by: Ramana Raja Reviewed-by: Anthony D'Atri Reviewed-by: Jos Collin Reviewed-by: Nikhilkumar Shelke --- d1ca282f60029a551b09180a86ac262a7a68866d diff --cc src/pybind/mgr/volumes/fs/volume.py index cfc7480d6b77,b45a70fdaed7..335d76a809ab --- a/src/pybind/mgr/volumes/fs/volume.py +++ b/src/pybind/mgr/volumes/fs/volume.py @@@ -8,12 -7,12 +8,12 @@@ import cephf from mgr_util import CephfsClient -from .fs_util import listdir +from .fs_util import listdir, has_subdir - from .operations.volume import create_volume, \ - delete_volume, rename_volume, list_volumes, open_volume, get_pool_names from .operations.group import open_group, create_group, remove_group, \ open_group_unique, set_group_attrs + from .operations.volume import create_volume, delete_volume, rename_volume, \ + list_volumes, open_volume, get_pool_names, get_pool_ids, get_pending_subvol_deletions_count from .operations.subvolume import open_subvol, create_subvol, remove_subvol, \ create_clone from .operations.trash import Trash