ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 21:00:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

* Fix DCI issues and changes to action plugin & utils (#35083)

Browse source 
* * Fix DCI issues and changes to action plugin & utils

* * Additional check to handle cli only modules for platforms that
support netconf
This commit is contained in:
Kedar Kekan 2018-01-19 16:22:31 +05:30 • committed by GitHub
commit 719feef2e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/plugins/action/iosxr.py
View file

@ -45,15 +45,14 @@ class ActionModule(_ActionModule):
provider = load_provider(iosxr_provider_spec, self._task.args)
pc = copy.deepcopy(self._play_context)
if self._task.action in ['iosxr_netconf', 'iosxr_config', 'iosxr_command'] or \
(provider['transport'] == 'cli' and (self._task.action == 'iosxr_banner' or
self._task.action == 'iosxr_facts' or self._task.action == 'iosxr_logging' or
self._task.action == 'iosxr_system' or self._task.action == 'iosxr_user' or
self._task.action == 'iosxr_interface')):
(provider['transport'] == 'cli'):
pc.connection = 'network_cli'
pc.port = int(provider['port'] or self._play_context.port or 22)
else:
elif provider['transport'] == 'netconf':
pc.connection = 'netconf'
pc.port = int(provider['port'] or self._play_context.port or 830)
else:
return {'failed': True, 'msg': 'Transport type %s is not valid for this module' % provider['transport']}
pc.network_os = 'iosxr'
pc.remote_addr = provider['host'] or self._play_context.remote_addr

6
lib/ansible/plugins/action/net_base.py
View file

@ -37,6 +37,9 @@ except ImportError:
from ansible.utils.display import Display
display = Display()
_CLI_ONLY_MODULES = frozenset(['junos_netconf', 'iosxr_netconf', 'iosxr_config', 'iosxr_command'])
_NETCONF_SUPPORTED_PLATFORMS = frozenset(['junos', 'iosxr'])
class ActionModule(ActionBase):
@ -57,7 +60,8 @@ class ActionModule(ActionBase):
module = load_module(module_name, f, p, d)
self.provider = load_provider(module.get_provider_argspec(), self._task.args)
if play_context.network_os == 'junos':
if self.provider.get('transport') == 'netconf' and play_context.network_os in _NETCONF_SUPPORTED_PLATFORMS \
and self._task.action not in _CLI_ONLY_MODULES:
play_context.connection = 'netconf'
play_context.port = int(self.provider['port'] or self._play_context.port or 830)
elif self.provider.get('transport') in ('nxapi', 'eapi') and play_context.network_os in ('nxos', 'eos'):