minor bugfix that will catch connection errors in nxos

This commit fixes a situation where connection errors would be caught
but no useful information display.  The connection error is now caught
and emitted in a call to fail_json
pull/14535/head
Peter Sprygada 9 years ago
parent 58a6cf822a
commit 9e31e33850

@ -147,7 +147,8 @@ class Cli(object):
try: try:
self.shell.open(host, port=port, username=username, password=password) self.shell.open(host, port=port, username=username, password=password)
except Exception, exc: except Exception, exc:
self.module.fail_json('Failed to connect to {0}:{1} - {2}'.format(host, port, str(exc))) msg = 'failed to connecto to %s:%s - %s' % (host, port, str(exc))
self.module.fail_json(msg=msg)
def send(self, commands, encoding='text'): def send(self, commands, encoding='text'):
return self.shell.send(commands) return self.shell.send(commands)
@ -188,7 +189,7 @@ class NetworkModule(AnsibleModule):
def configure(self, commands): def configure(self, commands):
commands = to_list(commands) commands = to_list(commands)
if self.params['transport'] == 'cli': if self.params['transport'] == 'cli':
commands.insert(0, 'configure terminal') commands.insert(0, 'configure')
responses = self.execute(commands) responses = self.execute(commands)
responses.pop(0) responses.pop(0)
else: else:

Loading…
Cancel
Save