From 7a7f70612a94d381c8c081965abc1f79023dcb0d Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 9 Jan 2020 21:51:59 -0500 Subject: [PATCH] Revert "Fix net_put module text file issue (#66065)" (#66328) This PR didn't properly run testing for network jobs. As a result it has broken jobs for ios and junos. This reverts commit fa66813696b372bc4b8e0d836968e226a56928c7. --- changelogs/fragments/net_put_fix.yml | 2 -- lib/ansible/plugins/action/net_get.py | 4 ++-- lib/ansible/plugins/action/net_put.py | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 changelogs/fragments/net_put_fix.yml diff --git a/changelogs/fragments/net_put_fix.yml b/changelogs/fragments/net_put_fix.yml deleted file mode 100644 index 46eb46de129..00000000000 --- a/changelogs/fragments/net_put_fix.yml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: -- Fix net_put module to handle text based files (https://github.com/ansible/ansible/issues/66059) diff --git a/lib/ansible/plugins/action/net_get.py b/lib/ansible/plugins/action/net_get.py index d9bc6e53981..4f96f9d9615 100644 --- a/lib/ansible/plugins/action/net_get.py +++ b/lib/ansible/plugins/action/net_get.py @@ -25,14 +25,14 @@ import hashlib from ansible.errors import AnsibleError from ansible.module_utils._text import to_text, to_bytes from ansible.module_utils.connection import Connection, ConnectionError -from ansible.plugins.action.network import ActionModule as ActionNetworkModule +from ansible.plugins.action import ActionBase from ansible.module_utils.six.moves.urllib.parse import urlsplit from ansible.utils.display import Display display = Display() -class ActionModule(ActionNetworkModule): +class ActionModule(ActionBase): def run(self, tmp=None, task_vars=None): socket_path = None diff --git a/lib/ansible/plugins/action/net_put.py b/lib/ansible/plugins/action/net_put.py index e8aef23d420..a1b83fc6c42 100644 --- a/lib/ansible/plugins/action/net_put.py +++ b/lib/ansible/plugins/action/net_put.py @@ -24,14 +24,14 @@ import hashlib from ansible.errors import AnsibleError from ansible.module_utils._text import to_text, to_bytes from ansible.module_utils.connection import Connection, ConnectionError -from ansible.plugins.action.network import ActionModule as ActionNetworkModule +from ansible.plugins.action import ActionBase from ansible.module_utils.six.moves.urllib.parse import urlsplit from ansible.utils.display import Display display = Display() -class ActionModule(ActionNetworkModule): +class ActionModule(ActionBase): def run(self, tmp=None, task_vars=None): socket_path = None @@ -69,7 +69,7 @@ class ActionModule(ActionNetworkModule): if mode == 'text': try: - self._handle_src_option(convert_data=False) + self._handle_template(convert_data=False) except ValueError as exc: return dict(failed=True, msg=to_text(exc))