wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Raise error when trying to use older iosxr modules with netconf (#37423)

Browse source
This commit is contained in:
Nathaniel Case 2018-03-15 12:49:35 -04:00 committed by GitHub
parent a6d31b6fb1
commit 85cc5ea129
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,12 +42,12 @@ class ActionModule(_ActionModule):
del tmp # tmp no longer has any effect
socket_path = None
force_cli = self._task.action in ('iosxr_netconf', 'iosxr_config', 'iosxr_command', 'iosxr_facts')
if self._play_context.connection == 'local':
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'):
if force_cli or provider['transport'] == 'cli':
pc.connection = 'network_cli'
pc.port = int(provider['port'] or self._play_context.port or 22)
elif provider['transport'] == 'netconf':
@ -75,6 +75,9 @@ class ActionModule(_ActionModule):
task_vars['ansible_socket'] = socket_path
elif self._play_context.connection in ('netconf', 'network_cli'):
if force_cli and self._play_context.connection != 'network_cli':
return {'failed': True, 'msg': 'Connection type %s is not valid for module %s' %
(self._play_context.connection, self._task.action)}
provider = self._task.args.get('provider', {})
if any(provider.values()):
display.warning('provider is unnecessary when using {0} and will be ignored'.format(self._play_context.connection))

1
lib/ansible/plugins/netconf/iosxr.py
View file

@ -73,7 +73,6 @@ def transform_reply():
if sys.version < '3':
return reply
else:
print("utf8")
return reply.encode('UTF-8')