openstack/nova-powervm
Code Issues Proposed changes

Merge "Check if vios_w returned from find_vios"

Browse Source
This commit is contained in:
Jenkins
2015-10-06 17:35:31 +00:00
committed by Gerrit Code Review
parent bea9fb9cfa 1bf15d1553
commit 33b36d2378
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nova_powervm/tests/virt/powervm/volume/test_npiv.py
View File

@@ -463,6 +463,8 @@ class TestNPIVAdapter(test_vol.TestVolumeAdapter):
self.assertEqual([1, 2], mig_data.get('npiv_fabric_slots_A'))
self.assertEqual([3], mig_data.get('npiv_fabric_slots_B'))
@mock.patch('pypowervm.tasks.vfc_mapper.remove_maps')
@mock.patch('pypowervm.tasks.vfc_mapper.find_vios_for_vfc_wwpns')
@mock.patch('pypowervm.tasks.vfc_mapper.'
'build_migration_mappings_for_fabric')
@mock.patch('nova_powervm.virt.powervm.mgmt.get_mgmt_partition')
@@ -472,7 +474,7 @@ class TestNPIVAdapter(test_vol.TestVolumeAdapter):
'_fabric_names')
def test_pre_live_migration_on_destination(
self, mock_fabric_names, mock_get_fabric_meta, mock_mgmt_lpar_id,
mock_build_mig_map):
mock_build_mig_map, mock_find_vios_for_vfc_wwpns, mock_remove_map):
mock_fabric_names.return_value = ['A', 'B']
mock_get_fabric_meta.side_effect = [[], []]
mock_mgmt_lpar_id.return_value = mock.Mock(uuid='1')
@@ -493,3 +495,18 @@ class TestNPIVAdapter(test_vol.TestVolumeAdapter):
# Order of the mappings is not important.
self.assertEqual(set(['b', 'a']),
set(dest_mig_data.get('vfc_lpm_mappings')))
mock_find_vios_for_vfc_wwpns.return_value = None, None
dest_mig_data = {}
mock_fabric_names.return_value = ['A', 'B']
mock_get_fabric_meta.side_effect = [
[('11', 'AA BB'), ('22', 'CC DD')],
[('33', 'EE FF')]]
mock_build_mig_map.side_effect = [['a'], ['b']]
# Execute the test
with self.assertLogs(npiv.__name__, level='WARNING'):
self.vol_drv.pre_live_migration_on_destination(
src_mig_data, dest_mig_data)
# remove_map should not be called since vios_w is None
self.assertEqual(0, mock_remove_map.call_count)

24
nova_powervm/virt/powervm/volume/npiv.py
View File

@@ -159,11 +159,18 @@ class NPIVVolumeAdapter(v_driver.FibreChannelVolumeAdapter):
vios_w, vfc_map = pvm_vfcm.find_vios_for_vfc_wwpns(
vios_wraps, npiv_port_map[1].split())
# Add the subtask to remove the mapping from the management
# partition.
self.stg_ftsk.wrapper_tasks[vios_w.uuid].add_functor_subtask(
pvm_vfcm.remove_maps, mgmt_uuid,
client_adpt=vfc_map.client_adapter, logspec=ls)
if vios_w is not None:
# Add the subtask to remove the mapping from the management
# partition.
task_wrapper = self.stg_ftsk.wrapper_tasks[vios_w.uuid]
task_wrapper.add_functor_subtask(
pvm_vfcm.remove_maps, mgmt_uuid,
client_adpt=vfc_map.client_adapter, logspec=ls)
else:
LOG.warn(_LW("No storage connections found between the "
"Virtual I/O Servers and FC Fabric "
"%(fabric)s. The connection might be removed "
"already."), {'fabric': fabric})
# TODO(thorst) Find a better place for this execute. Works for now
# as the stg_ftsk is all local. Also won't do anything if there
@@ -463,9 +470,10 @@ class NPIVVolumeAdapter(v_driver.FibreChannelVolumeAdapter):
if vios_w is not None:
# Add the subtask to remove the specific map
self.stg_ftsk.wrapper_tasks[vios_w.uuid].add_functor_subtask(
pvm_vfcm.remove_maps, self.vm_uuid, port_map=npiv_port_map,
logspec=ls)
task_wrapper = self.stg_ftsk.wrapper_tasks[vios_w.uuid]
task_wrapper.add_functor_subtask(
pvm_vfcm.remove_maps, self.vm_uuid,
port_map=npiv_port_map, logspec=ls)
else:
LOG.warn(_LW("No storage connections found between the "
"Virtual I/O Servers and FC Fabric %(fabric)s."),