Skip to content

Commit

Permalink
Revert "Fix net_put module text file issue (ansible#66065)" (ansible#…
Browse files Browse the repository at this point in the history
…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 fa66813.
  • Loading branch information
pabelanger authored Jan 10, 2020
1 parent 7ed00a1 commit 7a7f706
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions changelogs/fragments/net_put_fix.yml

This file was deleted.

4 changes: 2 additions & 2 deletions lib/ansible/plugins/action/net_get.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
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
Expand Down
6 changes: 3 additions & 3 deletions lib/ansible/plugins/action/net_put.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
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
Expand Down Expand Up @@ -69,7 +69,7 @@ def run(self, tmp=None, task_vars=None):

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))

Expand Down

0 comments on commit 7a7f706

Please sign in to comment.