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

WDC Redfish firmware update support for update image creds (#5056) (#5057)

Browse source 
Allows user to specify Basic Auth credentials for firmware update image.

(cherry picked from commit 4eb3540c8e)

Co-authored-by: Mike <michael.moerk@wdc.com>
This commit is contained in:
patchback[bot] 2022-08-02 10:20:15 +02:00 committed by GitHub
parent e56dafde94
commit a81e94ddc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
plugins/module_utils/wdc_redfish_utils.py
View file

@ -58,6 +58,7 @@ class WdcRedfishUtils(RedfishUtils):
response = self.get_request(uri) response = self.get_request(uri)
if response['ret']: if response['ret']:
self.root_uri = root_uri self.root_uri = root_uri
break
def _find_updateservice_resource(self): def _find_updateservice_resource(self):
"""Find the update service resource as well as additional WDC-specific resources.""" """Find the update service resource as well as additional WDC-specific resources."""
@ -157,8 +158,7 @@ class WdcRedfishUtils(RedfishUtils):
'msg': "FWActivate requested"} 'msg': "FWActivate requested"}
def _get_bundle_version(self, def _get_bundle_version(self,
bundle_uri, bundle_uri):
update_creds):
"""Get the firmware version from a bundle file, and whether or not it is multi-tenant. """Get the firmware version from a bundle file, and whether or not it is multi-tenant.
Only supports HTTP at this time. Assumes URI exists and is a tarfile. Only supports HTTP at this time. Assumes URI exists and is a tarfile.
@ -169,20 +169,12 @@ class WdcRedfishUtils(RedfishUtils):
and checks the appropriate byte in the file. and checks the appropriate byte in the file.
:param str bundle_uri: HTTP URI of the firmware bundle. :param str bundle_uri: HTTP URI of the firmware bundle.
:param dict or None update_creds: Dict containing username and password to access the bundle.
:return: Firmware version number contained in the bundle, and whether or not the bundle is multi-tenant. :return: Firmware version number contained in the bundle, and whether or not the bundle is multi-tenant.
Either value will be None if unable to deterine. Either value will be None if unable to deterine.
:rtype: str or None, bool or None :rtype: str or None, bool or None
""" """
parsed_url = urlparse(bundle_uri)
if update_creds:
original_netloc = parsed_url.netloc
parsed_url._replace(netloc="{0}:{1}{2}".format(update_creds.get("username"),
update_creds.get("password"),
original_netloc))
bundle_temp_filename = fetch_file(module=self.module, bundle_temp_filename = fetch_file(module=self.module,
url=urlunparse(parsed_url)) url=bundle_uri)
if not tarfile.is_tarfile(bundle_temp_filename): if not tarfile.is_tarfile(bundle_temp_filename):
return None, None return None, None
tf = tarfile.open(bundle_temp_filename) tf = tarfile.open(bundle_temp_filename)
@ -223,8 +215,21 @@ class WdcRedfishUtils(RedfishUtils):
Performs retries, handles timeouts as needed. Performs retries, handles timeouts as needed.
""" """
# Convert credentials to standard HTTP format
if update_opts.get("update_creds") is not None and "username" in update_opts["update_creds"] and "password" in update_opts["update_creds"]:
update_creds = update_opts["update_creds"]
parsed_url = urlparse(update_opts["update_image_uri"])
if update_creds:
original_netloc = parsed_url.netloc
parsed_url = parsed_url._replace(netloc="{0}:{1}@{2}".format(update_creds.get("username"),
update_creds.get("password"),
original_netloc))
update_opts["update_image_uri"] = urlunparse(parsed_url)
del update_opts["update_creds"]
# Make sure bundle URI is HTTP(s) # Make sure bundle URI is HTTP(s)
bundle_uri = update_opts["update_image_uri"] bundle_uri = update_opts["update_image_uri"]
if not self.uri_is_http(bundle_uri): if not self.uri_is_http(bundle_uri):
return { return {
'ret': False, 'ret': False,
@ -250,9 +255,7 @@ class WdcRedfishUtils(RedfishUtils):
# Check the FW version in the bundle file, and compare it to what is already on the IOMs # Check the FW version in the bundle file, and compare it to what is already on the IOMs
# Bundle version number # Bundle version number
update_creds = update_opts.get("update_creds") bundle_firmware_version, is_bundle_multi_tenant = self._get_bundle_version(bundle_uri)
bundle_firmware_version, is_bundle_multi_tenant = self._get_bundle_version(bundle_uri,
update_creds)
if bundle_firmware_version is None or is_bundle_multi_tenant is None: if bundle_firmware_version is None or is_bundle_multi_tenant is None:
return { return {
'ret': False, 'ret': False,
@ -313,6 +316,7 @@ class WdcRedfishUtils(RedfishUtils):
if retry_number != 0: if retry_number != 0:
time.sleep(retry_interval_seconds) time.sleep(retry_interval_seconds)
retry_number += 1 retry_number += 1
result = self.simple_update(update_opts) result = self.simple_update(update_opts)
if result['ret'] is not True: if result['ret'] is not True:
# Sometimes a timeout error is returned even though the update actually was requested. # Sometimes a timeout error is returned even though the update actually was requested.