x/proliantutils
Code Issues Proposed changes

Fixed problem with UEFI iSCSI boot for adapters

Browse Source 
This commit fixes problem with multiple nic adapter
by adding mac as an optional parameter to pass macs in
such cases.

Change-Id: Iea420d7a047c8ac849fa2eeab5c6892be2d7a6e1
Bug-Id: 1838730
This commit is contained in:
paresh-sao
2019-07-19 08:25:52 +00:00
committed by kesper
parent 3a71f3b5d4
commit 94d4e1c372
13 changed files with 634 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
proliantutils/tests/ilo/ris_sample_outputs.py
View File

@@ -1270,6 +1270,71 @@ GET_MANAGER_DETAILS_NO_FIRMWARE = """
}
"""
RESP_NETWORK_ADAPTER = """
{
"@odata.context": "/redfish/v1/$metadata#Systems/Members/1/\
NetworkAdapters/Members/$entity",
"@odata.id": "/redfish/v1/Systems/1/NetworkAdapters/1/",
"@odata.type": "#BaseNetworkAdapter.1.1.0.BaseNetworkAdapter",
"Firmware": {
"Current": {
"VersionString": null
}
},
"Id": "1",
"Name": "HPE Ethernet 1Gb 2-port 361i Adapter - NIC",
"PartNumber": null,
"PhysicalPorts": [
{
"FullDuplex": false,
"IPv4Addresses": [
{
"Address": null
}
],
"IPv6Addresses": [
{
"Address": null
}
],
"MacAddress": "9C:B6:54:79:78:70",
"Name": null,
"Oem": {
"Hp": {
"@odata.type": "#HpBaseNetworkAdapterExt.1.0.0.\
HpBaseNetworkAdapterExt",
"BadReceives": null,
"BadTransmits": null,
"GoodReceives": null,
"GoodTransmits": null,
"StructuredName": "NIC.LOM.1.1",
"Team": null,
"Type": "HpBaseNetworkAdapterExt.1.0.0"
}
},
"SpeedMbps": 0,
"Status": {
"Health": "OK",
"State": "Enabled"
},
"UEFIDevicePath": "PciRoot(0x0)/Pci(0x2,0x3)/Pci(0x0,0x0)"
}
],
"SerialNumber": null,
"Status": {
"Health": "OK",
"State": "Enabled"
},
"StructuredName": "NIC.LOM.1.1",
"Type": "BaseNetworkAdapter.1.1.0",
"UEFIDevicePath": "PciRoot(0x0)/Pci(0x2,0x3)/Pci(0x0,0x0)",
"links": {
"self": {
"href": "/rest/v1/Systems/1/NetworkAdapters/1"
}
}
}
"""
GET_BIOS_SETTINGS = """
{
@@ -2536,7 +2601,7 @@ GET_ISCSI_PATCH = """
"iSCSITargetName": "iqn.2011-07.com.example.server:test1",
"iSCSITargetTcpPort": 3260
}
]
]
}
"""

20
proliantutils/tests/ilo/test_client.py
View File

@@ -518,18 +518,7 @@ class IloClientTestCase(testtools.TestCase):
call_mock.assert_called_once_with('set_iscsi_info',
'iqn.2011-07.com:example:123',
'1', '10.10.1.23', '3260',
'CHAP', 'user', 'password')
@mock.patch.object(client.IloClient.cls, '_call_method')
def test_set_iscsi_boot_info(self, call_mock):
self.client.set_iscsi_boot_info('aa:bb:cc:dd:ee:ff',
'iqn.2011-07.com:example:123',
'1', '10.10.1.23', '3260', 'CHAP',
'user', 'password')
call_mock.assert_called_once_with('set_iscsi_info',
'iqn.2011-07.com:example:123',
'1', '10.10.1.23', '3260',
'CHAP', 'user', 'password')
'CHAP', 'user', 'password', [])
@mock.patch.object(client.IloClient.cls, '_call_method')
def test_get_iscsi_initiator_info(self, call_mock):
@@ -539,12 +528,7 @@ class IloClientTestCase(testtools.TestCase):
@mock.patch.object(client.IloClient.cls, '_call_method')
def test_unset_iscsi_info(self, call_mock):
self.client.unset_iscsi_info()
call_mock.assert_called_once_with('unset_iscsi_info')
@mock.patch.object(client.IloClient.cls, '_call_method')
def test_unset_iscsi_boot_info(self, call_mock):
self.client.unset_iscsi_boot_info("aa:bb:cc:dd:ee:ff")
call_mock.assert_called_once_with('unset_iscsi_info')
call_mock.assert_called_once_with('unset_iscsi_info', [])
@mock.patch.object(client.IloClient.cls, '_call_method')
def test_set_iscsi_initiator_info(self, call_mock):

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

@@ -160,7 +160,27 @@ class IloRisTestCase(testtools.TestCase):
'iqn.2011-07.com.example.server:test1',
'1', '10.10.1.30')
_uefi_boot_mode_mock.assert_called_once_with()
change_iscsi_settings_mock.assert_called_once_with(iscsi_variables)
change_iscsi_settings_mock.assert_called_once_with(
iscsi_variables, [])
@mock.patch.object(ris.RISOperations, '_change_iscsi_settings')
@mock.patch.object(ris.RISOperations, '_is_boot_mode_uefi')
def test_set_iscsi_info_uefi_with_mac(self, _uefi_boot_mode_mock,
change_iscsi_settings_mock):
_uefi_boot_mode_mock.return_value = True
iscsi_variables = {
'iSCSITargetName': 'iqn.2011-07.com.example.server:test1',
'iSCSITargetInfoViaDHCP': False,
'iSCSIBootLUN': '1',
'iSCSIBootEnable': 'Enabled',
'iSCSITargetIpAddress': '10.10.1.30',
'iSCSITargetTcpPort': 3260}
self.client.set_iscsi_info(
'iqn.2011-07.com.example.server:test1',
'1', '10.10.1.30', macs=['98:f2:b3:ee:f4:00'])
_uefi_boot_mode_mock.assert_called_once_with()
change_iscsi_settings_mock.assert_called_once_with(
iscsi_variables, ['98:f2:b3:ee:f4:00'])
@mock.patch.object(ris.RISOperations, '_change_iscsi_settings')
@mock.patch.object(ris.RISOperations, '_is_boot_mode_uefi')
@@ -170,7 +190,19 @@ class IloRisTestCase(testtools.TestCase):
iscsi_variables = {'iSCSIBootEnable': 'Disabled'}
self.client.unset_iscsi_info()
_uefi_boot_mode_mock.assert_called_once_with()
change_iscsi_settings_mock.assert_called_once_with(iscsi_variables)
change_iscsi_settings_mock.assert_called_once_with(
iscsi_variables, [])
@mock.patch.object(ris.RISOperations, '_change_iscsi_settings')
@mock.patch.object(ris.RISOperations, '_is_boot_mode_uefi')
def test_unset_iscsi_info_uefi_with_mac(self, _uefi_boot_mode_mock,
change_iscsi_settings_mock):
_uefi_boot_mode_mock.return_value = True
iscsi_variables = {'iSCSIBootEnable': 'Disabled'}
self.client.unset_iscsi_info(['98:f2:b3:ee:f4:00'])
_uefi_boot_mode_mock.assert_called_once_with()
change_iscsi_settings_mock.assert_called_once_with(
iscsi_variables, ['98:f2:b3:ee:f4:00'])
@mock.patch.object(ris.RISOperations, '_is_boot_mode_uefi')
def test_unset_iscsi_info_bios(self, _uefi_boot_mode_mock):
@@ -1736,6 +1768,57 @@ class TestRISOperationsPrivateMethods(testtools.TestCase):
self.client._check_iscsi_rest_patch_allowed)
check_bios_mock.assert_called_once_with()
@mock.patch.object(ris.RISOperations, '_get_uefi_device_path_by_mac')
@mock.patch.object(ris.RISOperations, '_get_bios_mappings_resource')
@mock.patch.object(ris.RISOperations, '_check_bios_resource')
def test__get_nic_association_name_by_mac(
self, check_bios_mock, mappings_mock, uefi_device_path_mock):
bios_uri = '/rest/v1/systems/1/bios'
bios_settings = json.loads(ris_outputs.GET_BIOS_SETTINGS)
check_bios_mock.return_value = (
ris_outputs.GET_HEADERS, bios_uri, bios_settings)
map_settings = json.loads(ris_outputs.GET_BIOS_MAPPINGS)
mappings_mock.return_value = map_settings
(uefi_device_path_mock.
return_value) = 'PciRoot(0x0)/Pci(0x1C,0x4)/Pci(0x0,0x0)'
result = (
self.client._get_nic_association_name_by_mac('98:f2:b3:ee:f4:00'))
self.assertEqual(result, 'NicBoot1')
@mock.patch.object(ris.RISOperations, '_get_collection')
def test__get_all_macs(self, collection_mock):
member_uri = '/rest/v1/Systems/1/NetworkAdapters'
collection_item = json.loads(ris_outputs.RESP_NETWORK_ADAPTER)
collection_mock.return_value = [(200, None, collection_item,
member_uri)]
result = self.client._get_all_macs()
self.assertEqual(result, ['9c:b6:54:79:78:70'])
@mock.patch.object(ris.RISOperations, '_get_all_macs')
def test__validate_macs(self, get_all_macs_mock):
get_all_macs_mock.return_value = [
'12:44:6a:3b:04:11', '13:44:6a:3b:04:13']
result = self.client._validate_macs(['12:44:6a:3b:04:11'])
self.assertEqual(result, None)
@mock.patch.object(ris.RISOperations, '_get_all_macs')
def test_validate_macs_failed(self, get_all_macs_mock):
get_all_macs_mock.return_value = [
'12:44:6a:3b:04:11', '13:44:6a:3b:04:13']
self.assertRaisesRegex(
exception.InvalidInputError,
"Given macs: \['12:44:6A:3B:04:15'\] not found in the system",
self.client._validate_macs, ['12:44:6A:3B:04:15'])
@mock.patch.object(ris.RISOperations, '_get_collection')
def test__get_uefi_device_path_by_mac(self, collection_mock):
member_uri = '/rest/v1/Systems/1/NetworkAdapters'
collection_item = json.loads(ris_outputs.RESP_NETWORK_ADAPTER)
collection_mock.return_value = [(200, None, collection_item,
member_uri)]
result = self.client._get_uefi_device_path_by_mac('9c:b6:54:79:78:70')
self.assertEqual(result, 'PciRoot(0x0)/Pci(0x2,0x3)/Pci(0x0,0x0)')
@mock.patch.object(ris.RISOperations, '_rest_patch')
@mock.patch.object(ris.RISOperations, '_check_iscsi_rest_patch_allowed')
@mock.patch.object(ris.RISOperations, '_get_bios_mappings_resource')
@@ -1759,25 +1842,66 @@ class TestRISOperationsPrivateMethods(testtools.TestCase):
check_iscsi_mock.return_value = iscsi_uri
patch_mock.return_value = (200, ris_outputs.GET_HEADERS,
ris_outputs.REST_POST_RESPONSE)
self.client._change_iscsi_settings(properties)
self.client._change_iscsi_settings(properties, [])
check_bios_mock.assert_called_once_with()
mappings_mock.assert_called_once_with(bios_settings)
check_iscsi_mock.assert_called_once_with()
patch_mock.assert_called_once_with(iscsi_uri, None, settings)
@mock.patch.object(ris.RISOperations, '_validate_macs')
@mock.patch.object(ris.RISOperations, '_get_nic_association_name_by_mac')
@mock.patch.object(ris.RISOperations, '_rest_patch')
@mock.patch.object(ris.RISOperations, '_check_iscsi_rest_patch_allowed')
def test__change_iscsi_settings_with_mac(
self, check_iscsi_mock, patch_mock, nic_association_mock,
validate_mock):
nic_association_mock.return_value = 'NicBoot1'
iscsi_uri = '/rest/v1/systems/1/bios/iScsi/Settings'
properties = {'iSCSITargetName':
'iqn.2011-07.com.example.server:test1',
'iSCSIBootLUN': '1',
'iSCSITargetIpAddress': '10.10.1.30',
'iSCSITargetTcpPort': 3260}
settings = json.loads(ris_outputs.GET_ISCSI_PATCH)
check_iscsi_mock.return_value = iscsi_uri
patch_mock.return_value = (200, ris_outputs.GET_HEADERS,
ris_outputs.REST_POST_RESPONSE)
self.client._change_iscsi_settings(properties, ['98:f2:b3:ee:f4:00'])
patch_mock.assert_called_once_with(
iscsi_uri, None,
{'iSCSIBootSources': [settings['iSCSIBootSources'][0]]})
validate_mock.assert_called_once_with(['98:f2:b3:ee:f4:00'])
@mock.patch.object(ris.RISOperations, '_validate_macs')
@mock.patch.object(ris.RISOperations, '_check_iscsi_rest_patch_allowed')
def test__change_iscsi_settings_invalid_mac(
self, check_iscsi_mock, validate_macs_mock):
iscsi_uri = '/rest/v1/systems/1/bios/iScsi/Settings'
check_iscsi_mock.return_value = iscsi_uri
msg = ("Given macs: %(macs)s not found in the system"
% {'macs': str(['12:44:6A:3B:04:15'])})
validate_macs_mock.side_effect = exception.InvalidInputError(msg)
self.assertRaisesRegex(
exception.InvalidInputError,
"Given macs: \['12:44:6A:3B:04:15'\] not found in the system",
self.client._change_iscsi_settings, {}, ['12:44:6A:3B:04:15'])
@mock.patch.object(ris.RISOperations, '_check_iscsi_rest_patch_allowed')
@mock.patch.object(ris.RISOperations, '_get_bios_mappings_resource')
@mock.patch.object(ris.RISOperations, '_check_bios_resource')
def test__change_iscsi_settings_without_nic(self, check_bios_mock,
mappings_mock):
def test__change_iscsi_settings_no_macs(
self, check_bios_mock, mappings_mock, check_iscsi_mock):
bios_uri = '/rest/v1/systems/1/bios'
iscsi_uri = '/rest/v1/systems/1/bios/iScsi/Settings'
bios_settings = json.loads(ris_outputs.GET_BIOS_SETTINGS)
check_bios_mock.return_value = (ris_outputs.GET_HEADERS,
bios_uri, bios_settings)
map_settings = json.loads(ris_outputs.GET_BIOS_MAPPINGS_WITHOUT_NIC)
mappings_mock.return_value = map_settings
check_iscsi_mock.return_value = iscsi_uri
self.assertRaises(exception.IloError,
self.client._change_iscsi_settings,
{})
self.client._change_iscsi_settings, {},
[])
check_bios_mock.assert_called_once_with()
mappings_mock.assert_called_once_with(bios_settings)
@@ -1806,7 +1930,7 @@ class TestRISOperationsPrivateMethods(testtools.TestCase):
ris_outputs.REST_POST_RESPONSE)
self.assertRaises(exception.IloError,
self.client._change_iscsi_settings,
properties)
properties, [])
check_bios_mock.assert_called_once_with()
mappings_mock.assert_called_once_with(bios_settings)
check_iscsi_mock.assert_called_once_with()