mgr/dashboard: migrate nvmeof pr #1335 to new cli

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>
(cherry picked from commit 652d93acd96660fa1359377b2ed32aef0145293d)

diff --git a/src/pybind/mgr/dashboard/controllers/nvmeof.py b/src/pybind/mgr/dashboard/controllers/nvmeof.py
index ef3a5b0c30afba7de1b7c705d43a11baab37c98c..921a1a418b233f3da0ff34ce3c0fe8c5541953e8 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/nvmeof.py
+++ b/src/pybind/mgr/dashboard/controllers/nvmeof.py
@@ -862,6 +862,8 @@ else:
             "List all allowed hosts for an NVMeoF subsystem",
             parameters={
                 "nqn": Param(str, "NVMeoF subsystem NQN"),
+                "clear_alerts": Param(bool, "Clear any host alert signal after getting its value",
+                                      True, False),
                 "gw_group": Param(str, "NVMeoF gateway group", True, None),
             },
         )
@@ -869,9 +871,10 @@ else:
         @NvmeofCLICommand("nvmeof host list", model.HostsInfo)
         @convert_to_model(model.HostsInfo, finalize=_update_hosts)
         @handle_nvmeof_error
-        def list(self, nqn: str, gw_group: Optional[str] = None, traddr: Optional[str] = None):
+        def list(self, nqn: str, clear_alerts: Optional[bool], 
+                 gw_group: Optional[str] = None, traddr: Optional[str] = None):
             return NVMeoFClient(gw_group=gw_group, traddr=traddr).stub.list_hosts(
-                NVMeoFClient.pb2.list_hosts_req(subsystem=nqn)
+                NVMeoFClient.pb2.list_hosts_req(subsystem=nqn, clear_alerts=clear_alerts)
             )
 
         @EndpointDoc(

diff --git a/src/pybind/mgr/dashboard/model/nvmeof.py b/src/pybind/mgr/dashboard/model/nvmeof.py
index a8e1a8d2fb7c28304fa4f13578de25f94dc5e492..58bb3b1e9e175eb81c3e9221aec81441556938c6 100644 (file)
--- a/src/pybind/mgr/dashboard/model/nvmeof.py
+++ b/src/pybind/mgr/dashboard/model/nvmeof.py
@@ -88,7 +88,10 @@ class Connection(NamedTuple):
     connected: bool
     qpairs_count: int
     controller_id: int
+    use_psk: Optional[bool]
+    use_dhchap: Optional[bool]
     subsystem: Optional[str]
+    disconnected_due_to_keepalive_timeout: Optional[bool]
 
 
 class ConnectionList(NamedTuple):
@@ -181,6 +184,7 @@ class Host(NamedTuple):
     nqn: str
     use_psk: Optional[bool]
     use_dhchap: Optional[bool]
+    disconnected_due_to_keepalive_timeout: Optional[bool]
 
 
 class HostsInfo(NamedTuple):