4984abac57
This change set refactors how the vSCSI attach and detach loops are nested. They became a bit too nested and thus messages took several lines due to 80 character limit. This change moves the 'per VIO' specific logic into its own method. It also moves some exceptions into the nova_powervm exception module that had previously been improperly referenced from pypowervm. Change-Id: Ia15c679e9277fa512d083abfb43c66c59e864b30
270 lines
11 KiB
Python
270 lines
11 KiB
Python
# Copyright 2015 IBM Corp.
|
|
#
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
|
|
from nova import test
|
|
import os
|
|
|
|
from oslo_config import cfg
|
|
|
|
from nova_powervm.tests.virt.powervm import fixtures as fx
|
|
from nova_powervm.virt.powervm import exception as p_exc
|
|
from nova_powervm.virt.powervm.volume import vscsi
|
|
|
|
from pypowervm.tasks import hdisk
|
|
from pypowervm.tests import test_fixtures as pvm_fx
|
|
from pypowervm.tests.wrappers.util import pvmhttp
|
|
from pypowervm.wrappers import storage as pvm_stor
|
|
from pypowervm.wrappers import virtual_io_server as pvm_vios
|
|
|
|
CONF = cfg.CONF
|
|
|
|
VIOS_FEED = 'fake_vios_feed.txt'
|
|
|
|
I_WWPN_1 = '21000024FF649104'
|
|
I_WWPN_2 = '21000024FF649105'
|
|
|
|
|
|
class TestVSCSIAdapter(test.TestCase):
|
|
"""Tests the vSCSI Volume Connector Adapter."""
|
|
def setUp(self):
|
|
super(TestVSCSIAdapter, self).setUp()
|
|
self.pypvm_fix = self.useFixture(fx.PyPowerVM())
|
|
self.adpt = self.pypvm_fix.apt
|
|
|
|
# Find directory for response file(s)
|
|
data_dir = os.path.dirname(os.path.abspath(__file__))
|
|
data_dir = os.path.join(data_dir, '../data')
|
|
|
|
def resp(file_name):
|
|
file_path = os.path.join(data_dir, file_name)
|
|
return pvmhttp.load_pvm_resp(file_path).get_response()
|
|
self.vios_feed_resp = resp(VIOS_FEED)
|
|
|
|
feed = pvm_vios.VIOS.wrap(self.vios_feed_resp)
|
|
self.ft_fx = pvm_fx.FeedTaskFx(feed)
|
|
self.useFixture(self.ft_fx)
|
|
|
|
@mock.patch('pypowervm.wrappers.virtual_io_server.VIOS.getter')
|
|
@mock.patch('nova_powervm.virt.powervm.vm.get_pvm_uuid')
|
|
def init_vol_adpt(mock_pvm_uuid, mock_getter):
|
|
con_info = {'data': {'initiator_target_map': {I_WWPN_1: ['t1'],
|
|
I_WWPN_2: ['t2',
|
|
't3']},
|
|
'target_lun': '1', 'volume_id': 'id'}}
|
|
mock_inst = mock.MagicMock()
|
|
mock_pvm_uuid.return_value = '1234'
|
|
|
|
# The getter can just return the VIOS values (to remove a read
|
|
# that would otherwise need to be mocked).
|
|
mock_getter.return_value = feed
|
|
|
|
return vscsi.VscsiVolumeAdapter(self.adpt, 'host_uuid', mock_inst,
|
|
con_info)
|
|
self.vol_drv = init_vol_adpt()
|
|
|
|
# setup system_metadata tests
|
|
self.volume_id = 'f042c68a-c5a5-476a-ba34-2f6d43f4226c'
|
|
self.vios_uuid = '3443DB77-AED1-47ED-9AA5-3DB9C6CF7089'
|
|
self.udid = (
|
|
'01M0lCTTIxNDUxMjQ2MDA1MDc2ODAyODI4NjFEODgwMDAwMDAwMDAwMDA1Rg==')
|
|
|
|
@mock.patch('pypowervm.tasks.scsi_mapper.add_map')
|
|
@mock.patch('pypowervm.tasks.scsi_mapper.build_vscsi_mapping')
|
|
@mock.patch('pypowervm.tasks.hdisk.discover_hdisk')
|
|
def test_connect_volume(self, mock_discover_hdisk, mock_build_map,
|
|
mock_add_map):
|
|
# The mock return values
|
|
mock_discover_hdisk.return_value = (
|
|
hdisk.LUAStatus.DEVICE_AVAILABLE, 'devname', 'udid')
|
|
|
|
def build_map_func(host_uuid, vios_w, lpar_uuid, pv):
|
|
self.assertEqual('host_uuid', host_uuid)
|
|
self.assertIsInstance(vios_w, pvm_vios.VIOS)
|
|
self.assertEqual('1234', lpar_uuid)
|
|
self.assertIsInstance(pv, pvm_stor.PV)
|
|
return 'fake_map'
|
|
|
|
mock_build_map.side_effect = build_map_func
|
|
|
|
# Run the method
|
|
self.vol_drv.connect_volume()
|
|
|
|
# As initialized above, remove_maps returns True to trigger update.
|
|
self.assertEqual(1, mock_add_map.call_count)
|
|
self.assertEqual(1, self.ft_fx.patchers['update'].mock.call_count)
|
|
self.assertEqual(1, mock_build_map.call_count)
|
|
self.assertListEqual([self.vios_uuid], self.vol_drv._vioses_modified)
|
|
|
|
@mock.patch('pypowervm.tasks.scsi_mapper.add_map')
|
|
@mock.patch('pypowervm.tasks.scsi_mapper.build_vscsi_mapping')
|
|
@mock.patch('pypowervm.tasks.hdisk.discover_hdisk')
|
|
def test_connect_volume_no_update(self, mock_discover_hdisk,
|
|
mock_build_map, mock_add_map):
|
|
"""Make sure we don't do an actual update of the VIOS if not needed."""
|
|
# The mock return values
|
|
mock_build_map.return_value = 'fake_map'
|
|
mock_add_map.return_value = None
|
|
mock_discover_hdisk.return_value = (
|
|
hdisk.LUAStatus.DEVICE_AVAILABLE, 'devname', 'udid')
|
|
|
|
# Run the method
|
|
self.vol_drv.connect_volume()
|
|
|
|
# As initialized above, remove_maps returns True to trigger update.
|
|
self.assertEqual(1, mock_add_map.call_count)
|
|
self.assertEqual(0, self.ft_fx.patchers['update'].mock.call_count)
|
|
|
|
@mock.patch('pypowervm.tasks.hdisk.build_itls')
|
|
@mock.patch('pypowervm.tasks.hdisk.discover_hdisk')
|
|
@mock.patch('pypowervm.tasks.scsi_mapper.add_vscsi_mapping')
|
|
def test_connect_volume_to_initiatiors(self, mock_add_vscsi_mapping,
|
|
mock_discover_hdisk,
|
|
mock_build_itls):
|
|
"""Tests that the connect w/out initiators throws errors."""
|
|
mock_discover_hdisk.return_value = (
|
|
hdisk.LUAStatus.DEVICE_AVAILABLE, 'devname', 'udid')
|
|
|
|
mock_instance = mock.Mock()
|
|
mock_instance.system_metadata = {}
|
|
|
|
mock_build_itls.return_value = []
|
|
self.assertRaises(p_exc.VolumeAttachFailed,
|
|
self.vol_drv.connect_volume)
|
|
|
|
@mock.patch('pypowervm.tasks.hdisk.remove_hdisk')
|
|
@mock.patch('pypowervm.wrappers.virtual_io_server.VIOS.hdisk_from_uuid')
|
|
@mock.patch('pypowervm.tasks.scsi_mapper.remove_maps')
|
|
@mock.patch('nova_powervm.virt.powervm.vm.get_vm_id')
|
|
def test_disconnect_volume(self, mock_get_vm_id, mock_remove_maps,
|
|
mock_hdisk_from_uuid, mock_remove_hdisk):
|
|
# The mock return values
|
|
mock_hdisk_from_uuid.return_value = 'device_name'
|
|
mock_get_vm_id.return_value = 'partition_id'
|
|
|
|
def validate_remove_maps(vios_w, vm_uuid, match_func):
|
|
self.assertIsInstance(vios_w, pvm_vios.VIOS)
|
|
self.assertEqual('partition_id', vm_uuid)
|
|
return 'removed'
|
|
mock_remove_maps.side_effect = validate_remove_maps
|
|
|
|
# Run the method
|
|
self.vol_drv.disconnect_volume()
|
|
|
|
# As initialized above, remove_maps returns True to trigger update.
|
|
self.assertEqual(1, mock_remove_maps.call_count)
|
|
self.assertEqual(1, self.ft_fx.patchers['update'].mock.call_count)
|
|
mock_remove_hdisk.assert_called_once_with(
|
|
self.adpt, mock.ANY, 'device_name', self.vios_uuid)
|
|
self.assertListEqual([self.vios_uuid], self.vol_drv._vioses_modified)
|
|
|
|
@mock.patch('pypowervm.wrappers.virtual_io_server.VIOS.hdisk_from_uuid')
|
|
@mock.patch('pypowervm.tasks.scsi_mapper.remove_maps')
|
|
@mock.patch('nova_powervm.virt.powervm.vm.get_vm_id')
|
|
def test_disconnect_volume_no_update(
|
|
self, mock_get_vm_id, mock_remove_maps, mock_hdisk_from_uuid):
|
|
"""Validate that if no maps removed, the VIOS update is not called."""
|
|
# The mock return values
|
|
mock_remove_maps.return_value = None
|
|
mock_hdisk_from_uuid.return_value = 'device_name'
|
|
mock_get_vm_id.return_value = 'partition_id'
|
|
|
|
# Run the method
|
|
self.vol_drv.disconnect_volume()
|
|
|
|
# As initialized above, remove_maps returns True to trigger update.
|
|
self.assertEqual(1, mock_remove_maps.call_count)
|
|
self.assertEqual(0, self.ft_fx.patchers['update'].mock.call_count)
|
|
self.assertEqual(1, len(self.vol_drv._vioses_modified))
|
|
|
|
@mock.patch('pypowervm.wrappers.virtual_io_server.VIOS.hdisk_from_uuid')
|
|
@mock.patch('pypowervm.tasks.scsi_mapper.remove_maps')
|
|
def test_disconnect_volume_no_valid_vio(self, mock_remove_maps,
|
|
mock_hdisk_from_uuid):
|
|
"""Validate that if all VIOSes are invalid, the vio updates are 0."""
|
|
# The mock return values
|
|
mock_remove_maps.return_value = None
|
|
mock_hdisk_from_uuid.return_value = None
|
|
|
|
# Run the method
|
|
self.vol_drv.disconnect_volume()
|
|
|
|
# As initialized above, remove_maps returns True to trigger update.
|
|
self.assertEqual(0, mock_remove_maps.call_count)
|
|
self.assertEqual(0, self.ft_fx.patchers['update'].mock.call_count)
|
|
self.assertEqual(0, len(self.vol_drv._vioses_modified))
|
|
|
|
@mock.patch('nova_powervm.virt.powervm.vios.get_physical_wwpns')
|
|
def test_wwpns(self, mock_vio_wwpns):
|
|
mock_vio_wwpns.return_value = ['aa', 'bb']
|
|
|
|
wwpns = self.vol_drv.wwpns()
|
|
|
|
self.assertListEqual(['aa', 'bb'], wwpns)
|
|
|
|
def test_set_udid(self):
|
|
|
|
# Mock connection info
|
|
udid_key = vscsi._build_udid_key(self.vios_uuid, self.volume_id)
|
|
self.vol_drv.connection_info['data'][udid_key] = self.udid
|
|
|
|
# Set the UDID
|
|
self.vol_drv._set_udid(self.vios_uuid, self.volume_id,
|
|
self.udid)
|
|
|
|
# Verify
|
|
self.assertEqual(self.udid,
|
|
self.vol_drv.connection_info['data'][udid_key])
|
|
|
|
def test_get_udid(self):
|
|
|
|
udid_key = vscsi._build_udid_key(self.vios_uuid, self.volume_id)
|
|
self.vol_drv.connection_info['data'][udid_key] = self.udid
|
|
|
|
# Set the key to retrieve
|
|
retrieved_udid = self.vol_drv._get_udid(self.vios_uuid, self.volume_id)
|
|
|
|
# Check key found
|
|
self.assertEqual(self.udid, retrieved_udid)
|
|
|
|
# Check key not found
|
|
retrieved_udid = (self.vol_drv._get_udid(self.vios_uuid,
|
|
'non_existent_key'))
|
|
|
|
# Check key not found
|
|
self.assertIsNone(retrieved_udid)
|
|
|
|
def test_get_hdisk_itls(self):
|
|
"""Validates the _get_hdisk_itls method."""
|
|
|
|
mock_vios = mock.MagicMock()
|
|
mock_vios.get_active_pfc_wwpns.return_value = [I_WWPN_1]
|
|
|
|
i_wwpn, t_wwpns, lun = self.vol_drv._get_hdisk_itls(mock_vios)
|
|
self.assertListEqual([I_WWPN_1], i_wwpn)
|
|
self.assertListEqual(['t1'], t_wwpns)
|
|
self.assertEqual('1', lun)
|
|
|
|
mock_vios.get_active_pfc_wwpns.return_value = [I_WWPN_2]
|
|
i_wwpn, t_wwpns, lun = self.vol_drv._get_hdisk_itls(mock_vios)
|
|
self.assertListEqual([I_WWPN_2], i_wwpn)
|
|
self.assertListEqual(['t2', 't3'], t_wwpns)
|
|
|
|
mock_vios.get_active_pfc_wwpns.return_value = ['12345']
|
|
i_wwpn, t_wwpns, lun = self.vol_drv._get_hdisk_itls(mock_vios)
|
|
self.assertListEqual([], i_wwpn)
|