From 83195e52f99c9799fc610cb0be29ae7c11d3742e Mon Sep 17 00:00:00 2001
From: Ricardo Marques <rimarques@suse.com>
Date: Fri, 29 Mar 2019 13:29:47 +0000
Subject: [PATCH] mgr/dashboard: Fix iSCSI target submission

cdIsInGroup should not be included in the request
and username/password should be an empty string
(instead of null)

Fixes: https://tracker.ceph.com/issues/39110

Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit d63f206310c974441d45669ea4b668b6d17df5db)
---
 .../iscsi-target-form.component.spec.ts               |  6 ++----
 .../iscsi-target-form/iscsi-target-form.component.ts  | 11 ++++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts
index 29fc65aa22ea2..8d95a4808f6de 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts
@@ -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: []
           }
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts
index bd68a3399775b..173ea87abfe23 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts
@@ -537,7 +537,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'),
@@ -574,17 +574,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) => {
-- 
2.39.5