openstack/ironic
Code Issues Proposed changes

Merge "Fix names of capabilities for FibreChannel volume boot"

Browse Source
This commit is contained in:
Jenkins 2017-08-21 19:02:56 +00:00 committed by Gerrit Code Review
commit 0011a7726c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/drivers/modules/irmc/boot.py
View File

@ -864,7 +864,7 @@ class IRMCVolumeBootMixIn(object):
class IRMCVirtualMediaBoot(base.BootInterface, IRMCVolumeBootMixIn): class IRMCVirtualMediaBoot(base.BootInterface, IRMCVolumeBootMixIn):
"""iRMC Virtual Media boot-related actions.""" """iRMC Virtual Media boot-related actions."""
capabilities = ['iscsi_volume_boot', 'fc_volume_boot'] capabilities = ['iscsi_volume_boot', 'fibre_channel_volume_boot']
def __init__(self): def __init__(self):
"""Constructor of IRMCVirtualMediaBoot. """Constructor of IRMCVirtualMediaBoot.

6
ironic/tests/unit/drivers/modules/test_deploy_utils.py
View File

@ -2489,8 +2489,10 @@ class TestStorageInterfaceUtils(db_base.DbTestCase):
@mock.patch.object(fake, 'FakeDeploy', autospec=True) @mock.patch.object(fake, 'FakeDeploy', autospec=True)
def test_populate_storage_driver_internal_info_error( def test_populate_storage_driver_internal_info_error(
self, mock_deploy, mock_boot): self, mock_deploy, mock_boot):
mock_deploy.return_value = mock.Mock(capabilities=['fc_volume_deploy']) mock_deploy.return_value = mock.Mock(
mock_boot.return_value = mock.Mock(capabilities=['fc_volume_boot']) capabilities=['fibre_channel_volume_deploy'])
mock_boot.return_value = mock.Mock(
capabilities=['fibre_channel_volume_boot'])
obj_utils.create_test_volume_target( obj_utils.create_test_volume_target(
self.context, node_id=self.node.id, volume_type='iscsi', self.context, node_id=self.node.id, volume_type='iscsi',