mgr/dashboard: align response of subsystem add and ns add with old cli

Signed-off-by: Tomer Haskalovitch <il033030@Tomers-MBP.lan>
(cherry picked from commit 512f2133bd746094bd1cecd9d1e897b79ec3dd6d)
Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>

diff --git a/src/pybind/mgr/dashboard/controllers/nvmeof.py b/src/pybind/mgr/dashboard/controllers/nvmeof.py
index a0e1fb9404f88ff85a29a0ab5ca82bf262125667..effb746741eea5059a72d1584da0b33d4c90f2b2 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/nvmeof.py
+++ b/src/pybind/mgr/dashboard/controllers/nvmeof.py
@@ -177,7 +177,7 @@ else:
         )
         @empty_response
         @NvmeofCLICommand("nvmeof subsystem add", model.RequestStatus)
-        @convert_to_model(model.RequestStatus)
+        @convert_to_model(model.SubsystemStatus)
         @handle_nvmeof_error
         def create(self, nqn: str, enable_ha: bool = True, max_namespaces: int = 1024,
                    gw_group: Optional[str] = None, traddr: Optional[str] = None):
@@ -384,7 +384,7 @@ else:
             nqn: str,
             rbd_image_name: str,
             rbd_pool: str = "rbd",
-            create_image: Optional[bool] = True,
+            create_image: Optional[bool] = False,
             size: Optional[int] = 1024,
             rbd_image_size: Optional[int] = None,
             trash_image: Optional[bool] = False,

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-form/nvmeof-namespaces-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-form/nvmeof-namespaces-form.component.spec.ts
index 5227f28dd03c9a229a6f6673a9be070e8e204233..28612801c55e2b5d040bf5158fb4d1315226fe3b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-form/nvmeof-namespaces-form.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-form/nvmeof-namespaces-form.component.spec.ts
@@ -121,6 +121,7 @@ describe('NvmeofNamespacesFormComponent', () => {
         gw_group: MOCK_GROUP,
         rbd_image_name: `nvme_rbd_default_${MOCK_RANDOM_STRING}`,
         rbd_pool: 'rbd',
+        create_image: true,
         rbd_image_size: 1073741824
       });
     });

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-form/nvmeof-namespaces-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-form/nvmeof-namespaces-form.component.ts
index d2a136f31198128fcbf16db02ea4c29063e0f46d..c6d459fa741325046f41311d4a4516c2c58caa79 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-form/nvmeof-namespaces-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-form/nvmeof-namespaces-form.component.ts
@@ -152,7 +152,8 @@ export class NvmeofNamespacesFormComponent implements OnInit {
       const request: NamespaceCreateRequest = {
         gw_group: this.group,
         rbd_image_name: `nvme_${pool}_${this.group}_${this.randomString()}`,
-        rbd_pool: pool
+        rbd_pool: pool,
+        create_image: true
       };
       if (rbdImageSize) {
         request['rbd_image_size'] = rbdImageSize;

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.spec.ts
index 861d49008b1d0235aca54811d67170846cdff4ee..ccecea5f0205db9aad076796b4a767e57465ed67 100755 (executable)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.spec.ts
@@ -160,6 +160,7 @@ describe('NvmeofService', () => {
         rbd_image_name: 'nvme_ns_image:12345678',
         rbd_pool: 'rbd',
         rbd_image_size: 1024,
+        create_image: true,
         gw_group: mockGroupName
       };
       service.createNamespace(mockNQN, mockNamespaceObj).subscribe();

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts
index e6905e62d1b8101949cb180152dca249c37f4115..3c6a75d26aeeeac61f1dc964011928517049f371 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts
@@ -30,6 +30,7 @@ export type NamespaceCreateRequest = NvmeofRequest & {
   rbd_image_name: string;
   rbd_pool: string;
   rbd_image_size?: number;
+  create_image: boolean;
 };
 
 export type NamespaceUpdateRequest = NvmeofRequest & {

diff --git a/src/pybind/mgr/dashboard/model/nvmeof.py b/src/pybind/mgr/dashboard/model/nvmeof.py
index 0c3cf4c7907d76ab66d8f1bf52e3959ef23c9f8b..00ef36280dc4f808d9e8d36a8295f42d8218fcd4 100644 (file)
--- a/src/pybind/mgr/dashboard/model/nvmeof.py
+++ b/src/pybind/mgr/dashboard/model/nvmeof.py
@@ -80,6 +80,12 @@ class SubsystemList(NamedTuple):
     subsystems: Annotated[List[Subsystem], CliFlags.EXCLUSIVE_LIST]
 
 
+class SubsystemStatus(NamedTuple):
+    status: int
+    error_message: str
+    nqn: str
+
+
 class Connection(NamedTuple):
     traddr: str
     trsvcid: int

diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml
index df071682e26fecc35d0416df11cb91a492c5762a..939b2a5fd20eaa77e9e19f2efd3c2745a0c3f9fe 100755 (executable)
--- a/src/pybind/mgr/dashboard/openapi.yaml
+++ b/src/pybind/mgr/dashboard/openapi.yaml
@@ -9082,7 +9082,7 @@ paths:
                   description: NVMeoF namespace block size
                   type: integer
                 create_image:
-                  default: true
+                  default: false
                   description: Create RBD image
                   type: boolean
                 force: