From 07afe05b3155425fe509f79a4dfd5248e23448b1 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Fri, 4 Dec 2020 10:51:47 +0800 Subject: [PATCH] mgr/dashboard: fix trusted_ip_list in iSCSI service form The value should be a comma-separated string rather than a list of strings. Fixes: https://tracker.ceph.com/issues/48454 Signed-off-by: Kiefer Chang --- .../services/service-form/service-form.component.spec.ts | 4 ++-- .../cluster/services/service-form/service-form.component.ts | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts index 215868065c739..6ed8b414532ab 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts @@ -270,7 +270,7 @@ describe('ServiceFormComponent', () => { it('should submit iscsi with trusted ips', () => { formHelper.setValue('ssl', true); - formHelper.setValue('trusted_ip_list', ' 172.16.0.5, 192.1.1.10 '); + formHelper.setValue('trusted_ip_list', ' 172.16.0.5, 192.1.1.10 '); component.onSubmit(); expect(cephServiceService.create).toHaveBeenCalledWith({ service_type: 'iscsi', @@ -282,7 +282,7 @@ describe('ServiceFormComponent', () => { api_secure: true, ssl_cert: '', ssl_key: '', - trusted_ip_list: ['172.16.0.5', '192.1.1.10'] + trusted_ip_list: '172.16.0.5, 192.1.1.10' }); }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts index 9a2b7747b11af..533f2ae833a75 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts @@ -300,9 +300,7 @@ export class ServiceFormComponent extends CdForm implements OnInit { case 'iscsi': serviceSpec['pool'] = values['pool']; if (_.isString(values['trusted_ip_list']) && !_.isEmpty(values['trusted_ip_list'])) { - let parts = _.split(values['trusted_ip_list'], ','); - parts = _.map(parts, _.trim); - serviceSpec['trusted_ip_list'] = parts; + serviceSpec['trusted_ip_list'] = values['trusted_ip_list'].trim(); } if (_.isNumber(values['api_port']) && values['api_port'] > 0) { serviceSpec['api_port'] = values['api_port']; -- 2.47.3