Linting 1.0.41

Author: rajeevkallur

CHANGELOG.md

@@ -41,28 +41,4 @@ pip install paramiko
 ```
 ```
 pip install certifi
-```
-
-## License
-
-This project is licensed under the Apache 2.0 license. Please see the [LICENSE](LICENSE) for more information.
-
-## Contributing and feature requests
-
-**Contributing:** We welcome your contributions to the Ansible Modules for HPE OneView. See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
-
-**Feature Requests:** If you have a need that is not met by the current implementation, please let us know (via a new issue).
-This feedback is crucial for us to deliver a useful product. Do not assume that we have already thought of everything, because we assure you that is not the case.
-
-## Features
-
-The HPE.Oneview collection includes
-[roles](https://github.com/HewlettPackard/ilo-ansible-collection/tree/master/roles/),
-[modules](https://github.com/HewlettPackard/ilo-ansible-collection/tree/master/plugins/modules),
-[sample playbooks](https://github.com/HewlettPackard/ilo-ansible-collection/tree/master/playbooks),
-[module_utils](https://github.com/HewlettPackard/ilo-ansible-collection/tree/master/plugins/module_utils)
-
-
-## Copyright
-
-© Copyright 2022-24 Hewlett Packard Enterprise Development LP
+```

README.md

@@ -9,17 +9,19 @@ namespace: hpe
 name: ilo
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.0.13
+version: 1.0.41
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
 
 # A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
 # @nicks:irc/im.site#channel'
 authors:
-- Rajeevalochana Kallur <[email protected]>
-- Bhavya B <[email protected]>
-
+  - Rajeevalochana Kallur <[email protected]>
+  - Bhavya B <[email protected]>
+  - Gayathiri devi Ramasamy [email protected]
+  - Nagendra M [email protected]
+  - T S Kushal [email protected]
 
 ### OPTIONAL but strongly recommended
 
@@ -33,16 +35,16 @@ license_file: LICENSE
 # A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
 # requirements as 'namespace' and 'name'
 tags:
- - ansible
- - devops
- - hpe_ilo
- - infrastructure_as_code
- - bare_metal
- - linux
- - infrastructure
- - networking
- - storage
- - security
+  - ansible
+  - devops
+  - hpe_ilo
+  - infrastructure_as_code
+  - bare_metal
+  - linux
+  - infrastructure
+  - networking
+  - storage
+  - security
 
 # Collections that this collection requires to be installed for it to be usable. The key of the dict is the
 # collection label 'namespace.name'. The value is a version range

galaxy.yml

@@ -153,10 +153,10 @@ def __init__(self, creds, root_uri, timeout, module):
                 'urllib3'), exception=URLLIB3_IMP_ERR)
 
         if not HAS_REDFISH:
-            self.module.warn(f"missing redfish library")
+            self.module.warn("missing redfish library")
 
         if not HAS_PARAMIKO:
-            self.module.warn(f"missing paramiko library")
+            self.module.warn("missing paramiko library")
 
     def get_ilo_generation(self):
         # Get the firmware version
@@ -170,7 +170,7 @@ def get_ilo_generation(self):
                 "msg": "Key 'FirmwareVersion' not found in response: %s" % (resp)
             }
         fw_version = resp['FirmwareVersion']
-        ilo_gen = re.sub("\D", "", fw_version).strip()[0]
+        ilo_gen = re.sub(r"\D", "", fw_version).strip()[0]
         return {
             "ret": True,
             "ilo_gen": int(ilo_gen)
@@ -1031,7 +1031,8 @@ def verify_logical_drives(self, raid_details, check_length=False):
                                             % (str(raid["Raid"]), ("Raid" + str(drive["Raid"])))
                         if len(drive["data_drives"]) != raid["DataDrives"]["DataDriveCount"]:
                             fail = True
-                            fail_message += "Physical drive count present in the input (%s) does not match with the physical drive count present in the server (%s). " \
+                            fail_message += "Physical drive count present in the input (%s) "\
+                                "does not match with the physical drive count present in the server (%s). " \
                                             % (str(raid["DataDrives"]["DataDriveCount"]), str(len(drive["data_drives"])))
                         if drive["MediaType"] != raid["DataDrives"]["DataDriveMediaType"]:
                             fail = True
@@ -1044,8 +1045,9 @@ def verify_logical_drives(self, raid_details, check_length=False):
                         for data_drive in drive["data_drives"]:
                             if data_drive["CapacityGB"] < raid["DataDrives"]["DataDriveMinimumSizeGiB"]:
                                 fail = True
-                                fail_message += "Data drive minimum size present in the input (%s) does not satisfied by drive with ID (%s) with the data drive minimum size (%s). " \
-                                                % (str(raid["DataDrives"]["DataDriveMinimumSizeGiB"]), str(data_drive["Id"]), str(data_drive["CapacityGB"]))
+                                fail_message += "Data drive minimum size present in the input (%s) does not satisfied "\
+                                    "by drive with ID (%s) with the data drive minimum size (%s). " \
+                                    % (str(raid["DataDrives"]["DataDriveMinimumSizeGiB"]), str(data_drive["Id"]), str(data_drive["CapacityGB"]))
                         if fail:
                             return {
                                 "ret": False,
@@ -1084,7 +1086,7 @@ def verify_uefi_boot_order(self, uefi_boot_order):
         if not response["ret"]:
             return response
 
-         # Get the model
+        # Get the model
         sys_response = self.get_request(self.root_uri + self.systems_uri)
         if not sys_response["ret"]:
             return sys_response
@@ -1106,7 +1108,9 @@ def verify_uefi_boot_order(self, uefi_boot_order):
             return {
                 "ret": False,
                 "changed": False,
-                "msg": "The current server Boot Order contains fewer elements (%s) than the provided input Boot Order (%s)" % (str(len(server_boot_order)), str(len(input_boot_order)))
+                "msg": "The current server Boot Order contains fewer elements "
+                "(%s) than the provided input Boot Order (%s)" %
+                (str(len(server_boot_order)), str(len(input_boot_order)))
             }
 
         for i in range(0, len(input_boot_order)):
@@ -1854,7 +1858,7 @@ def delete_all_snmp_alert_destinations(self):
     def delete_snmpv3_users(self, snmpv3_users):
         # This method deletes provided SNMPv3 users
 
-        if snmpv3_users == None or len(snmpv3_users) == 0:
+        if snmpv3_users is None or len(snmpv3_users) == 0:
             return {
                 "ret": False,
                 "msg": "The provided input SNMPv3 users is empty. Hence deleting SNMPv3 users failed"
@@ -3189,7 +3193,7 @@ def get_phy_nic_info(self):
                     return {
                         "ret": False,
                         "changed": False,
-                        "msg": "'@odata.id' not found in NetworkAdapters response, %s" % (rsp_data)
+                        "msg": "'@odata.id' not found in NetworkAdapters response, %s" % (nwk_adapt_rsp_data["Members"])
                     }
                 # Get on each member eg : self.root_uri + self.service_root + /chassis/1 + /NetworkAdapters/<ID>
                 item_rsp = self.get_request(self.root_uri + item["@odata.id"])
@@ -3469,7 +3473,7 @@ def get_drive_operating_mode(self, ip_addr):
         if response["data"]["[email protected]"] == 0:
             return {
                 "ret": False,
-                "msg": "No drive found in %s. Check the iLO" % res["data"]
+                "msg": "No drive found in %s. Check the iLO" % response["data"]
             }
         # Get Members of ArrayControllers
         for mem in init_data["Members"]:
@@ -3510,7 +3514,7 @@ def import_trusted_ca(self, ca_file):
         ca_file_data = cafile.readlines()
 
         ca_file_data = ca_file_data[ca_file_data.index(
-            "-----BEGIN CERTIFICATE-----\n"):ca_file_data.index("-----END CERTIFICATE-----\n")+1]
+            "-----BEGIN CERTIFICATE-----\n"):ca_file_data.index("-----END CERTIFICATE-----\n") + 1]
         ca_file_data = "".join(ca_file_data)
 
         payload = {
@@ -3523,7 +3527,9 @@ def import_trusted_ca(self, ca_file):
                 return {
                     "ret": False,
                     "changed": False,
-                    "msg": "Importing trusted CA Certificate failed with response: " + res["msg"] + ". Certificate storage might be full, try again after cleaning up existing Trusted CA Certificates."
+                    "msg": "Importing trusted CA Certificate failed with response: "
+                    + res["msg"] + ". Certificate storage might be full,"
+                    " try again after cleaning up existing Trusted CA Certificates."
                 }
             else:
                 return res
@@ -3567,7 +3573,7 @@ def map_user_certificate(self, user_cert_file, username):
         cert_file_data = cert_file.readlines()
 
         cert_file_data = cert_file_data[cert_file_data.index(
-            "-----BEGIN CERTIFICATE-----\n"):cert_file_data.index("-----END CERTIFICATE-----\n")+1]
+            "-----BEGIN CERTIFICATE-----\n"):cert_file_data.index("-----END CERTIFICATE-----\n") + 1]
         cert_file_data = "".join(cert_file_data)
 
         payload = {
@@ -3664,7 +3670,7 @@ def enable_certificate_login(self):
 
         certificate_authentication_data = certificate_authentication["data"]
 
-        if certificate_authentication_data["CertificateLoginEnabled"] == True:
+        if certificate_authentication_data["CertificateLoginEnabled"] is True:
             return {
                 "ret": True,
                 "changed": False,
@@ -3807,7 +3813,7 @@ def install_helper(self, client, sudo_password, filename, remote, op_sys, archit
         nodir = False
         error_output = ""
 
-        command = f"ls /usr/lib/{architecture}/"
+        command = "ls /usr/lib/{}/".format(architecture)
         stdin, stdout, stderr = client.exec_command(command)
         error_output = stderr.read().decode('utf-8')
         if len(error_output) > 0:
@@ -3826,7 +3832,7 @@ def install_helper(self, client, sudo_password, filename, remote, op_sys, archit
                 if pack in package:
                     if op_sys == "apt":
                         package = package.split("_")[0]
-                    command = f'sudo -p "" {op_sys} remove -y {package}'
+                    command = 'sudo -p "" {} remove -y {}'.format(op_sys, package)
                     stdin, stdout, stderr = client.exec_command(
                         command, get_pty=True)
                     stdin.write(sudo_password + '\n')
@@ -3840,7 +3846,7 @@ def install_helper(self, client, sudo_password, filename, remote, op_sys, archit
                     break
 
             if found:
-                command = f'sudo -p "" rm -f /usr/lib/{architecture}/scexe-compat/*'
+                command = 'sudo -p "" rm -f /usr/lib/{}/scexe-compat/*'.format(architecture)
                 stdin, stdout, stderr = client.exec_command(
                     command, get_pty=True)
                 stdin.write(sudo_password + '\n')
@@ -3852,7 +3858,7 @@ def install_helper(self, client, sudo_password, filename, remote, op_sys, archit
                     return result
                 found = False
 
-        command = f'sudo -p "" {op_sys} install -y {remote}{filename}'
+        command = 'sudo -p "" {} install -y {}{}'.format(op_sys, remote, filename)
         stdin, stdout, stderr = client.exec_command(command, get_pty=True)
         stdin.write(sudo_password + '\n')
         stdin.flush()
@@ -3979,7 +3985,7 @@ def install_smartcomp(self, rpm_info):
             result["msg"] = "Architecture not supported."
             return result
 
-        command = "ls /usr/lib/"+smcp_file+"/scexe-compat"
+        command = "ls /usr/lib/" + smcp_file + "/scexe-compat"
         stdin, stdout, stderr = client.exec_command(command)
         smart_component = stdout.read().decode('utf-8')
         error_output = stderr.read().decode('utf-8')
@@ -4059,11 +4065,15 @@ def firmware_upgrade_with_upload(self, image_uri, file_name, upgrade=True):
             return ilo_repo_rsp
 
         for each_file_name in ilo_repo_rsp["msg"]["Members"]:
-            if((each_file_name["Filename"] == file_name or (file_name == '' and each_file_name["Filename"] == image_uri.split('/')[-1])) and each_file_name["Locked"]):
+            if ((each_file_name["Filename"] == file_name or
+                (file_name == '' and each_file_name["Filename"] == image_uri.split('/')[-1]))
+                    and each_file_name["Locked"]):
                 return {
                     "ret": False,
                     "changed": False,
-                    "msg": "The file with name '%s' already exists in the repository and is locked. Remove the install set or task that is locking the component and try again." % (each_file_name["Filename"])
+                    "msg": "The file with name '%s' already exists in the repository and is locked."
+                    " Remove the install set or task that is locking the component and try again."
+                    % (each_file_name["Filename"])
                 }
 
         update_url = self.root_uri + \
@@ -4075,7 +4085,7 @@ def firmware_upgrade_with_upload(self, image_uri, file_name, upgrade=True):
             "TPMOverrideFlag": True
         }
 
-        if(file_name != ''):
+        if (file_name != ''):
             body["ComponentFileName"] = file_name
 
         response = self.post_request(update_url, body)
@@ -4164,7 +4174,7 @@ def create_maintenance_window(self, maintenance_window_data):
         end_time = datetime.strptime(
             maintenance_window_data["Expire"], "%Y-%m-%dT%H:%M:%SZ")
 
-        if(start_time > end_time):
+        if (start_time > end_time):
             return {
                 "ret": False,
                 "changed": False,
@@ -4312,7 +4322,7 @@ def create_install_set(self, install_set_url, install_set_attributes):
             "Name": str(install_set_attributes["Name"]),
             "Sequence": install_set_attributes["Install_set_sequence"]
         }
-        if(install_set_attributes["Description"] != ''):
+        if (install_set_attributes["Description"] != ''):
             install_set_body["Description"] = install_set_attributes["Description"]
 
         response = self.post_request(
@@ -4404,7 +4414,8 @@ def get_maintenance_window_id(self, maintenance_window_details):
                         return {
                             "ret": False,
                             "changed": False,
-                            "msg": "Maintenance window with same name with different start and expire time already exists in the server. Hence provide unique name for maintenance window"
+                            "msg": "Maintenance window with same name with different start and expire time"
+                            "already exists in the server. Hence provide unique name for maintenance window"
                         }
                     else:
                         end_time = datetime.strptime(
@@ -4507,7 +4518,7 @@ def get_install_set_url(self, install_set_attributes):
                 if each_filename["Filename"] == each["Filename"]:
                     file_found = True
             if not file_found:
-                return{
+                return {
                     "ret": False,
                     "changed": False,
                     "msg": "Provided filename %s doesn't exist in ilo repository" % (each_filename["Filename"])

plugins/module_utils/ilo_oem_utils.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 ###
 # Copyright (2016-2024) Hewlett Packard Enterprise Development LP

plugins/modules/ilo_boot.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 ###
 # Copyright (2016-2024) Hewlett Packard Enterprise Development LP
@@ -203,7 +203,7 @@ def main():
             module.fail_json(msg="Invalid Category: %s" % category)
 
         # Organize by Categories / Commands
-        if category == "Chassis":            
+        if category == "Chassis":
             for command in command_list:
                 result[command] = {}
                 if command == "GetDeviceInventoryInfo":
@@ -222,7 +222,7 @@ def main():
                             'ret': False, 'msg': "Only one IndicatorLed command should be sent at a time."}
                     else:
                         response = rf_utils.get_request(
-                            root_uri+"/redfish/v1/Managers/1")
+                            root_uri + "/redfish/v1/Managers/1")
                         if response['ret'] is False:
                             module.fail_json(msg=to_native(response))
                         version = float(response['data']['FirmwareVersion'][4] + "." + response['data']