From 5d5cf5b42250d9107c6d20dbefadbb8700eb1e9c Mon Sep 17 00:00:00 2001 From: Afreen Misbah Date: Tue, 18 Feb 2025 16:54:19 +0530 Subject: [PATCH] mgr/dashboard: Make API backward compatible with size param change - We changed the api with size and now its an issue for other folks utilizing the API - Hence making it compatible to work backwards as well Fixes https://tracker.ceph.com/issues/70020 Signed-off-by: Afreen Misbah --- src/pybind/mgr/dashboard/controllers/nvmeof.py | 6 ++++-- src/pybind/mgr/dashboard/openapi.yaml | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/nvmeof.py b/src/pybind/mgr/dashboard/controllers/nvmeof.py index a1af3948d6d..4ae3f79ed30 100644 --- a/src/pybind/mgr/dashboard/controllers/nvmeof.py +++ b/src/pybind/mgr/dashboard/controllers/nvmeof.py @@ -340,6 +340,7 @@ else: "rbd_pool": Param(str, "RBD pool name"), "rbd_image_name": Param(str, "RBD image name"), "create_image": Param(bool, "Create RBD image"), + "size": Param(int, "RBD image size"), "rbd_image_size": Param(int, "RBD image size"), "block_size": Param(int, "NVMeoF namespace block size"), "load_balancing_group": Param(int, "Load balancing group"), @@ -355,7 +356,8 @@ else: rbd_image_name: str, rbd_pool: str = "rbd", create_image: Optional[bool] = True, - rbd_image_size: Optional[int] = 1024, + size: Optional[int] = 1024, + rbd_image_size: Optional[int] = None, block_size: int = 512, load_balancing_group: Optional[int] = None, gw_group: Optional[str] = None, @@ -367,7 +369,7 @@ else: rbd_pool_name=rbd_pool, block_size=block_size, create_image=create_image, - size=rbd_image_size, + size=rbd_image_size or size, anagrpid=load_balancing_group, ) ) diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml index c4fb7fc9465..f30490e73c2 100644 --- a/src/pybind/mgr/dashboard/openapi.yaml +++ b/src/pybind/mgr/dashboard/openapi.yaml @@ -9013,13 +9013,16 @@ paths: description: RBD image name type: string rbd_image_size: - default: 1024 description: RBD image size type: integer rbd_pool: default: rbd description: RBD pool name type: string + size: + default: 1024 + description: RBD image size + type: integer required: - rbd_image_name type: object -- 2.39.5