mgr/dashboard: Adding rados ns option into add_ns_req

adding rados ns name option into add ns nvme command.

Signed-off-by: gadi-didi <gadi.didi@ibm.com>

diff --git a/src/pybind/mgr/dashboard/controllers/nvmeof.py b/src/pybind/mgr/dashboard/controllers/nvmeof.py
index 63a4d7fe7207a440e14675b6dde975f44897d346..ae58f94ed8ec29d18f122a872c390fef921db6ed 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/nvmeof.py
+++ b/src/pybind/mgr/dashboard/controllers/nvmeof.py
@@ -557,6 +557,7 @@ else:
             parameters={
                 "nqn": Param(str, "NVMeoF subsystem NQN"),
                 "rbd_image_name": Param(str, "RBD image name"),
+                "rados_namespace": Param(str, "RADOS namespace name", True, None),
                 "rbd_pool": Param(str, "RBD pool name"),
                 "nsid": Param(str, "Create RBD image", True, None),
                 "create_image": Param(bool, "Create RBD image"),
@@ -599,6 +600,7 @@ else:
             read_only: Optional[bool] = False,
             gw_group: Optional[str] = None,
             server_address: Optional[str] = None,
+            rados_namespace: Optional[str] = None,
         ):
             return NVMeoFClient(
                 gw_group=gw_group,
@@ -608,6 +610,7 @@ else:
                     subsystem_nqn=nqn,
                     nsid=int(nsid) if nsid else None,
                     rbd_image_name=rbd_image_name,
+                    rados_namespace_name=rados_namespace,
                     rbd_pool_name=rbd_pool,
                     block_size=block_size,
                     create_image=create_image,
@@ -629,6 +632,7 @@ else:
             parameters={
                 "nqn": Param(str, "NVMeoF subsystem NQN"),
                 "rbd_pool": Param(str, "RBD pool name"),
+                "rados_namespace": Param(str, "RADOS namespace name", True, None),
                 "rbd_image_name": Param(str, "RBD image name"),
                 "create_image": Param(bool, "Create RBD image"),
                 "size": Param(str, "Deprecated. Use `rbd_image_size` instead", True, None),
@@ -670,6 +674,8 @@ else:
             read_only: Optional[bool] = False,
             gw_group: Optional[str] = None,
             server_address: Optional[str] = None,
+            rados_namespace: Optional[str] = None,
+
         ):
             if size and rbd_image_size:
                 raise DashboardException(
@@ -692,6 +698,7 @@ else:
                     subsystem_nqn=nqn,
                     nsid=int(nsid) if nsid else None,
                     rbd_image_name=rbd_image_name,
+                    rados_namespace_name=rados_namespace,
                     rbd_pool_name=rbd_pool,
                     block_size=block_size,
                     create_image=create_image,

diff --git a/src/pybind/mgr/dashboard/model/nvmeof.py b/src/pybind/mgr/dashboard/model/nvmeof.py
index d5dde3cea4c04215680ec3bc09df06954309a4f8..04b0551d21b3775e613892fcd0af5d237be2d6f1 100644 (file)
--- a/src/pybind/mgr/dashboard/model/nvmeof.py
+++ b/src/pybind/mgr/dashboard/model/nvmeof.py
@@ -126,6 +126,7 @@ class NamespaceCreation(NamedTuple):
 class Namespace(NamedTuple):
     bdev_name: str
     rbd_image_name: Annotated[str, CliHeader("RBD Image")]
+    rados_namespace_name: Annotated[Optional[str], CliHeader("RADOS Namespace")]
     rbd_pool_name: Annotated[str, CliHeader("RBD Pool")]
     load_balancing_group: Annotated[int, CliHeader('LB Group')]
     rbd_image_size: Annotated[int, CliFlags.SIZE]

diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml
index fd80d9a14667ecb1f878208b8f0f85183ce1d0dc..d9f3aef504df5a2d3a27b0b6699ae4eab83a14c6 100755 (executable)
--- a/src/pybind/mgr/dashboard/openapi.yaml
+++ b/src/pybind/mgr/dashboard/openapi.yaml
@@ -13557,6 +13557,9 @@ paths:
                 nsid:
                   description: Create RBD image
                   type: string
+                rados_namespace:
+                  description: RADOS namespace name
+                  type: string
                 rbd_image_name:
                   description: RBD image name
                   type: string