cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Fix junos module transport check (#58050)" (#58270)

Browse source 
This reverts commit f864f621d8.
This commit is contained in:
Ganesh Nalawade 2019-06-24 15:18:17 +05:30 committed by GitHub
parent 44058e9425
commit 94fe139f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/ansible/plugins/action/junos.py
View file

@ -22,20 +22,18 @@ __metaclass__ = type
import sys import sys
import copy import copy
from ansible import constants as C
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
from ansible.module_utils.connection import Connection from ansible.module_utils.connection import Connection
from ansible.module_utils.network.common.utils import load_provider from ansible.module_utils.network.common.utils import load_provider
from ansible.module_utils.network.junos.junos import junos_provider_spec from ansible.module_utils.network.junos.junos import junos_provider_spec
from ansible.plugins.loader import module_loader from ansible.plugins.loader import connection_loader, module_loader
from ansible.plugins.action.network import ActionModule as ActionNetworkModule from ansible.plugins.action.network import ActionModule as ActionNetworkModule
from ansible.utils.display import Display from ansible.utils.display import Display
display = Display() display = Display()
NETCONF_SUPPORTED_MODULES = frozenset(('junos_banner', 'junos_command', 'junos_config', 'junos_facts', 'junos_interface', CLI_SUPPORTED_MODULES = ['junos_netconf', 'junos_command']
'junos_l2_interface', 'junos_l3_interface', 'junos_linkagg', 'junos_lldp',
'junos_lldp_interface', 'junos_logging', 'junos_package', 'junos_rpc', 'junos_scp',
'junos_static_route', 'junos_system', 'junos_user', 'junos_vlan', 'junos_vrf'))
class ActionModule(ActionNetworkModule): class ActionModule(ActionNetworkModule):
@ -51,22 +49,15 @@ class ActionModule(ActionNetworkModule):
socket_path = None socket_path = None
if self._play_context.connection == 'local': if self._play_context.connection == 'local':
args_provider = self._task.args.get('provider', {})
provider = load_provider(junos_provider_spec, self._task.args) provider = load_provider(junos_provider_spec, self._task.args)
pc = copy.deepcopy(self._play_context) pc = copy.deepcopy(self._play_context)
pc.network_os = 'junos' pc.network_os = 'junos'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
if self._task.action in ['junos_netconf', 'junos_ping']: if provider['transport'] == 'cli' and self._task.action not in CLI_SUPPORTED_MODULES:
if args_provider.get('transport') == 'netconf': return {'failed': True, 'msg': "Transport type '%s' is not valid for '%s' module. "
return {'failed': True, 'msg': "Transport type 'netconf' is not valid for '%s' module. " "Please see https://docs.ansible.com/ansible/latest/network/user_guide/platform_junos.html"
"Please see https://docs.ansible.com/ansible/latest/network/user_guide/platform_junos.html" % (provider['transport'], self._task.action)}
% self._task.action}
else:
if provider['transport'] == 'netconf' and self._task.action not in NETCONF_SUPPORTED_MODULES:
return {'failed': True, 'msg': "Transport type '%s' is not valid for '%s' module. "
"Please see https://docs.ansible.com/ansible/latest/network/user_guide/platform_junos.html"
% (provider['transport'], self._task.action)}
if self._task.action == 'junos_netconf' or (provider['transport'] == 'cli' and self._task.action == 'junos_command'): if self._task.action == 'junos_netconf' or (provider['transport'] == 'cli' and self._task.action == 'junos_command'):
pc.connection = 'network_cli' pc.connection = 'network_cli'
@ -102,7 +93,8 @@ class ActionModule(ActionNetworkModule):
display.warning('provider is unnecessary when using %s and will be ignored' % self._play_context.connection) display.warning('provider is unnecessary when using %s and will be ignored' % self._play_context.connection)
del self._task.args['provider'] del self._task.args['provider']
if self._play_context.connection == 'netconf' and self._task.action not in NETCONF_SUPPORTED_MODULES: if (self._play_context.connection == 'network_cli' and self._task.action not in CLI_SUPPORTED_MODULES) or \
(self._play_context.connection == 'netconf' and self._task.action == 'junos_netconf'):
return {'failed': True, 'msg': "Connection type '%s' is not valid for '%s' module. " return {'failed': True, 'msg': "Connection type '%s' is not valid for '%s' module. "
"Please see https://docs.ansible.com/ansible/latest/network/user_guide/platform_junos.html" "Please see https://docs.ansible.com/ansible/latest/network/user_guide/platform_junos.html"
% (self._play_context.connection, self._task.action)} % (self._play_context.connection, self._task.action)}