diff --git a/plugins/modules/dellemc_configure_idrac_eventing.py b/plugins/modules/dellemc_configure_idrac_eventing.py index f34b733d7..09c198318 100644 --- a/plugins/modules/dellemc_configure_idrac_eventing.py +++ b/plugins/modules/dellemc_configure_idrac_eventing.py @@ -203,6 +203,10 @@ def run_idrac_eventing_config(idrac, module): module.params['share_user'], module.params['share_password'])) + if not upd_share.IsValid: + module.fail_json(msg="Unable to access the share. Ensure that the share name, " + "share mount, and share credentials provided are correct.") + set_liason = idrac.config_mgr.set_liason_share(upd_share) if set_liason['Status'] == "Failed": try: diff --git a/plugins/modules/dellemc_configure_idrac_services.py b/plugins/modules/dellemc_configure_idrac_services.py index 31c7d1cdc..c4996aaa2 100644 --- a/plugins/modules/dellemc_configure_idrac_services.py +++ b/plugins/modules/dellemc_configure_idrac_services.py @@ -214,6 +214,10 @@ def run_idrac_services_config(idrac, module): module.params['share_password']) ) + if not upd_share.IsValid: + module.fail_json(msg="Unable to access the share. Ensure that the share name, " + "share mount, and share credentials provided are correct.") + set_liason = idrac.config_mgr.set_liason_share(upd_share) if set_liason['Status'] == "Failed": try: diff --git a/plugins/modules/dellemc_idrac_lc_attributes.py b/plugins/modules/dellemc_idrac_lc_attributes.py index c8285ff33..245a242b2 100644 --- a/plugins/modules/dellemc_idrac_lc_attributes.py +++ b/plugins/modules/dellemc_idrac_lc_attributes.py @@ -150,6 +150,10 @@ def run_setup_idrac_csior(idrac, module): module.params['share_password']) ) + if not upd_share.IsValid: + module.fail_json(msg="Unable to access the share. Ensure that the share name, " + "share mount, and share credentials provided are correct.") + set_liason = idrac.config_mgr.set_liason_share(upd_share) if set_liason['Status'] == "Failed": try: diff --git a/plugins/modules/dellemc_system_lockdown_mode.py b/plugins/modules/dellemc_system_lockdown_mode.py index 34a5e0468..c5113bcab 100644 --- a/plugins/modules/dellemc_system_lockdown_mode.py +++ b/plugins/modules/dellemc_system_lockdown_mode.py @@ -154,6 +154,10 @@ def run_system_lockdown_mode(idrac, module): module.params['share_password']) ) + if not upd_share.IsValid: + module.fail_json(msg="Unable to access the share. Ensure that the share name, " + "share mount, and share credentials provided are correct.") + set_liason = idrac.config_mgr.set_liason_share(upd_share) if set_liason['Status'] == "Failed": try: diff --git a/plugins/modules/idrac_bios.py b/plugins/modules/idrac_bios.py index 7310cb87f..514b8475a 100644 --- a/plugins/modules/idrac_bios.py +++ b/plugins/modules/idrac_bios.py @@ -232,7 +232,7 @@ import tempfile import json from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.basic import AnsibleModule try: @@ -259,6 +259,12 @@ def run_server_bios_config(idrac, module): module.params['share_user'], module.params['share_password']) ) + + if not upd_share.IsValid: + if not upd_share.IsValid: + module.fail_json(msg="Unable to access the share. Ensure that the share name, " + "share mount, and share credentials provided are correct.") + if module.params['boot_sources']: _validate_params(module.params['boot_sources']) if module.check_mode: diff --git a/plugins/modules/idrac_firmware.py b/plugins/modules/idrac_firmware.py index e0f0952ec..b9648d391 100644 --- a/plugins/modules/idrac_firmware.py +++ b/plugins/modules/idrac_firmware.py @@ -174,7 +174,7 @@ from ansible_collections.dellemc.openmanage.plugins.module_utils.idrac_redfish import iDRACRedfishAPI from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six.moves.urllib.parse import urlparse -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError try: from omsdk.sdkcreds import UserCredentials @@ -411,6 +411,11 @@ def update_firmware_omsdk(idrac, module): upd_share = FileOnShare(remote="{0}{1}{2}".format(share_name, os.sep, catalog_file_name), mount_point=module.params['share_mnt'], isFolder=False, creds=UserCredentials(share_user, share_pwd)) + + if not upd_share.IsValid: + module.fail_json(msg="Unable to access the share. Ensure that the share name, " + "share mount, and share credentials provided are correct.") + msg['update_status'] = idrac.update_mgr.update_from_repo(upd_share, apply_update=apply_update, reboot_needed=reboot, job_wait=job_wait) get_check_mode_status(msg['update_status'], module) diff --git a/plugins/modules/idrac_firmware_info.py b/plugins/modules/idrac_firmware_info.py index a48d79e8f..d2fe888fc 100644 --- a/plugins/modules/idrac_firmware_info.py +++ b/plugins/modules/idrac_firmware_info.py @@ -106,7 +106,7 @@ import json from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError try: from omsdk.sdkfile import LocalFile diff --git a/plugins/modules/idrac_lifecycle_controller_job_status_info.py b/plugins/modules/idrac_lifecycle_controller_job_status_info.py index 865035ee0..cac3b7a8d 100644 --- a/plugins/modules/idrac_lifecycle_controller_job_status_info.py +++ b/plugins/modules/idrac_lifecycle_controller_job_status_info.py @@ -97,7 +97,7 @@ import json from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/idrac_lifecycle_controller_logs.py b/plugins/modules/idrac_lifecycle_controller_logs.py index 775ef53db..249e844a1 100644 --- a/plugins/modules/idrac_lifecycle_controller_logs.py +++ b/plugins/modules/idrac_lifecycle_controller_logs.py @@ -108,7 +108,7 @@ from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError import json try: from omsdk.sdkfile import file_share_manager diff --git a/plugins/modules/idrac_lifecycle_controller_status_info.py b/plugins/modules/idrac_lifecycle_controller_status_info.py index bafa5ecc0..e59360a96 100644 --- a/plugins/modules/idrac_lifecycle_controller_status_info.py +++ b/plugins/modules/idrac_lifecycle_controller_status_info.py @@ -85,7 +85,7 @@ from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError from ansible.module_utils.basic import AnsibleModule import json diff --git a/plugins/modules/idrac_network.py b/plugins/modules/idrac_network.py index f2c705602..f1b8b37f2 100644 --- a/plugins/modules/idrac_network.py +++ b/plugins/modules/idrac_network.py @@ -210,7 +210,7 @@ import json from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.basic import AnsibleModule try: @@ -229,6 +229,7 @@ def run_idrac_network_config(idrac, module): idrac.use_redfish = True + upd_share = file_share_manager.create_share_obj(share_path=module.params['share_name'], mount_point=module.params['share_mnt'], isFolder=True, @@ -237,6 +238,10 @@ def run_idrac_network_config(idrac, module): module.params['share_password']) ) + if not upd_share.IsValid: + module.fail_json(msg="Unable to access the share. Ensure that the share name, " + "share mount, and share credentials provided are correct.") + idrac.config_mgr.set_liason_share(upd_share) if module.params['register_idrac_on_dns'] is not None: idrac.config_mgr.configure_dns( diff --git a/plugins/modules/idrac_reset.py b/plugins/modules/idrac_reset.py index 8ba87e30c..c6f306604 100644 --- a/plugins/modules/idrac_reset.py +++ b/plugins/modules/idrac_reset.py @@ -95,7 +95,7 @@ from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError def run_idrac_reset(idrac, module): diff --git a/plugins/modules/idrac_syslog.py b/plugins/modules/idrac_syslog.py index d63aa81d6..f42380bb6 100644 --- a/plugins/modules/idrac_syslog.py +++ b/plugins/modules/idrac_syslog.py @@ -124,7 +124,7 @@ from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError try: from omsdk.sdkfile import file_share_manager @@ -141,6 +141,11 @@ def run_setup_idrac_syslog(idrac, module): creds=UserCredentials( module.params['share_user'], module.params['share_password'])) + + if not upd_share.IsValid: + module.fail_json(msg="Unable to access the share. Ensure that the share name, " + "share mount, and share credentials provided are correct.") + idrac.config_mgr.set_liason_share(upd_share) if module.check_mode: if module.params['syslog'] == 'Enabled': diff --git a/plugins/modules/idrac_system_info.py b/plugins/modules/idrac_system_info.py index 76f14dda6..10f66bac5 100644 --- a/plugins/modules/idrac_system_info.py +++ b/plugins/modules/idrac_system_info.py @@ -90,7 +90,7 @@ from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError # Main diff --git a/plugins/modules/idrac_timezone_ntp.py b/plugins/modules/idrac_timezone_ntp.py index 56cc7d7a5..f0b09aeee 100644 --- a/plugins/modules/idrac_timezone_ntp.py +++ b/plugins/modules/idrac_timezone_ntp.py @@ -127,7 +127,7 @@ from ansible_collections.dellemc.openmanage.plugins.module_utils.dellemc_idrac import iDRACConnection from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError import json try: from omdrivers.enums.iDRAC.iDRAC import NTPEnable_NTPConfigGroupTypes @@ -153,6 +153,10 @@ def run_idrac_timezone_config(idrac, module): module.params['share_user'], module.params['share_password'])) + if not upd_share.IsValid: + module.fail_json(msg="Unable to access the share. Ensure that the share name, " + "share mount, and share credentials provided are correct.") + idrac.config_mgr.set_liason_share(upd_share) if module.params['setup_idrac_timezone'] is not None: diff --git a/plugins/modules/idrac_user.py b/plugins/modules/idrac_user.py index a00db6689..233128549 100644 --- a/plugins/modules/idrac_user.py +++ b/plugins/modules/idrac_user.py @@ -200,7 +200,7 @@ import re import time from ansible.module_utils.six.moves.urllib.error import URLError, HTTPError -from ansible.module_utils.urls import open_url, ConnectionError, SSLValidationError +from ansible.module_utils.urls import ConnectionError, SSLValidationError from ansible_collections.dellemc.openmanage.plugins.module_utils.idrac_redfish import iDRACRedfishAPI from ansible.module_utils.basic import AnsibleModule