import ceph 16.2.7

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

diff --git a/ceph/src/pybind/mgr/dashboard/controllers/iscsi.py b/ceph/src/pybind/mgr/dashboard/controllers/iscsi.py
index 687daa91966f7e1db9894cc62c34d061a3f5adaf..9135f5abc8f44a802133c713a40ed394ebe4409c 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/iscsi.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/iscsi.py
@@ -22,9 +22,8 @@ from ..services.iscsi_config import IscsiGatewayDoesNotExist
 from ..services.rbd import format_bitmask
 from ..services.tcmu_service import TcmuService
 from ..tools import TaskManager, str_to_bool
-from . import ApiController, BaseController, ControllerDoc, Endpoint, \
-    EndpointDoc, ReadPermission, RESTController, Task, UiApiController, \
-    UpdatePermission
+from . import APIDoc, APIRouter, BaseController, Endpoint, EndpointDoc, \
+    ReadPermission, RESTController, Task, UIRouter, UpdatePermission
 
 try:
     from typing import Any, Dict, List, no_type_check
@@ -39,7 +38,7 @@ ISCSI_SCHEMA = {
 }
 
 
-@UiApiController('/iscsi', Scope.ISCSI)
+@UIRouter('/iscsi', Scope.ISCSI)
 class IscsiUi(BaseController):
 
     REQUIRED_CEPH_ISCSI_CONFIG_MIN_VERSION = 10
@@ -196,8 +195,8 @@ class IscsiUi(BaseController):
         }
 
 
-@ApiController('/iscsi', Scope.ISCSI)
-@ControllerDoc("Iscsi Management API", "Iscsi")
+@APIRouter('/iscsi', Scope.ISCSI)
+@APIDoc("Iscsi Management API", "Iscsi")
 class Iscsi(BaseController):
     @Endpoint('GET', 'discoveryauth')
     @ReadPermission
@@ -253,8 +252,8 @@ def iscsi_target_task(name, metadata, wait_for=2.0):
     return Task("iscsi/target/{}".format(name), metadata, wait_for)
 
 
-@ApiController('/iscsi/target', Scope.ISCSI)
-@ControllerDoc("Get Iscsi Target Details", "IscsiTarget")
+@APIRouter('/iscsi/target', Scope.ISCSI)
+@APIDoc("Get Iscsi Target Details", "IscsiTarget")
 class IscsiTarget(RESTController):
 
     def list(self):