internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-03-26 21:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace batch 6 of redundant to_native()/to_text() occurrences (#11110)

Browse Source 
* replace batch 6 of redundant to_native()/to_text() occurrences

* add changelog frag
This commit is contained in:
Alexei Znamensky
2025-11-13 09:43:39 +13:00
committed by GitHub
parent f785e9c780
commit 996d9a7f63
11 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
changelogs/fragments/11110-tonative-6.yml Normal file
View File

@@ -0,0 +1,12 @@
minor_changes:
- idrac_redfish_command - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- idrac_redfish_config - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- idrac_redfish_info - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- ilo_redfish_command - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- ilo_redfish_config - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- ocapi_command - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- redfish_command - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- redfish_config - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- wdc_redfish_command - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- wdc_redfish_info - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).
- xcc_redfish_command - remove redundant conversions to unicode (https://github.com/ansible-collections/community.general/pull/11110).

8
plugins/modules/idrac_redfish_command.py
View File

@@ -190,17 +190,13 @@ def main():
# Check that Category is valid # Check that Category is valid
if category not in CATEGORY_COMMANDS_ALL: if category not in CATEGORY_COMMANDS_ALL:
module.fail_json( module.fail_json(msg=f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
msg=to_native(f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
)
# Check that all commands are valid # Check that all commands are valid
for cmd in command_list: for cmd in command_list:
# Fail if even one command given is invalid # Fail if even one command given is invalid
if cmd not in CATEGORY_COMMANDS_ALL[category]: if cmd not in CATEGORY_COMMANDS_ALL[category]:
module.fail_json( module.fail_json(msg=f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
# Organize by Categories / Commands # Organize by Categories / Commands

8
plugins/modules/idrac_redfish_config.py
View File

@@ -290,17 +290,13 @@ def main():
# Check that Category is valid # Check that Category is valid
if category not in CATEGORY_COMMANDS_ALL: if category not in CATEGORY_COMMANDS_ALL:
module.fail_json( module.fail_json(msg=f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
msg=to_native(f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
)
# Check that all commands are valid # Check that all commands are valid
for cmd in command_list: for cmd in command_list:
# Fail if even one command given is invalid # Fail if even one command given is invalid
if cmd not in CATEGORY_COMMANDS_ALL[category]: if cmd not in CATEGORY_COMMANDS_ALL[category]:
module.fail_json( module.fail_json(msg=f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
# check for mutually exclusive commands # check for mutually exclusive commands
try: try:

8
plugins/modules/idrac_redfish_info.py
View File

@@ -221,17 +221,13 @@ def main():
# Check that Category is valid # Check that Category is valid
if category not in CATEGORY_COMMANDS_ALL: if category not in CATEGORY_COMMANDS_ALL:
module.fail_json( module.fail_json(msg=f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
msg=to_native(f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
)
# Check that all commands are valid # Check that all commands are valid
for cmd in command_list: for cmd in command_list:
# Fail if even one command given is invalid # Fail if even one command given is invalid
if cmd not in CATEGORY_COMMANDS_ALL[category]: if cmd not in CATEGORY_COMMANDS_ALL[category]:
module.fail_json( module.fail_json(msg=f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
# Organize by Categories / Commands # Organize by Categories / Commands

8
plugins/modules/ilo_redfish_command.py
View File

@@ -140,17 +140,13 @@ def main():
# Check that Category is valid # Check that Category is valid
if category not in CATEGORY_COMMANDS_ALL: if category not in CATEGORY_COMMANDS_ALL:
module.fail_json( module.fail_json(msg=f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
msg=to_native(f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
)
# Check that all commands are valid # Check that all commands are valid
for cmd in command_list: for cmd in command_list:
# Fail if even one command given is invalid # Fail if even one command given is invalid
if cmd not in CATEGORY_COMMANDS_ALL[category]: if cmd not in CATEGORY_COMMANDS_ALL[category]:
module.fail_json( module.fail_json(msg=f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
if category == "Systems": if category == "Systems":
# execute only if we find a System resource # execute only if we find a System resource

4
plugins/modules/ilo_redfish_config.py
View File

@@ -166,9 +166,7 @@ def main():
offending = [cmd for cmd in command_list if cmd not in CATEGORY_COMMANDS_ALL[category]] offending = [cmd for cmd in command_list if cmd not in CATEGORY_COMMANDS_ALL[category]]
if offending: if offending:
module.fail_json( module.fail_json(msg=f"Invalid Command(s): '{offending}'. Allowed Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command(s): '{offending}'. Allowed Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
if category == "Manager": if category == "Manager":
resource = rf_utils._find_managers_resource() resource = rf_utils._find_managers_resource()

8
plugins/modules/redfish_command.py
View File

@@ -1012,17 +1012,13 @@ def main():
# Check that Category is valid # Check that Category is valid
if category not in CATEGORY_COMMANDS_ALL: if category not in CATEGORY_COMMANDS_ALL:
module.fail_json( module.fail_json(msg=f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
msg=to_native(f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
)
# Check that all commands are valid # Check that all commands are valid
for cmd in command_list: for cmd in command_list:
# Fail if even one command given is invalid # Fail if even one command given is invalid
if cmd not in CATEGORY_COMMANDS_ALL[category]: if cmd not in CATEGORY_COMMANDS_ALL[category]:
module.fail_json( module.fail_json(msg=f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
# Organize by Categories / Commands # Organize by Categories / Commands
if category == "Accounts": if category == "Accounts":

8
plugins/modules/redfish_config.py
View File

@@ -508,17 +508,13 @@ def main():
# Check that Category is valid # Check that Category is valid
if category not in CATEGORY_COMMANDS_ALL: if category not in CATEGORY_COMMANDS_ALL:
module.fail_json( module.fail_json(msg=f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
msg=to_native(f"Invalid Category '{category}'. Valid Categories = {list(CATEGORY_COMMANDS_ALL.keys())}")
)
# Check that all commands are valid # Check that all commands are valid
for cmd in command_list: for cmd in command_list:
# Fail if even one command given is invalid # Fail if even one command given is invalid
if cmd not in CATEGORY_COMMANDS_ALL[category]: if cmd not in CATEGORY_COMMANDS_ALL[category]:
module.fail_json( module.fail_json(msg=f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
# Organize by Categories / Commands # Organize by Categories / Commands
if category == "Systems": if category == "Systems":

6
plugins/modules/wdc_redfish_command.py
View File

@@ -252,16 +252,14 @@ def main():
# Check that Category is valid # Check that Category is valid
if category not in CATEGORY_COMMANDS_ALL: if category not in CATEGORY_COMMANDS_ALL:
module.fail_json( module.fail_json(
msg=to_native(f"Invalid Category '{category}'. Valid Categories = {sorted(CATEGORY_COMMANDS_ALL.keys())}") msg=f"Invalid Category '{category}'. Valid Categories = {sorted(CATEGORY_COMMANDS_ALL.keys())}"
) )
# Check that all commands are valid # Check that all commands are valid
for cmd in command_list: for cmd in command_list:
# Fail if even one command given is invalid # Fail if even one command given is invalid
if cmd not in CATEGORY_COMMANDS_ALL[category]: if cmd not in CATEGORY_COMMANDS_ALL[category]:
module.fail_json( module.fail_json(msg=f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
# Build root URI(s) # Build root URI(s)
if module.params.get("baseuri") is not None: if module.params.get("baseuri") is not None:

4
plugins/modules/wdc_redfish_info.py
View File

@@ -172,9 +172,7 @@ def main():
for cmd in command_list: for cmd in command_list:
# Fail if even one command given is invalid # Fail if even one command given is invalid
if cmd not in CATEGORY_COMMANDS_ALL[category]: if cmd not in CATEGORY_COMMANDS_ALL[category]:
module.fail_json( module.fail_json(msg=f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
# Build root URI(s) # Build root URI(s)
if module.params.get("baseuri") is not None: if module.params.get("baseuri") is not None:

8
plugins/modules/xcc_redfish_command.py
View File

@@ -735,17 +735,13 @@ def main():
# Check that Category is valid # Check that Category is valid
if category not in CATEGORY_COMMANDS_ALL: if category not in CATEGORY_COMMANDS_ALL:
module.fail_json( module.fail_json(msg=f"Invalid Category '{category}'. Valid Categories = {CATEGORY_COMMANDS_ALL.keys()}")
msg=to_native(f"Invalid Category '{category}'. Valid Categories = {CATEGORY_COMMANDS_ALL.keys()}")
)
# Check that all commands are valid # Check that all commands are valid
for cmd in command_list: for cmd in command_list:
# Fail if even one command given is invalid # Fail if even one command given is invalid
if cmd not in CATEGORY_COMMANDS_ALL[category]: if cmd not in CATEGORY_COMMANDS_ALL[category]:
module.fail_json( module.fail_json(msg=f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
msg=to_native(f"Invalid Command '{cmd}'. Valid Commands = {CATEGORY_COMMANDS_ALL[category]}")
)
# Organize by Categories / Commands # Organize by Categories / Commands
if category == "Manager": if category == "Manager":