diff --git a/zvmsdk/tests/unit/test_volumeop.py b/zvmsdk/tests/unit/test_volumeop.py index ee34185c9..420857369 100755 --- a/zvmsdk/tests/unit/test_volumeop.py +++ b/zvmsdk/tests/unit/test_volumeop.py @@ -2103,7 +2103,7 @@ def test_attach(self, mock_dedicate, mock_add_disk, mock_fcp_info, mock_check): connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'false', + 'multipath': False, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2166,7 +2166,7 @@ def test_attach_with_exception(self, mock_do_attach, mock_check_userid, connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'false', + 'multipath': False, 'target_wwpn': ['20076D8500005182'], 'target_lun': '2222', 'zvm_fcp': ['E83C', 'D83C'], @@ -2194,7 +2194,7 @@ def test_attach_with_root_volume(self, mock_dedicate, mock_add_disk, connection_info = {'platform': 's390x', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'false', + 'multipath': False, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2258,7 +2258,7 @@ def test_attach_no_dedicate(self, mock_check_userid, mock_dedicate, connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'false', + 'multipath': False, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2313,7 +2313,7 @@ def test_attach_with_do_rollback(self, mock_check_userid, mock_do_attach): connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'True', + 'multipath': True, 'target_wwpn': ['20076d8500005182', '20076d8500005183'], 'target_lun': '2222', @@ -2323,14 +2323,13 @@ def test_attach_with_do_rollback(self, mock_check_userid, mock_do_attach): 'fcp_template_id': 'tmpl_id', 'is_root_volume': False} mock_check_userid.return_value = True - multipath = True # case1: do_rollback as False connection_info['do_rollback'] = False self.volumeops.attach(connection_info) mock_do_attach.assert_called_once_with( connection_info['zvm_fcp'], connection_info['assigner_id'].upper(), connection_info['target_wwpn'], connection_info['target_lun'], - multipath, connection_info['os_version'], + connection_info['multipath'], connection_info['os_version'], connection_info['mount_point'], connection_info['is_root_volume'], connection_info['fcp_template_id'], do_rollback=False ) @@ -2341,7 +2340,7 @@ def test_attach_with_do_rollback(self, mock_check_userid, mock_do_attach): mock_do_attach.assert_called_once_with( connection_info['zvm_fcp'], connection_info['assigner_id'].upper(), connection_info['target_wwpn'], connection_info['target_lun'], - multipath, connection_info['os_version'], + connection_info['multipath'], connection_info['os_version'], connection_info['mount_point'], connection_info['is_root_volume'], connection_info['fcp_template_id'], do_rollback=True ) @@ -2357,7 +2356,7 @@ def test_do_attach_with_rollback_due_to_increase_fcp_connections_failure( connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'false', + 'multipath': False, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2401,7 +2400,7 @@ def test_do_attach_with_rollback_due_to_dedicate_fcp_failure(self, mock_increase connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'false', + 'multipath': False, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2462,7 +2461,7 @@ def test_do_attach_with_rollback_due_to_add_disks_failure(self, mock_increase_co connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'false', + 'multipath': False, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2524,7 +2523,7 @@ def test_do_attach_with_do_rollback(self, mock_reserve_fcp, mock_increase_conn, connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'True', + 'multipath': True, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2588,7 +2587,7 @@ def test_do_detach_with_rollback_due_to_remove_disks_failure(self, mock_remove_d connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'false', + 'multipath': False, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2650,7 +2649,7 @@ def test_do_detach_with_rollback_due_to_undedicate_failure(self, mock_remove_dis connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'False', + 'multipath': False, 'target_wwpn': ['20076D8500005181', '20076D8500005182'], 'target_lun': '2222', @@ -2723,7 +2722,7 @@ def test_do_detach_with_do_rollback(self, mock_decrease_conn, mock_undedicate_fc connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'True', + 'multipath': True, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2784,7 +2783,7 @@ def test_detach_with_do_rollback(self, mock_do_detach): connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'True', + 'multipath': True, 'target_wwpn': ['20076d8500005182', '20076d8500005183'], 'target_lun': '2222', @@ -2795,12 +2794,11 @@ def test_detach_with_do_rollback(self, mock_do_detach): connection_info['do_rollback'] = False connection_info['is_root_volume'] = False connection_info['update_connections_only'] = False - multipath = True self.volumeops.detach(connection_info) mock_do_detach.assert_called_once_with( connection_info['zvm_fcp'], connection_info['assigner_id'].upper(), connection_info['target_wwpn'], connection_info['target_lun'], - multipath, connection_info['os_version'], + connection_info['multipath'], connection_info['os_version'], connection_info['mount_point'], connection_info['is_root_volume'], connection_info['update_connections_only'], do_rollback=False ) @@ -2811,7 +2809,7 @@ def test_detach_with_do_rollback(self, mock_do_detach): mock_do_detach.assert_called_once_with( connection_info['zvm_fcp'], connection_info['assigner_id'].upper(), connection_info['target_wwpn'], connection_info['target_lun'], - multipath, connection_info['os_version'], + connection_info['multipath'], connection_info['os_version'], connection_info['mount_point'], connection_info['is_root_volume'], connection_info['update_connections_only'], do_rollback=True ) @@ -2827,7 +2825,7 @@ def test_root_volume_detach(self, mock_undedicate, mock_remove_disk, connection_info = {'platform': 's390x', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'True', + 'multipath': True, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2878,7 +2876,7 @@ def test_update_connections_only_detach(self, mock_undedicate, connection_info = {'platform': 's390x', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'True', + 'multipath': True, 'target_wwpn': ['20076D8500005182', '20076D8500005183'], 'target_lun': '2222', @@ -2928,7 +2926,7 @@ def test_detach_no_undedicate(self, mock_undedicate, mock_remove_disk, connection_info = {'platform': 'x86_64', 'ip': '1.2.3.4', 'os_version': 'rhel7', - 'multipath': 'False', + 'multipath': False, 'target_wwpn': ['1111'], 'target_lun': '2222', 'zvm_fcp': ['283c'], diff --git a/zvmsdk/volumeop.py b/zvmsdk/volumeop.py index 8dec4496d..ec4e784d8 100755 --- a/zvmsdk/volumeop.py +++ b/zvmsdk/volumeop.py @@ -2307,11 +2307,7 @@ def attach(self, connection_info): wwpns = connection_info['target_wwpn'] target_lun = connection_info['target_lun'] assigner_id = connection_info['assigner_id'].upper() - multipath = connection_info['multipath'].lower() - if multipath == 'true': - multipath = True - else: - multipath = False + multipath = connection_info.get('multipath', False) os_version = connection_info['os_version'] mount_point = connection_info['mount_point'] is_root_volume = connection_info.get('is_root_volume', False)