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:
parent
42b0c967d0
commit
fa66813696
3 changed files with 7 additions and 5 deletions
2
changelogs/fragments/net_put_fix.yml
Normal file
2
changelogs/fragments/net_put_fix.yml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- Fix net_put module to handle text based files (https://github.com/ansible/ansible/issues/66059)
|
|
@ -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
|
||||||
|
|
|
@ -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))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue