mgr/dashboard: Add EC pools support to NVMEoF CLI

Fixes: https://tracker.ceph.com/issues/76937
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>

diff --git a/src/pybind/mgr/dashboard/controllers/nvmeof.py b/src/pybind/mgr/dashboard/controllers/nvmeof.py
index 794d6e4b5774b0ae9d05de280e0db1490bb29d22..d6f7628803c3390f53ca9aad6f93116f322b0090 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/nvmeof.py
+++ b/src/pybind/mgr/dashboard/controllers/nvmeof.py
@@ -1054,6 +1054,7 @@ else:
                 "rbd_image_name": Param(str, "RBD image name"),
                 "rados_namespace": Param(str, "RADOS namespace name", True, None),
                 "rbd_pool": Param(str, "RBD pool name"),
+                "rbd_data_pool": Param(str, "RBD data pool name", True, None),
                 "nsid": Param(str, "Create RBD image", True, None),
                 "create_image": Param(bool, "Create RBD image"),
                 "size": Param(int, "Deprecated. Use `rbd_image_size` instead"),
@@ -1095,6 +1096,7 @@ else:
             nqn: str,
             rbd_image_name: str,
             rbd_pool: str = "rbd",
+            rbd_data_pool: Optional[str] = None,
             nsid: Optional[str] = None,
             create_image: Optional[bool] = False,
             size: Optional[int] = None,
@@ -1144,6 +1146,7 @@ else:
                     rbd_image_name=rbd_image_name,
                     rados_namespace_name=rados_namespace,
                     rbd_pool_name=rbd_pool,
+                    rbd_data_pool_name=rbd_data_pool,
                     block_size=block_size,
                     create_image=create_image,
                     size=rbd_image_size or size,
@@ -1170,6 +1173,7 @@ else:
             parameters={
                 "nqn": Param(str, "NVMeoF subsystem NQN"),
                 "rbd_pool": Param(str, "RBD pool name"),
+                "rbd_data_pool": Param(str, "RBD data pool name", True, None),
                 "rados_namespace": Param(str, "RADOS namespace name", True, None),
                 "rbd_image_name": Param(str, "RBD image name"),
                 "create_image": Param(bool, "Create RBD image"),
@@ -1212,6 +1216,7 @@ else:
             nqn: str,
             rbd_image_name: str,
             rbd_pool: str = "rbd",
+            rbd_data_pool: Optional[str] = None,
             nsid: Optional[str] = None,
             create_image: Optional[bool] = False,
             size: Optional[str] = None,
@@ -1276,6 +1281,7 @@ else:
                     rbd_image_name=rbd_image_name,
                     rados_namespace_name=rados_namespace,
                     rbd_pool_name=rbd_pool,
+                    rbd_data_pool_name=rbd_data_pool,
                     block_size=block_size,
                     create_image=create_image,
                     size=rbd_image_size_b or size_b,

diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml
index 55c2591ec95d0b540b40c8045e17e1cfec50699f..3f6af30b57de64a4b85f48b9378b5a4b8739b303 100644 (file)
--- a/src/pybind/mgr/dashboard/openapi.yaml
+++ b/src/pybind/mgr/dashboard/openapi.yaml
@@ -14245,6 +14245,9 @@ paths:
                 rados_namespace:
                   description: RADOS namespace name
                   type: string
+                rbd_data_pool:
+                  description: RBD data pool name
+                  type: string
                 rbd_image_name:
                   description: RBD image name
                   type: string