From: Kefu Chai Date: Tue, 11 Jun 2019 16:28:53 +0000 (+0800) Subject: mgr/dashboard: s/portal_ip_address/portal_ip_addresses/ X-Git-Tag: v15.1.0~2491^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ddeda902b986972cb0e5e7dc946a5e39f36bf68d;p=ceph.git mgr/dashboard: s/portal_ip_address/portal_ip_addresses/ and take portal_ip_addresses as a list it's a follow-up fix of #28084 Signed-off-by: Kefu Chai --- diff --git a/src/pybind/mgr/dashboard/tests/test_iscsi.py b/src/pybind/mgr/dashboard/tests/test_iscsi.py index c375f8a54883..db684234c3e1 100644 --- a/src/pybind/mgr/dashboard/tests/test_iscsi.py +++ b/src/pybind/mgr/dashboard/tests/test_iscsi.py @@ -544,19 +544,20 @@ class IscsiClientMock(object): "portals": {} } - def create_gateway(self, target_iqn, gateway_name, ip_address): + def create_gateway(self, target_iqn, gateway_name, ip_addresses): target_config = self.config['targets'][target_iqn] if 'ip_list' not in target_config: target_config['ip_list'] = [] - target_config['ip_list'] += ip_address + target_config['ip_list'] += ip_addresses target_config['portals'][gateway_name] = { - "portal_ip_addresses": ip_address + "portal_ip_addresses": ip_addresses } def delete_gateway(self, target_iqn, gateway_name): target_config = self.config['targets'][target_iqn] portal_config = target_config['portals'][gateway_name] - target_config['ip_list'].remove(portal_config['portal_ip_address']) + for ip in portal_config['portal_ip_addresses']: + target_config['ip_list'].remove(ip) target_config['portals'].pop(gateway_name) def create_disk(self, pool, image, backstore):