RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/dashboard: Prevent clone when layering not enabled on pare… (#29317)

Browse Source 
mgr/dashboard: Prevent clone when layering not enabled on parent image

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
This commit is contained in:
Lenz Grimmer 2019-08-08 14:38:58 +02:00 committed by GitHub
commit 6d5939f8d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html
View File

@ -118,6 +118,7 @@
<tab i18n-heading
heading="Snapshots">
<cd-rbd-snapshot-list [snapshots]="selectedItem.snapshots"
[featuresName]="selectedItem.features_name"
[poolName]="selectedItem.pool_name"
[rbdName]="selectedItem.name"></cd-rbd-snapshot-list>
</tab>

14
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts
View File

@ -1,4 +1,5 @@
import { I18n } from '@ngx-translate/i18n-polyfill';
import * as _ from 'lodash';
import { ActionLabelsI18n } from '../../../shared/constants/app.constants';
import { Icons } from '../../../shared/enum/icons.enum';
@ -18,7 +19,7 @@ export class RbdSnapshotActionsModel {
deleteSnap: CdTableAction;
ordering: CdTableAction[];
constructor(i18n: I18n, actionLabels: ActionLabelsI18n) {
constructor(i18n: I18n, actionLabels: ActionLabelsI18n, featuresName: string[]) {
this.i18n = i18n;
this.create = {
@ -49,7 +50,10 @@ export class RbdSnapshotActionsModel {
permission: 'create',
canBePrimary: (selection: CdTableSelection) => selection.hasSingleSelection,
disable: (selection: CdTableSelection) =>
!selection.hasSingleSelection || selection.first().cdExecuting,
!selection.hasSingleSelection ||
selection.first().cdExecuting ||
!_.isUndefined(this.getCloneDisableDesc(featuresName)),
disableDesc: () => this.getCloneDisableDesc(featuresName),
icon: Icons.clone,
name: actionLabels.CLONE
};
@ -87,4 +91,10 @@ export class RbdSnapshotActionsModel {
this.deleteSnap
];
}
getCloneDisableDesc(featuresName: string[]): string | undefined {
if (!featuresName.includes('layering')) {
return this.i18n('Parent image must support Layering');
}
}
}

1
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts
View File

@ -64,6 +64,7 @@ describe('RbdSnapshotListComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(RbdSnapshotListComponent);
component = fixture.componentInstance;
component.ngOnChanges();
summaryService = TestBed.get(SummaryService);
});

33
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts
View File

@ -37,6 +37,8 @@ export class RbdSnapshotListComponent implements OnInit, OnChanges {
@Input()
snapshots: RbdSnapshotModel[] = [];
@Input()
featuresName: string[];
@Input()
poolName: string;
@Input()
rbdName: string;
@ -79,21 +81,6 @@ export class RbdSnapshotListComponent implements OnInit, OnChanges {
private actionLabels: ActionLabelsI18n
) {
this.permission = this.authStorageService.getPermissions().rbdImage;
const actions = new RbdSnapshotActionsModel(this.i18n, this.actionLabels);
actions.create.click = () => this.openCreateSnapshotModal();
actions.rename.click = () => this.openEditSnapshotModal();
actions.protect.click = () => this.toggleProtection();
actions.unprotect.click = () => this.toggleProtection();
const getImageUri = () =>
this.selection.first() &&
`${encodeURIComponent(this.poolName)}/${encodeURIComponent(
this.rbdName
)}/${encodeURIComponent(this.selection.first().name)}`;
actions.clone.routerLink = () => `/block/rbd/clone/${getImageUri()}`;
actions.copy.routerLink = () => `/block/rbd/copy/${getImageUri()}`;
actions.rollback.click = () => this.rollbackModal();
actions.deleteSnap.click = () => this.deleteSnapshotModal();
this.tableActions = actions.ordering;
}
ngOnInit() {
@ -135,6 +122,22 @@ export class RbdSnapshotListComponent implements OnInit, OnChanges {
}
ngOnChanges() {
const actions = new RbdSnapshotActionsModel(this.i18n, this.actionLabels, this.featuresName);
actions.create.click = () => this.openCreateSnapshotModal();
actions.rename.click = () => this.openEditSnapshotModal();
actions.protect.click = () => this.toggleProtection();
actions.unprotect.click = () => this.toggleProtection();
const getImageUri = () =>
this.selection.first() &&
`${encodeURIComponent(this.poolName)}/${encodeURIComponent(
this.rbdName
)}/${encodeURIComponent(this.selection.first().name)}`;
actions.clone.routerLink = () => `/block/rbd/clone/${getImageUri()}`;
actions.copy.routerLink = () => `/block/rbd/copy/${getImageUri()}`;
actions.rollback.click = () => this.rollbackModal();
actions.deleteSnap.click = () => this.deleteSnapshotModal();
this.tableActions = actions.ordering;
const itemFilter = (entry, task) => {
return entry.name === task.metadata['snapshot_name'];
};