From 92237ee48467c7a2d03772592194cc059699ed63 Mon Sep 17 00:00:00 2001 From: Gil Bregman Date: Tue, 5 May 2026 11:53:25 +0300 Subject: [PATCH] mgr/dashboard: Allow empty port value when adding a listener in NVMEoF CLI Fixes: https://tracker.ceph.com/issues/76410 Signed-off-by: Gil Bregman --- src/pybind/mgr/dashboard/controllers/nvmeof.py | 10 +++++----- src/pybind/mgr/dashboard/openapi.yaml | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/nvmeof.py b/src/pybind/mgr/dashboard/controllers/nvmeof.py index 7f58db0b0564..794d6e4b5774 100644 --- a/src/pybind/mgr/dashboard/controllers/nvmeof.py +++ b/src/pybind/mgr/dashboard/controllers/nvmeof.py @@ -855,7 +855,7 @@ else: "nqn": Param(str, "NVMeoF subsystem NQN"), "host_name": Param(str, "NVMeoF hostname"), "traddr": Param(str, "NVMeoF transport address"), - "trsvcid": Param(int, "NVMeoF transport service port", True, 4420), + "trsvcid": Param(int, "NVMeoF transport service port", True, None), "adrfam": Param(int, "NVMeoF address family (0 - IPv4, 1 - IPv6)", True, 0), "gw_group": Param(str, "NVMeoF gateway group", True, None), "server_address": Param(str, "NVMeoF gateway address", True, None), @@ -873,7 +873,7 @@ else: nqn: str, host_name: str, traddr: str, - trsvcid: int = 4420, + trsvcid: Optional[int] = None, adrfam: int = 0, # IPv4, gw_group: Optional[str] = None, server_address: Optional[str] = None, @@ -889,7 +889,7 @@ else: nqn=nqn, host_name=host_name, traddr=traddr, - trsvcid=int(trsvcid), + trsvcid=int(trsvcid) if trsvcid is not None else None, adrfam=int(adrfam), secure=str_to_bool(secure), verify_host_name=str_to_bool(verify_host_name), @@ -917,7 +917,7 @@ else: "nqn": Param(str, "NVMeoF subsystem NQN"), "host_name": Param(str, "NVMeoF hostname"), "traddr": Param(str, "NVMeoF transport address"), - "trsvcid": Param(int, "NVMeoF transport service port", True, 4420), + "trsvcid": Param(int, "NVMeoF transport service port"), "adrfam": Param(int, "NVMeoF address family (0 - IPv4, 1 - IPv6)", True, 0), "gw_group": Param(str, "NVMeoF gateway group", True, None), "server_address": Param(str, "NVMeoF gateway address", True, None), @@ -930,7 +930,7 @@ else: nqn: str, host_name: str, traddr: str, - trsvcid: int = 4420, + trsvcid: int, adrfam: int = 0, # IPv4 force: bool = False, gw_group: Optional[str] = None, diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml index a43c312b4e67..d0c4476e3be6 100644 --- a/src/pybind/mgr/dashboard/openapi.yaml +++ b/src/pybind/mgr/dashboard/openapi.yaml @@ -14004,7 +14004,6 @@ paths: description: NVMeoF transport address type: string trsvcid: - default: 4420 description: NVMeoF transport service port type: integer verify_host_name: @@ -14049,7 +14048,7 @@ paths: summary: Create a new NVMeoF listener tags: - NVMe-oF Subsystem Listener - /api/nvmeof/subsystem/{nqn}/listener/{host_name}/{traddr}: + /api/nvmeof/subsystem/{nqn}/listener/{host_name}/{traddr}/{trsvcid}: delete: parameters: - description: NVMeoF subsystem NQN @@ -14070,10 +14069,10 @@ paths: required: true schema: type: string - - default: 4420 - description: NVMeoF transport service port - in: query + - description: NVMeoF transport service port + in: path name: trsvcid + required: true schema: type: integer - default: 0 -- 2.47.3