RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from ricardoasmarques/fix-iscsi-target-submission

Browse Source 
mgr/dashboard: Fix iSCSI target submission

Reviewed-by: Tiago Melo <tmelo@suse.com>
This commit is contained in:
Ricardo Marques 2019-04-04 23:35:14 +01:00 committed by GitHub
commit 1efcdf3000
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form
iscsi-target-form.component.spec.tsiscsi-target-form.component.ts

6
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts
View File

@ -351,8 +351,7 @@ describe('IscsiTargetFormComponent', () => {
expect(req.request.body).toEqual({
clients: [
{
auth: { mutual_password: null, mutual_user: null, password: null, user: null },
cdIsInGroup: false,
auth: { mutual_password: '', mutual_user: '', password: '', user: '' },
client_iqn: 'iqn.initiator',
luns: []
}
@ -380,8 +379,7 @@ describe('IscsiTargetFormComponent', () => {
expect(req.request.body).toEqual({
clients: [
{
auth: { mutual_password: null, mutual_user: null, password: null, user: null },
cdIsInGroup: false,
auth: { mutual_password: '', mutual_user: '', password: '', user: '' },
client_iqn: 'iqn.initiator',
luns: []
}

11
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts
View File

@ -544,7 +544,7 @@ export class IscsiTargetFormComponent implements OnInit {
}
submit() {
const formValue = this.targetForm.value;
const formValue = _.cloneDeep(this.targetForm.value);
const request = {
target_iqn: this.targetForm.getValue('target_iqn'),
@ -581,17 +581,18 @@ export class IscsiTargetFormComponent implements OnInit {
if (request.acl_enabled) {
formValue.initiators.forEach((initiator) => {
if (!initiator.auth.user) {
initiator.auth.user = null;
initiator.auth.user = '';
}
if (!initiator.auth.password) {
initiator.auth.password = null;
initiator.auth.password = '';
}
if (!initiator.auth.mutual_user) {
initiator.auth.mutual_user = null;
initiator.auth.mutual_user = '';
}
if (!initiator.auth.mutual_password) {
initiator.auth.mutual_password = null;
initiator.auth.mutual_password = '';
}
delete initiator.cdIsInGroup;
const newLuns = [];
initiator.luns.forEach((lun) => {