return f'Subvolume {subvol_name} created successfully'
+ def set(self, vol_name: str, subvol_name: str, size: str):
+ if size:
+ error_code, _, err = mgr.remote('volumes', '_cmd_fs_subvolume_resize', None, {
+ 'vol_name': vol_name, 'sub_name': subvol_name, 'new_size': size})
+ if error_code != 0:
+ raise DashboardException(
+ f'Failed to update subvolume {subvol_name}: {err}'
+ )
+
+ return f'Subvolume {subvol_name} updated successfully'
+
+ def delete(self, vol_name: str, subvol_name: str):
+ error_code, _, err = mgr.remote(
+ 'volumes', '_cmd_fs_subvolume_rm', None, {
+ 'vol_name': vol_name, 'sub_name': subvol_name})
+ if error_code != 0:
+ raise RuntimeError(
+ f'Failed to delete subvolume {subvol_name}: {err}'
+ )
+ return f'Subvolume {subvol_name} removed successfully'
+
@APIRouter('/cephfs/subvolume/group', Scope.CEPHFS)
@APIDoc("Cephfs Subvolume Group Management API", "CephfsSubvolumeGroup")
raise DashboardException(
f'Failed to create subvolume group {group_name}: {err}'
)
-
- def set(self, vol_name: str, subvol_name: str, size: str):
- if size:
- error_code, _, err = mgr.remote('volumes', '_cmd_fs_subvolume_resize', None, {
- 'vol_name': vol_name, 'sub_name': subvol_name, 'new_size': size})
- if error_code != 0:
- raise DashboardException(
- f'Failed to update subvolume {subvol_name}: {err}'
- )
-
- return f'Subvolume {subvol_name} updated successfully'
import { CephfsSubvolumeListComponent } from './cephfs-subvolume-list.component';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { SharedModule } from '~/app/shared/shared.module';
+import { ToastrModule } from 'ngx-toastr';
+import { RouterTestingModule } from '@angular/router/testing';
describe('CephfsSubvolumeListComponent', () => {
let component: CephfsSubvolumeListComponent;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [CephfsSubvolumeListComponent],
- imports: [HttpClientTestingModule, SharedModule]
+ imports: [HttpClientTestingModule, SharedModule, ToastrModule.forRoot(), RouterTestingModule]
}).compileComponents();
});
import { CephfsSubvolumeFormComponent } from '../cephfs-subvolume-form/cephfs-subvolume-form.component';
import { AuthStorageService } from '~/app/shared/services/auth-storage.service';
import { Permissions } from '~/app/shared/models/permissions';
+import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component';
+import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service';
+import { FinishedTask } from '~/app/shared/models/finished-task';
@Component({
selector: 'cd-cephfs-subvolume-list',
private cephfsSubVolume: CephfsSubvolumeService,
private actionLabels: ActionLabelsI18n,
private modalService: ModalService,
- private authStorageService: AuthStorageService
+ private authStorageService: AuthStorageService,
+ private taskWrapper: TaskWrapperService
) {
this.permissions = this.authStorageService.getPermissions();
}
name: this.actionLabels.CREATE,
permission: 'create',
icon: Icons.add,
- click: () => this.openModal(),
- canBePrimary: (selection: CdTableSelection) => !selection.hasSelection
+ click: () =>
+ this.modalService.show(
+ CephfsSubvolumeFormComponent,
+ {
+ fsName: this.fsName,
+ pools: this.pools
+ },
+ { size: 'lg' }
+ )
},
{
- name: this.actionLabels.EDIT,
- permission: 'update',
- icon: Icons.edit,
- click: () => this.openModal(true)
+ name: this.actionLabels.REMOVE,
+ permission: 'delete',
+ icon: Icons.destroy,
+ click: () => this.removeSubVolumeModal()
}
];
{ size: 'lg' }
);
}
+
+ removeSubVolumeModal() {
+ const name = this.selection.first().name;
+ this.modalService.show(CriticalConfirmationModalComponent, {
+ itemDescription: 'subvolume',
+ itemNames: [name],
+ actionDescription: 'remove',
+ submitActionObservable: () =>
+ this.taskWrapper.wrapTaskAroundCall({
+ task: new FinishedTask('cephfs/subvolume/remove', { subVolumeName: name }),
+ call: this.cephfsSubVolume.remove(this.fsName, name)
+ })
+ });
+ }
}
const req = httpTesting.expectOne('api/cephfs/subvolume/testFS');
expect(req.request.method).toBe('GET');
});
+
+ it('should call remove', () => {
+ service.remove('testFS', 'testSubvol').subscribe();
+ const req = httpTesting.expectOne('api/cephfs/subvolume/testFS?subvol_name=testSubvol');
+ expect(req.request.method).toBe('DELETE');
+ });
});
});
}
+ remove(fsName: string, subVolumeName: string) {
+ return this.http.delete(`${this.baseURL}/${fsName}`, {
+ params: {
+ subvol_name: subVolumeName
+ },
+ observe: 'response'
+ });
+ }
+
exists(subVolumeName: string, fsName: string) {
return this.info(fsName, subVolumeName).pipe(
mapTo(true),
'cephfs/subvolume/edit': this.newTaskMessage(this.commonOperations.update, (metadata) =>
this.subvolume(metadata)
),
+ 'cephfs/subvolume/remove': this.newTaskMessage(this.commonOperations.remove, (metadata) =>
+ this.subvolume(metadata)
+ ),
'cephfs/subvolume/group/create': this.newTaskMessage(this.commonOperations.create, (metadata) =>
this.subvolumegroup(metadata)
)
- jwt: []
tags:
- CephfsSubvolumeGroup
- put:
+ /api/cephfs/subvolume/{vol_name}:
+ delete:
parameters:
- in: path
name: vol_name
required: true
schema:
type: string
- requestBody:
- content:
- application/json:
- schema:
- properties:
- size:
- type: integer
- subvol_name:
- type: string
- required:
- - subvol_name
- - size
- type: object
+ - in: query
+ name: subvol_name
+ required: true
+ schema:
+ type: string
responses:
- '200':
+ '202':
content:
application/vnd.ceph.api.v1.0+json:
type: object
- description: Resource updated.
- '202':
+ description: Operation is still executing. Please check the task queue.
+ '204':
content:
application/vnd.ceph.api.v1.0+json:
type: object
- description: Operation is still executing. Please check the task queue.
+ description: Resource deleted.
'400':
description: Operation exception. Please check the response body for details.
'401':
security:
- jwt: []
tags:
- - CephfsSubvolumeGroup
- /api/cephfs/subvolume/{vol_name}:
+ - CephFSSubvolume
get:
parameters:
- in: path
- jwt: []
tags:
- CephFSSubvolume
+ put:
+ parameters:
+ - in: path
+ name: vol_name
+ required: true
+ schema:
+ type: string
+ requestBody:
+ content:
+ application/json:
+ schema:
+ properties:
+ size:
+ type: integer
+ subvol_name:
+ type: string
+ required:
+ - subvol_name
+ - size
+ type: object
+ responses:
+ '200':
+ content:
+ application/vnd.ceph.api.v1.0+json:
+ type: object
+ description: Resource updated.
+ '202':
+ content:
+ application/vnd.ceph.api.v1.0+json:
+ type: object
+ description: Operation is still executing. Please check the task queue.
+ '400':
+ description: Operation exception. Please check the response body for details.
+ '401':
+ description: Unauthenticated access. Please login first.
+ '403':
+ description: Unauthorized access. Please check your permissions.
+ '500':
+ description: Unexpected error. Please check the response body for the stack
+ trace.
+ security:
+ - jwt: []
+ tags:
+ - CephFSSubvolume
/api/cephfs/subvolume/{vol_name}/info:
get:
parameters:
projects / ceph.git / commitdiff