]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Add --force flag for listeners 64132/head
authorAfreen Misbah <afreen@ibm.com>
Mon, 16 Jun 2025 15:16:39 +0000 (20:46 +0530)
committerAfreen Misbah <afreen@ibm.com>
Wed, 25 Jun 2025 06:57:22 +0000 (12:27 +0530)
Fixes https://tracker.ceph.com/issues/71685

Signed-off-by: Afreen Misbah <afreen@ibm.com>
(cherry picked from commit 604d351a4e7bbf47baf57e10f67219a2eea919e0)

Conflicts:
        src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts
        src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts

index 539551b5f80e965f5c35f886a3201f08dee4dafb..4421de0ac134aac60402569f735da3ef163953df 100644 (file)
@@ -104,7 +104,10 @@ export class NvmeofListenersListComponent implements OnInit, OnChanges {
     this.modalService.show(DeleteConfirmationModalComponent, {
       itemDescription: 'Listener',
       actionDescription: 'delete',
-      itemNames: [`listener ${listener.host_name} (${listener.traddr}:${listener.trsvcid})`],
+      infoMessage: $localize`This action will delete listener despite any active connections.`,
+      itemNames: [
+        $localize`listener` + ' ' + `${listener.host_name} (${listener.traddr}:${listener.trsvcid})`
+      ],
       submitActionObservable: () =>
         this.taskWrapper.wrapTaskAroundCall({
           task: new FinishedTask('nvmeof/listener/delete', {
index a4a98f29441246142f17ee8b2bb16a985758119a..ceafd6c538613d4703b0cde80ae9461586663a1f 100644 (file)
@@ -104,7 +104,8 @@ export class NvmeofService {
       {
         observe: 'response',
         params: {
-          trsvcid
+          trsvcid,
+          force: 'true'
         }
       }
     );