x
/
proliantutils
Code Issues Proposed changes

Merge "Add trusted_boot to server capabilities"

This commit is contained in:
Jenkins 2017-03-03 08:35:25 +00:00 committed by Gerrit Code Review
parent 5618c0738f 595aa9a821
commit 35b19cde86
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proliantutils/ilo/ris.py
View File

@ -1132,6 +1132,7 @@ class RISOperations(operations.IloOperations):
capabilities['rom_firmware_version'] = rom_firmware_version
capabilities.update(self._get_ilo_firmware_version())
capabilities.update(self._get_number_of_gpu_devices_connected())
capabilities.update(self._get_tpm_capability())
try:
self.get_secure_boot_mode()
capabilities['secure_boot'] = 'true'
@ -1652,3 +1653,19 @@ class RISOperations(operations.IloOperations):
gpu_devices = self._get_gpu_pci_devices()
gpu_devices_count = len(gpu_devices)
return {'pci_gpu_devices': gpu_devices_count}
def _get_tpm_capability(self):
"""Retrieves if server is TPM capable or not.
:returns True if TPM is Present else False
"""
tpm_values = {"NotPresent": False,
"PresentDisabled": True,
"PresentEnabled": True}
try:
tpm_state = self._get_bios_setting('TpmState')
except exception.IloCommandNotSupportedError:
tpm_state = "NotPresent"
tpm_result = tpm_values[tpm_state]
return {'trusted_boot': tpm_result}

36
proliantutils/tests/ilo/test_ris.py
View File

@ -407,23 +407,26 @@ class IloRisTestCase(testtools.TestCase):
validate_mock.assert_called_once_with(ris_outputs.GET_HEADERS,
settings_uri)
@mock.patch.object(ris.RISOperations, '_get_tpm_capability')
@mock.patch.object(ris.RISOperations,
'_get_number_of_gpu_devices_connected')
@mock.patch.object(ris.RISOperations, 'get_secure_boot_mode')
@mock.patch.object(ris.RISOperations, '_get_ilo_firmware_version')
@mock.patch.object(ris.RISOperations, '_get_host_details')
def test_get_server_capabilities(self, get_details_mock, ilo_firm_mock,
secure_mock, gpu_mock):
secure_mock, gpu_mock, tpm_mock):
host_details = json.loads(ris_outputs.RESPONSE_BODY_FOR_REST_OP)
get_details_mock.return_value = host_details
ilo_firm_mock.return_value = {'ilo_firmware_version': 'iLO 4 v2.20'}
gpu_mock.return_value = {'pci_gpu_devices': 2}
secure_mock.return_value = False
tpm_mock.return_value = {'trusted_boot': True}
expected_caps = {'secure_boot': 'true',
'ilo_firmware_version': 'iLO 4 v2.20',
'rom_firmware_version': u'I36 v1.40 (01/28/2015)',
'server_model': u'ProLiant BL460c Gen9',
'pci_gpu_devices': 2}
'pci_gpu_devices': 2,
'trusted_boot': True}
capabilities = self.client.get_server_capabilities()
self.assertEqual(expected_caps, capabilities)
@ -1915,3 +1918,32 @@ class TestRISOperationsPrivateMethods(testtools.TestCase):
self.client.reset_server)
rest_post_mock.assert_called_once_with(systems_uri, None,
new_pow_settings)
@mock.patch.object(ris.RISOperations, '_get_bios_setting')
def test__get_tpm_capability_notpresent(self, bios_mock):
bios_mock.return_value = 'NotPresent'
expected_out = {'trusted_boot': False}
status = self.client._get_tpm_capability()
self.assertEqual(expected_out, status)
@mock.patch.object(ris.RISOperations, '_get_bios_setting')
def test__get_tpm_capability_presentdisabled(self, bios_mock):
bios_mock.return_value = 'PresentDisabled'
expected_out = {'trusted_boot': True}
status = self.client._get_tpm_capability()
self.assertEqual(expected_out, status)
@mock.patch.object(ris.RISOperations, '_get_bios_setting')
def test__get_tpm_capability_presentenabled(self, bios_mock):
bios_mock.return_value = 'PresentEnabled'
expected_out = {'trusted_boot': True}
status = self.client._get_tpm_capability()
self.assertEqual(expected_out, status)
@mock.patch.object(ris.RISOperations, '_get_bios_setting')
def test__get_tpm_capability_resource_notpresent(self, bios_mock):
msg = 'BIOS Property TpmState is not supported on this system.'
bios_mock.side_effect = exception.IloCommandNotSupportedError(msg)
expected_out = {'trusted_boot': False}
status = self.client._get_tpm_capability()
self.assertEqual(expected_out, status)