From: Yuri Weinstein Date: Mon, 19 Sep 2022 15:46:39 +0000 (-0700) Subject: Merge pull request #47769 from neesingh-rh/wip-57263-pacific X-Git-Tag: v16.2.11~321 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=833eb99613daf79e6730c216ee511fcc361d170f;p=ceph.git Merge pull request #47769 from neesingh-rh/wip-57263-pacific pacific: mgr/volumes: Add volume info command Reviewed-by: Neeraj Pratap Singh Reviewed-by: Venky Shankar Reviewed-by: Anthony D'Atri --- 833eb99613daf79e6730c216ee511fcc361d170f diff --cc src/pybind/mgr/volumes/fs/volume.py index 2e83712453bb,8a084f87984d..0420e19942b0 --- 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, 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, \ + 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