mgr/dashboard: add nsid param to ns list command

Resolves: rhbz#2394006

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

diff --git a/src/pybind/mgr/dashboard/controllers/nvmeof.py b/src/pybind/mgr/dashboard/controllers/nvmeof.py
index 405b8299e8fe9ab8173cd8070b9bb2cb3e0d9b14..237fa2933431227b4cd7ba1420d0312e8ad739bf 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/nvmeof.py
+++ b/src/pybind/mgr/dashboard/controllers/nvmeof.py
@@ -379,14 +379,17 @@ else:
             "List all NVMeoF namespaces in a subsystem",
             parameters={
                 "nqn": Param(str, "NVMeoF subsystem NQN"),
+                "nsid": Param(str, "NVMeoF Namespace ID to filter by", True, None),
                 "gw_group": Param(str, "NVMeoF gateway group", True, None),
             },
         )
         @convert_to_model(model.NamespaceList)
         @handle_nvmeof_error
-        def list(self, nqn: str, gw_group: Optional[str] = None, traddr: Optional[str] = None):
+        def list(self, nqn: str, nsid: Optional[str] = None,
+                 gw_group: Optional[str] = None, traddr: Optional[str] = None):
             return NVMeoFClient(gw_group=gw_group, traddr=traddr).stub.list_namespaces(
-                NVMeoFClient.pb2.list_namespaces_req(subsystem=nqn)
+                NVMeoFClient.pb2.list_namespaces_req(subsystem=nqn,
+                                                     nsid=int(nsid) if nsid else None)
             )
 
         @pick("namespaces", first=True)

diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml
index 4dc04eb22b91248682b1a5dad1d605cb48079790..71459ee0d330739e5029eb88eb0c22f54023db05 100755 (executable)
--- a/src/pybind/mgr/dashboard/openapi.yaml
+++ b/src/pybind/mgr/dashboard/openapi.yaml
@@ -9729,6 +9729,12 @@ paths:
         required: true
         schema:
           type: string
+      - allowEmptyValue: true
+        description: NVMeoF Namespace ID to filter by
+        in: query
+        name: nsid
+        schema:
+          type: string
       - allowEmptyValue: true
         description: NVMeoF gateway group
         in: query