mgr/dashboard: add get_subsystem nvme command

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>

diff --git a/src/pybind/mgr/dashboard/controllers/nvmeof.py b/src/pybind/mgr/dashboard/controllers/nvmeof.py
index 1d04b75b5292dc87b9dc2c162c14c06d497eb820..27479c40aa1320672606aa6eb3ca51057120075a 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/nvmeof.py
+++ b/src/pybind/mgr/dashboard/controllers/nvmeof.py
@@ -310,6 +310,14 @@ else:
                 )
             )
 
+        @NvmeofCLICommand("nvmeof get_subsystems", model.GetSubsystems)
+        @convert_to_model(model.GetSubsystems)
+        @handle_nvmeof_error
+        def get_subsystems(self, gw_group: Optional[str] = None, traddr: Optional[str] = None):
+            return NVMeoFClient(gw_group=gw_group, traddr=traddr).stub.get_subsystems(
+                NVMeoFClient.pb2.get_subsystems_req()
+            )
+
     @APIRouter("/nvmeof/subsystem/{nqn}/listener", Scope.NVME_OF)
     @APIDoc("NVMe-oF Subsystem Listener Management API", "NVMe-oF Subsystem Listener")
     class NVMeoFListener(RESTController):

diff --git a/src/pybind/mgr/dashboard/model/nvmeof.py b/src/pybind/mgr/dashboard/model/nvmeof.py
index 18526675cd7b9167a127ee9c8add34b83a7d0feb..0c98fd92248acb6223dcd02aa70c16a99f79c5b9 100644 (file)
--- a/src/pybind/mgr/dashboard/model/nvmeof.py
+++ b/src/pybind/mgr/dashboard/model/nvmeof.py
@@ -266,3 +266,19 @@ class GatewayListenersInfo(NamedTuple):
 class RequestStatus(NamedTuple):
     status: Annotated[int, CliFlags.EXCLUSIVE_RESULT]
     error_message: str
+
+
+class Subsystem(NamedTuple):
+    nqn: str
+    subtype: str
+    allow_any_host: bool
+    serial_number: Optional[str]
+    model_number: Optional[str]
+    max_namespaces: Optional[int]
+    min_cntlid: Optional[int]
+    max_cntlid: Optional[int]
+    has_dhchap_key: Optional[bool]
+
+
+class GetSubsystems(NamedTuple):
+    subsystems: List[Subsystem]

diff --git a/src/pybind/mgr/dashboard/services/nvmeof_client.py b/src/pybind/mgr/dashboard/services/nvmeof_client.py
index 8916cfbf10e41c516ef6eb96941118e875233828..bc10d553ac9930c1908298a1cf8bb299b474c3cf 100644 (file)
--- a/src/pybind/mgr/dashboard/services/nvmeof_client.py
+++ b/src/pybind/mgr/dashboard/services/nvmeof_client.py
@@ -111,11 +111,14 @@ else:
                     component="nvmeof",
                 )
 
-            if response.status != 0:
+            status = getattr(response, "status", None)
+            error_message = getattr(response, "error_message", None)
+        
+            if status not in (None, 0):
                 raise DashboardException(
-                    msg=response.error_message,
-                    code=response.status,
-                    http_status_code=NVMeoFError2HTTP.get(response.status, 400),
+                    msg=error_message or "NVMeoF operation failed",
+                    code=status,
+                    http_status_code=NVMeoFError2HTTP.get(status, 400),
                     component="nvmeof",
                 )
             return response