Merge "Change server capability 'raid_support' to 'hardware_supports_raid'"

This commit is contained in:
Jenkins 2017-08-07 11:54:11 +00:00 committed by Gerrit Code Review
commit f077b9e772
4 changed files with 4 additions and 4 deletions

View File

@ -1192,7 +1192,7 @@ class RISOperations(rest.RestConnectorBase, operations.IloOperations):
if raid_details is not None:
capabilities.update(raid_details)
if self._is_raid_supported():
capabilities['raid_support'] = 'true'
capabilities['hardware_supports_raid'] = 'true'
boot_modes = common.get_supported_boot_modes(
self.get_supported_boot_mode())
capabilities.update({

View File

@ -676,7 +676,7 @@ class RedfishOperations(operations.IloOperations):
('iscsi_boot',
(sushy_system.bios_settings.iscsi_settings.
is_iscsi_boot_supported())),
('raid_support',
('hardware_supports_raid',
len(sushy_system.smart_storage.array_controllers.
members_identities) > 0),
('has_ssd',

View File

@ -487,7 +487,7 @@ class IloRisTestCase(testtools.TestCase):
'has_rotational': True,
'rotational_drive_4800_rpm': True,
'logical_raid_volume_0': 'true',
'raid_support': 'true'}
'hardware_supports_raid': 'true'}
capabilities = self.client.get_server_capabilities()
self.assertEqual(expected_caps, capabilities)

View File

@ -741,7 +741,7 @@ class RedfishOperationsTestCase(testtools.TestCase):
'server_model': 'ProLiant DL180 Gen10',
'boot_mode_bios': 'true',
'boot_mode_uefi': 'true', 'iscsi_boot': 'true',
'raid_support': 'true',
'hardware_supports_raid': 'true',
'persistent_memory': 'true',
'nvdimm_n': 'true',
'logical_nvdimm_n': 'false',