import ceph 16.2.7

[ceph.git] / ceph / src / pybind / mgr / dashboard / controllers / pool.py

diff --git a/ceph/src/pybind/mgr/dashboard/controllers/pool.py b/ceph/src/pybind/mgr/dashboard/controllers/pool.py
index 32ec6c198f8799476cefca9ff9331f7dcb2e90cb..3ad1aa95f6d6841515a0a2801c61ae862001b926 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/pool.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/pool.py
@@ -12,8 +12,8 @@ from ..services.ceph_service import CephService
 from ..services.exception import handle_send_command_error
 from ..services.rbd import RbdConfiguration
 from ..tools import TaskManager, str_to_bool
-from . import ApiController, ControllerDoc, Endpoint, EndpointDoc, \
-    ReadPermission, RESTController, Task, UiApiController
+from . import APIDoc, APIRouter, Endpoint, EndpointDoc, ReadPermission, \
+    RESTController, Task, UIRouter
 
 POOL_SCHEMA = ([{
     "pool": (int, "pool id"),
@@ -90,8 +90,8 @@ def pool_task(name, metadata, wait_for=2.0):
     return Task("pool/{}".format(name), metadata, wait_for)
 
 
-@ApiController('/pool', Scope.POOL)
-@ControllerDoc("Get pool details by pool name", "Pool")
+@APIRouter('/pool', Scope.POOL)
+@APIDoc("Get pool details by pool name", "Pool")
 class Pool(RESTController):
 
     @staticmethod
@@ -284,8 +284,8 @@ class Pool(RESTController):
         return RbdConfiguration(pool_name).list()
 
 
-@UiApiController('/pool', Scope.POOL)
-@ControllerDoc("Dashboard UI helper function; not part of the public API", "PoolUi")
+@UIRouter('/pool', Scope.POOL)
+@APIDoc("Dashboard UI helper function; not part of the public API", "PoolUi")
 class PoolUi(Pool):
     @Endpoint()
     @ReadPermission