From: Ernesto Puerta <37327689+epuertat@users.noreply.github.com> Date: Tue, 14 Jun 2022 09:00:21 +0000 (+0200) Subject: Merge pull request #46407 from melissa-kun-li/disable-create-image X-Git-Tag: v18.0.0~706 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bba174615205f0a29549856baf37c56a46b5317;p=ceph.git Merge pull request #46407 from melissa-kun-li/disable-create-image mgr/dashboard: add rbd status endpoint and error page Reviewed-by: Avan Thakkar Reviewed-by: Ernesto Puerta Reviewed-by: Nizamudeen A Reviewed-by: sunilangadi2 --- 8bba174615205f0a29549856baf37c56a46b5317 diff --cc src/pybind/mgr/dashboard/controllers/rbd.py index 4ffb21e14c7f,245b477150f4..3f362774b020 --- a/src/pybind/mgr/dashboard/controllers/rbd.py +++ b/src/pybind/mgr/dashboard/controllers/rbd.py @@@ -14,13 -15,13 +14,14 @@@ from ..exceptions import DashboardExcep from ..security import Scope from ..services.ceph_service import CephService from ..services.exception import handle_rados_error, handle_rbd_error, serialize_dashboard_exception -from ..services.rbd import RbdConfiguration, RbdMirroringService, RbdService, \ - RbdSnapshotService, format_bitmask, format_features, parse_image_spec, \ - rbd_call, rbd_image_call +from ..services.rbd import MIRROR_IMAGE_MODE, RbdConfiguration, \ + RbdMirroringService, RbdService, RbdSnapshotService, format_bitmask, \ + format_features, get_image_spec, parse_image_spec, rbd_call, \ + rbd_image_call from ..tools import ViewCache, str_to_bool - from . import APIDoc, APIRouter, CreatePermission, DeletePermission, \ - EndpointDoc, RESTController, Task, UpdatePermission, allow_empty_body + from . import APIDoc, APIRouter, BaseController, CreatePermission, \ + DeletePermission, Endpoint, EndpointDoc, ReadPermission, RESTController, \ + Task, UIRouter, UpdatePermission, allow_empty_body logger = logging.getLogger(__name__)