fixes a number of issues with nxos_facts (#22923)

* updates command runs to return warning if command fails
* fixes variable issues from recent refactoring
* removes provider from return of module
(cherry picked from commit 866f67e213)
pull/22995/head
Peter Sprygada 8 years ago committed by Peter Sprygada
parent 30734d178c
commit 2cfe8b95de

@ -50,7 +50,7 @@ nxos_argument_spec = {
'validate_certs': dict(type='bool'),
'timeout': dict(type='int'),
'provider': dict(type='dict', no_log=True),
'provider': dict(type='dict'),
'transport': dict(choices=['cli', 'nxapi'])
}

@ -203,7 +203,7 @@ class FactsBase(object):
try:
return resp[0]
except IndexError:
self.warnings.append('command %s returned to data, facts will not be populated' % command_string)
self.warnings.append('command %s failed, facts will not be populated' % command_string)
return None
def transform_dict(self, data, keymap):
@ -290,7 +290,7 @@ class Interfaces(FactsBase):
if data:
self.facts['interfaces'] = self.populate_interfaces(data)
data = self.run('show ipv6 inteface', 'json')
data = self.run('show ipv6 interface', 'json')
if data:
self.parse_ipv6_interfaces(data)
@ -315,6 +315,11 @@ class Interfaces(FactsBase):
return interfaces
def populate_neighbors(self, data):
# if there are no neighbors the show command returns
# ERROR: No neighbour information
if data.startswith('ERROR'):
return dict()
data = data['TABLE_nbor']['ROW_nbor']
if isinstance(data, dict):
data = [data]

@ -56,6 +56,7 @@ class ActionModule(_ActionModule):
pc = copy.deepcopy(self._play_context)
pc.connection = 'network_cli'
pc.network_os = 'nxos'
pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22
pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password
@ -114,7 +115,10 @@ class ActionModule(_ActionModule):
# make sure a transport value is set in args
self._task.args['transport'] = transport
return super(ActionModule, self).run(tmp, task_vars)
result = super(ActionModule, self).run(tmp, task_vars)
del result['invocation']['module_args']['provider']
return result
def _get_socket_path(self, play_context):
ssh = connection_loader.get('ssh', class_only=True)

Loading…
Cancel
Save