1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

redfish_command: VirtualMediaInsert does not work with Supermicro (#4839) (#4863)

* bugfix virtual media support for supermicro hardware

* Added Changelog for PR4839

(cherry picked from commit 5e57d2af0a)

Co-authored-by: FRUCHTiii <57792137+FRUCHTiii@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2022-06-20 19:29:52 +02:00 committed by GitHub
parent 5861388f11
commit 4481d0a4a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 13 deletions

View file

@ -0,0 +1,8 @@
bugfixes:
- redfish_command - fix the check if a virtual media is unmounted to just check for ``instered= false``
caused by Supermicro hardware that does not clear the ``ImageName``
(https://github.com/ansible-collections/community.general/pull/4839).
- redfish_command - the Supermicro Redfish implementation only supports the ``image_url`` parameter in
the underlying API calls to ``VirtualMediaInsert`` and ``VirtualMediaEject``. Any values set
(or the defaults) for ``write_protected`` or ``inserted`` will be ignored
(https://github.com/ansible-collections/community.general/pull/4839).

View file

@ -2187,9 +2187,8 @@ class RedfishUtils(object):
else: else:
if media_match_strict: if media_match_strict:
continue continue
# if ejected, 'Inserted' should be False and 'ImageName' cleared # if ejected, 'Inserted' should be False
if (not data.get('Inserted', False) and if (not data.get('Inserted', False)):
not data.get('ImageName')):
return uri, data return uri, data
return None, None return None, None
@ -2225,7 +2224,7 @@ class RedfishUtils(object):
return resources, headers return resources, headers
@staticmethod @staticmethod
def _insert_virt_media_payload(options, param_map, data, ai): def _insert_virt_media_payload(options, param_map, data, ai, image_only=False):
payload = { payload = {
'Image': options.get('image_url') 'Image': options.get('image_url')
} }
@ -2239,6 +2238,12 @@ class RedfishUtils(object):
options.get(option), option, options.get(option), option,
allowable)} allowable)}
payload[param] = options.get(option) payload[param] = options.get(option)
# Some hardware (such as iLO 4 or Supermicro) only supports the Image property
# Inserted and WriteProtected are not writable
if image_only:
del payload['Inserted']
del payload['WriteProtected']
return payload return payload
def virtual_media_insert_via_patch(self, options, param_map, uri, data, image_only=False): def virtual_media_insert_via_patch(self, options, param_map, uri, data, image_only=False):
@ -2247,16 +2252,10 @@ class RedfishUtils(object):
{'AllowableValues': v}) for k, v in data.items() {'AllowableValues': v}) for k, v in data.items()
if k.endswith('@Redfish.AllowableValues')) if k.endswith('@Redfish.AllowableValues'))
# construct payload # construct payload
payload = self._insert_virt_media_payload(options, param_map, data, ai) payload = self._insert_virt_media_payload(options, param_map, data, ai, image_only)
if 'Inserted' not in payload: if 'Inserted' not in payload and not image_only:
payload['Inserted'] = True payload['Inserted'] = True
# Some hardware (such as iLO 4) only supports the Image property on the PATCH operation
# Inserted and WriteProtected are not writable
if image_only:
del payload['Inserted']
del payload['WriteProtected']
# PATCH the resource # PATCH the resource
response = self.patch_request(self.root_uri + uri, payload) response = self.patch_request(self.root_uri + uri, payload)
if response['ret'] is False: if response['ret'] is False:
@ -2292,6 +2291,13 @@ class RedfishUtils(object):
if data["FirmwareVersion"].startswith("iLO 4"): if data["FirmwareVersion"].startswith("iLO 4"):
image_only = True image_only = True
# Supermicro does also not support Inserted and WriteProtected
# Supermicro uses as firmware version only a number so we can't check for it because we
# can't be sure that this firmware version is nut used by another vendor
# Tested with Supermicro Firmware 01.74.02
if 'Supermicro' in data['Oem']:
image_only = True
virt_media_uri = data["VirtualMedia"]["@odata.id"] virt_media_uri = data["VirtualMedia"]["@odata.id"]
response = self.get_request(self.root_uri + virt_media_uri) response = self.get_request(self.root_uri + virt_media_uri)
if response['ret'] is False: if response['ret'] is False:
@ -2346,7 +2352,7 @@ class RedfishUtils(object):
# get ActionInfo or AllowableValues # get ActionInfo or AllowableValues
ai = self._get_all_action_info_values(action) ai = self._get_all_action_info_values(action)
# construct payload # construct payload
payload = self._insert_virt_media_payload(options, param_map, data, ai) payload = self._insert_virt_media_payload(options, param_map, data, ai, image_only)
# POST to action # POST to action
response = self.post_request(self.root_uri + action_uri, payload) response = self.post_request(self.root_uri + action_uri, payload)
if response['ret'] is False: if response['ret'] is False:
@ -2392,6 +2398,9 @@ class RedfishUtils(object):
if data["FirmwareVersion"].startswith("iLO 4"): if data["FirmwareVersion"].startswith("iLO 4"):
image_only = True image_only = True
if 'Supermicro' in data['Oem']:
image_only = True
virt_media_uri = data["VirtualMedia"]["@odata.id"] virt_media_uri = data["VirtualMedia"]["@odata.id"]
response = self.get_request(self.root_uri + virt_media_uri) response = self.get_request(self.root_uri + virt_media_uri)
if response['ret'] is False: if response['ret'] is False: