Skip to content

Commit 74e5df8

Browse files
authored
Merge pull request ceph#64133 from afreen23/wip-71809-tentacle
tentacle: mgr/dashboard: Add --force flag for listeners Reviewed-by: Aashish Sharma <[email protected]>
2 parents 6d91294 + 3e8e6c6 commit 74e5df8

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ export class NvmeofListenersListComponent implements OnInit {
102102
this.modalService.show(DeleteConfirmationModalComponent, {
103103
itemDescription: $localize`Listener`,
104104
actionDescription: 'delete',
105+
infoMessage: $localize`This action will delete listener despite any active connections.`,
105106
itemNames: [
106107
$localize`listener` + ' ' + `${listener.host_name} (${listener.traddr}:${listener.trsvcid})`
107108
],

src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ describe('NvmeofService', () => {
133133
.deleteListener(mockNQN, mockGroupName, request.host_name, request.traddr, request.trsvcid)
134134
.subscribe();
135135
const req = httpTesting.expectOne(
136-
`${API_PATH}/subsystem/${mockNQN}/listener/${request.host_name}/${request.traddr}?gw_group=${mockGroupName}&trsvcid=${request.trsvcid}`
136+
`${API_PATH}/subsystem/${mockNQN}/listener/${request.host_name}/${request.traddr}?gw_group=${mockGroupName}&trsvcid=${request.trsvcid}&force=true`
137137
);
138138
expect(req.request.method).toBe('DELETE');
139139
});

src/pybind/mgr/dashboard/frontend/src/app/shared/api/nvmeof.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ export class NvmeofService {
159159
observe: 'response',
160160
params: {
161161
gw_group: group,
162-
trsvcid
162+
trsvcid,
163+
force: 'true'
163164
}
164165
}
165166
);

0 commit comments

Comments
 (0)