]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #46407 from melissa-kun-li/disable-create-image
authorErnesto Puerta <37327689+epuertat@users.noreply.github.com>
Tue, 14 Jun 2022 09:00:21 +0000 (11:00 +0200)
committerGitHub <noreply@github.com>
Tue, 14 Jun 2022 09:00:21 +0000 (11:00 +0200)
mgr/dashboard: add rbd status endpoint and error page

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: sunilangadi2 <NOT@FOUND>
1  2 
src/pybind/mgr/dashboard/controllers/rbd.py
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/block.module.ts
src/pybind/mgr/dashboard/openapi.yaml

index 4ffb21e14c7f081cd98caa6234110510743ee96c,245b477150f45f62878d20d19453dc7b94a23b80..3f362774b02073f65d48808b37ba960fc093facd
@@@ -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__)
  
Simple merge