<span>-</span>
}
</ng-template>
+
+
import { CephSharedModule } from '~/app/ceph/shared/ceph-shared.module';
import { CoreModule } from '~/app/core/core.module';
import { HostService } from '~/app/shared/api/host.service';
+import { CephServiceService } from '~/app/shared/api/ceph-service.service';
import { NvmeofService } from '~/app/shared/api/nvmeof.service';
import { OrchestratorService } from '~/app/shared/api/orchestrator.service';
+import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component';
+import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum';
import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context';
import { CdTableSelection } from '~/app/shared/models/cd-table-selection';
import { HostStatus } from '~/app/shared/enum/host-status.enum';
import { Permissions } from '~/app/shared/models/permissions';
import { AuthStorageService } from '~/app/shared/services/auth-storage.service';
+import { ModalCdsService } from '~/app/shared/services/modal-cds.service';
+import { NotificationService } from '~/app/shared/services/notification.service';
+import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
import { SharedModule } from '~/app/shared/shared.module';
import { configureTestBed } from '~/testing/unit-test-helper';
import { TagModule } from 'carbon-components-angular';
let hostService: HostService;
let orchService: OrchestratorService;
let nvmeofService: NvmeofService;
+ let cephServiceService: CephServiceService;
+ let modalService: ModalCdsService;
+ let taskWrapperService: TaskWrapperService;
const fakeAuthStorageService = {
getPermissions: () => {
data: { mode: 'selector' }
}
}
- }
+ },
+ ModalCdsService,
+ CephServiceService,
+ TaskWrapperService,
+ NotificationService
]
});
hostService = TestBed.inject(HostService);
orchService = TestBed.inject(OrchestratorService);
nvmeofService = TestBed.inject(NvmeofService);
+ cephServiceService = TestBed.inject(CephServiceService);
+ modalService = TestBed.inject(ModalCdsService);
+ taskWrapperService = TestBed.inject(TaskWrapperService);
});
it('should create', () => {
component.ngOnInit();
expect(component.selectionType).toBe('single');
});
+
+ it('should remove gateway', () => {
+ spyOn(modalService, 'show').and.callFake((_component, options) => {
+ options.submitActionObservable();
+ return undefined;
+ });
+ const updateSpy = spyOn(cephServiceService, 'update').and.returnValue(of(null));
+ component.serviceSpec = {
+ service_name: 'nvmeof.group1',
+ placement: {
+ hosts: ['host1', 'host2']
+ }
+ } as any;
+ component.selection.selected = [{ hostname: 'host1' }] as any;
+
+ component.removeGateway();
+
+ expect(modalService.show).toHaveBeenCalledWith(DeleteConfirmationModalComponent, {
+ itemDescription: 'gateway node',
+ itemNames: ['host1'],
+ actionDescription: 'remove',
+ hideDefaultWarning: true,
+ impact: DeletionImpact.high,
+
+ bodyContext: {
+ deletionMessage:
+ 'Removing <strong>host1</strong> will detach it from the gateway group and stop handling new I/O requests. Active connections may be disrupted.<br><br>You can re-add this node later if required.'
+ },
+ submitActionObservable: jasmine.any(Function)
+ });
+
+ const call = (modalService.show as jasmine.Spy).calls.mostRecent().args[1]
+ .submitActionObservable;
+ spyOn(taskWrapperService, 'wrapTaskAroundCall').and.callFake((args: any) => args.call);
+ call();
+
+ expect(taskWrapperService.wrapTaskAroundCall).toHaveBeenCalledWith({
+ task: jasmine.objectContaining({
+ name: 'nvmeof/gateway-node/delete',
+ metadata: {
+ hostname: 'host1'
+ }
+ }),
+ call: jasmine.any(Object)
+ });
+ expect(updateSpy).toHaveBeenCalledWith({
+ service_name: 'nvmeof.group1',
+ placement: {
+ hosts: ['host2']
+ }
+ });
+ });
});
ViewChild
} from '@angular/core';
import { ActivatedRoute } from '@angular/router';
-import { Observable, Subject, Subscription } from 'rxjs';
-import { finalize } from 'rxjs/operators';
+import { Observable, Subject, Subscription, of } from 'rxjs';
+import { catchError, finalize, tap } from 'rxjs/operators';
+
+import _ from 'lodash';
import { TableComponent } from '~/app/shared/datatable/table/table.component';
import { HostStatus } from '~/app/shared/enum/host-status.enum';
import { Host } from '~/app/shared/models/host.interface';
import { CephServiceSpec } from '~/app/shared/models/service.interface';
import { AuthStorageService } from '~/app/shared/services/auth-storage.service';
+import { CephServiceService } from '~/app/shared/api/ceph-service.service';
import { NvmeofService } from '~/app/shared/api/nvmeof.service';
import { ModalCdsService } from '~/app/shared/services/modal-cds.service';
import { NvmeofGatewayNodeAddModalComponent } from './nvmeof-gateway-node-add-modal/nvmeof-gateway-node-add-modal.component';
+import { DeleteConfirmationModalComponent } from '~/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component';
+import { DeletionImpact } from '~/app/shared/enum/delete-confirmation-modal-impact.enum';
+import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
+import { FinishedTask } from '~/app/shared/models/finished-task';
+import { NotificationService } from '~/app/shared/services/notification.service';
+import { NotificationType } from '~/app/shared/enum/notification-type.enum';
@Component({
selector: 'cd-nvmeof-gateway-node',
constructor(
private authStorageService: AuthStorageService,
private nvmeofService: NvmeofService,
+ private cephServiceService: CephServiceService,
+ private modalService: ModalCdsService,
private route: ActivatedRoute,
- private modalService: ModalCdsService
+ private taskWrapper: TaskWrapperService,
+ private notificationService: NotificationService
) {
this.permission = this.authStorageService.getPermissions().nvmeof;
}
}
removeGateway(): void {
- // TODO
+ const hostname = this.selection.first().hostname;
+ this.modalService.show(DeleteConfirmationModalComponent, {
+ itemDescription: $localize`gateway node`,
+ itemNames: [hostname],
+ actionDescription: $localize`remove`,
+ hideDefaultWarning: true,
+ impact: DeletionImpact.high,
+ bodyContext: {
+ deletionMessage: $localize`Removing <strong>${hostname}</strong> will detach it from the gateway group and stop handling new I/O requests. Active connections may be disrupted.<br><br>You can re-add this node later if required.`
+ },
+ submitActionObservable: () => {
+ const updatedSpec = _.cloneDeep(this.serviceSpec);
+ updatedSpec.placement.hosts = updatedSpec.placement.hosts.filter((h) => h !== hostname);
+ delete updatedSpec.status;
+ if (updatedSpec['events']) {
+ delete updatedSpec['events'];
+ }
+ return this.taskWrapper
+ .wrapTaskAroundCall({
+ task: new FinishedTask('nvmeof/gateway-node/delete', {
+ hostname: hostname
+ }),
+ call: this.cephServiceService.update(updatedSpec)
+ })
+ .pipe(
+ tap(() => {
+ this.table.refreshBtn();
+ }),
+ catchError((error) => {
+ this.table.refreshBtn();
+ this.notificationService.show(
+ NotificationType.error,
+ $localize`Failed to remove gateway node ${hostname}. ${error.message}`
+ );
+ return of(null);
+ })
+ );
+ }
+ });
}
ngOnDestroy(): void {
}
</p>
<ng-template #labelTemplate>
- <span i18n>Type <strong>{{ itemNames[0] }}</strong> to confirm (required)</span>
+ <span i18n
+ class="cds--type-label-01">Type <strong>{{ itemNames[0] }}</strong> to confirm (required)</span>
</ng-template>
<cds-text-label [labelTemplate]="labelTemplate"
labelInputID="resource_name"
<h2 class="cds--type-heading-03"
cdsModalHeaderHeading
i18n>
- Confirm delete
+ Confirm {{ actionDescription }}
</h2>
} @else {
<h3 cdsModalHeaderHeading
public submitActionObservable?: () => Observable<any>,
@Optional()
@Inject('callBackAtionObservable')
- public callBackAtionObservable?: () => Observable<any>
+ public callBackAtionObservable?: () => Observable<any>,
+ @Optional() @Inject('hideDefaultWarning') public hideDefaultWarning?: boolean
) {
super();
this.actionDescription = actionDescription || 'delete';
disableForm?: boolean;
inputLabel?: string;
inputPlaceholder?: string;
+ deletionMessage?: string;
}
'nvmeof/gateway/node/add': this.newTaskMessage(this.commonOperations.add, (metadata) =>
this.nvmeofGatewayNode(metadata)
),
+ 'nvmeof/gateway-node/delete': this.newTaskMessage(
+ this.commonOperations.remove,
+ (metadata) => $localize`gateway node '${metadata.hostname}'`
+ ),
'nvmeof/subsystem/create': this.newTaskMessage(this.commonOperations.create, (metadata) =>
this.nvmeofSubsystem(metadata)
),
projects / ceph-ci.git / commitdiff