Fix net_put module text file issue (#66065)

*  Modify the parent class for net_put and net_get
   module to refer from `ActionModule` class in
   network.py action plugin which contains the
   common code for network plugins.
*  Replace `_handle_template` with `_handle_src_option`
   function name which is defined in common class.
This commit is contained in:
Ganesh Nalawade 2020-01-09 18:42:00 +05:30 committed by GitHub
parent 42b0c967d0
commit fa66813696
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- Fix net_put module to handle text based files (https://github.com/ansible/ansible/issues/66059)

View file

@ -25,14 +25,14 @@ import hashlib
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.module_utils._text import to_text, to_bytes from ansible.module_utils._text import to_text, to_bytes
from ansible.module_utils.connection import Connection, ConnectionError from ansible.module_utils.connection import Connection, ConnectionError
from ansible.plugins.action import ActionBase from ansible.plugins.action.network import ActionModule as ActionNetworkModule
from ansible.module_utils.six.moves.urllib.parse import urlsplit from ansible.module_utils.six.moves.urllib.parse import urlsplit
from ansible.utils.display import Display from ansible.utils.display import Display
display = Display() display = Display()
class ActionModule(ActionBase): class ActionModule(ActionNetworkModule):
def run(self, tmp=None, task_vars=None): def run(self, tmp=None, task_vars=None):
socket_path = None socket_path = None

View file

@ -24,14 +24,14 @@ import hashlib
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.module_utils._text import to_text, to_bytes from ansible.module_utils._text import to_text, to_bytes
from ansible.module_utils.connection import Connection, ConnectionError from ansible.module_utils.connection import Connection, ConnectionError
from ansible.plugins.action import ActionBase from ansible.plugins.action.network import ActionModule as ActionNetworkModule
from ansible.module_utils.six.moves.urllib.parse import urlsplit from ansible.module_utils.six.moves.urllib.parse import urlsplit
from ansible.utils.display import Display from ansible.utils.display import Display
display = Display() display = Display()
class ActionModule(ActionBase): class ActionModule(ActionNetworkModule):
def run(self, tmp=None, task_vars=None): def run(self, tmp=None, task_vars=None):
socket_path = None socket_path = None
@ -69,7 +69,7 @@ class ActionModule(ActionBase):
if mode == 'text': if mode == 'text':
try: try:
self._handle_template(convert_data=False) self._handle_src_option(convert_data=False)
except ValueError as exc: except ValueError as exc:
return dict(failed=True, msg=to_text(exc)) return dict(failed=True, msg=to_text(exc))