From 652d93acd96660fa1359377b2ed32aef0145293d Mon Sep 17 00:00:00 2001 From: Tomer Haskalovitch Date: Thu, 26 Jun 2025 13:00:22 +0300 Subject: [PATCH] mgr/dashboard: migrate nvmeof pr #1335 to new cli Signed-off-by: Tomer Haskalovitch --- src/pybind/mgr/dashboard/controllers/nvmeof.py | 7 +++++-- src/pybind/mgr/dashboard/model/nvmeof.py | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/nvmeof.py b/src/pybind/mgr/dashboard/controllers/nvmeof.py index 2e1553275d5cd..7ae36ebd52d46 100644 --- 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 5bc4edeafd2c2..af9b3bb415cfa 100644 --- a/src/pybind/mgr/dashboard/model/nvmeof.py +++ b/src/pybind/mgr/dashboard/model/nvmeof.py @@ -94,7 +94,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): @@ -186,6 +189,7 @@ class Host(NamedTuple): nqn: str use_psk: Optional[bool] use_dhchap: Optional[bool] + disconnected_due_to_keepalive_timeout: Optional[bool] class HostsInfo(NamedTuple): -- 2.39.5