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

map network_os to ncclient device_params (#36819) (#36913)

Browse source 
* map network_os to ncclient device_params

Fixes #36786

* update device map

* Add default netconf fallback plugin

(cherry picked from commit b12e90311f)
This commit is contained in:
Ganesh Nalawade 2018-03-01 23:03:31 +05:30 committed by GitHub
parent 617659a33c
commit 3e123d8298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/plugins/connection/netconf.py
View file

@ -157,6 +157,10 @@ except ImportError:
logging.getLogger('ncclient').setLevel(logging.INFO) logging.getLogger('ncclient').setLevel(logging.INFO)
network_os_device_param_map = {
"nxos": "nexus"
}
class Connection(ConnectionBase): class Connection(ConnectionBase):
"""NetConf connections""" """NetConf connections"""
@ -238,7 +242,7 @@ class Connection(ConnectionBase):
if network_os: if network_os:
display.display('discovered network_os %s' % network_os, log_only=True) display.display('discovered network_os %s' % network_os, log_only=True)
device_params = {'name': (network_os or 'default')} device_params = {'name': (network_os_device_param_map.get(network_os) or network_os or 'default')}
ssh_config = os.getenv('ANSIBLE_NETCONF_SSH_CONFIG', False) ssh_config = os.getenv('ANSIBLE_NETCONF_SSH_CONFIG', False)
if ssh_config in BOOLEANS_TRUE: if ssh_config in BOOLEANS_TRUE:
@ -276,7 +280,8 @@ class Connection(ConnectionBase):
if self._netconf: if self._netconf:
display.display('loaded netconf plugin for network_os %s' % network_os, log_only=True) display.display('loaded netconf plugin for network_os %s' % network_os, log_only=True)
else: else:
display.display('unable to load netconf for network_os %s' % network_os) self._netconf = netconf_loader.get("default", self)
display.display('unable to load netconf plugin for network_os %s, falling back to default plugin' % network_os)
return 0, to_bytes(self._manager.session_id, errors='surrogate_or_strict'), b'' return 0, to_bytes(self._manager.session_id, errors='surrogate_or_strict'), b''