Removed conditional check for deprecated ansible.netcommon.cli_parse (#362)

* Removed conditional check for deprecated ansible.netcommon.cli_parse

* remove warning when using netcommon parser
pull/361/head
Vinay M 2024-07-25 20:04:11 +05:30 committed by GitHub
parent 6c1c3a4b81
commit db14f96453
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 40 deletions

View File

@ -0,0 +1,3 @@
---
minor_changes:
- Removed conditional check for deprecated ansible.netcommon.cli_parse from ansible.utils.cli_parse

View File

@ -100,19 +100,6 @@ class ActionModule(ActionBase):
"""
requested_parser = self._task.args.get("parser").get("name")
cref = dict(zip(["corg", "cname", "plugin"], requested_parser.split(".")))
if cref["cname"] == "netcommon" and cref["plugin"] in [
"json",
"textfsm",
"ttp",
"xml",
]:
cref["cname"] = "utils"
msg = (
"Use 'ansible.utils.{plugin}' for parser name instead of '{requested_parser}'."
" This feature will be removed from 'ansible.netcommon' collection in a release"
" after 2022-11-01".format(plugin=cref["plugin"], requested_parser=requested_parser)
)
self._display.warning(msg)
parserlib = "ansible_collections.{corg}.{cname}.plugins.sub_plugins.cli_parser.{plugin}_parser".format(
**cref,
@ -126,33 +113,6 @@ class ActionModule(ActionBase):
)
return parser
except Exception as exc:
# TODO: The condition is added to support old sub-plugin structure.
# Remove the if condition after ansible.netcommon.cli_parse module is removed
# from ansible.netcommon collection
if cref["cname"] == "netcommon" and cref["plugin"] in [
"native",
"content_templates",
"ntc",
"pyats",
]:
parserlib = (
"ansible_collections.{corg}.{cname}.plugins.cli_parsers.{plugin}_parser".format(
**cref,
)
)
try:
parsercls = getattr(import_module(parserlib), self.PARSER_CLS_NAME)
parser = parsercls(
task_args=self._task.args,
task_vars=task_vars,
debug=self._debug,
)
return parser
except Exception as exc:
self._result["failed"] = True
self._result["msg"] = "Error loading parser: {err}".format(err=to_native(exc))
return None
self._result["failed"] = True
self._result["msg"] = "Error loading parser: {err}".format(err=to_native(exc))
return None