ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Make logging consistent for network platforms (#23605)

Browse source
This commit is contained in:
Ganesh Nalawade 2017-04-16 23:25:40 +05:30 committed by GitHub
parent 89fc098488
commit 89752cc34f
10 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/action/dellos10.py
View file

@ -64,6 +64,7 @@ class ActionModule(_ActionModule):
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
socket_path = self._get_socket_path(pc) socket_path = self._get_socket_path(pc)
@ -72,6 +73,7 @@ class ActionModule(_ActionModule):
if not os.path.exists(socket_path): if not os.path.exists(socket_path):
# start the connection if it isn't started # start the connection if it isn't started
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
if not rc == 0: if not rc == 0:
return {'failed': True, return {'failed': True,
'msg': 'unable to open shell. Please see: ' + 'msg': 'unable to open shell. Please see: ' +
@ -82,7 +84,7 @@ class ActionModule(_ActionModule):
# enable mode and not config module # enable mode and not config module
rc, out, err = connection.exec_command('prompt()') rc, out, err = connection.exec_command('prompt()')
while str(out).strip().endswith(')#'): while str(out).strip().endswith(')#'):
display.debug('wrong context, sending exit to device') display.vvvv('wrong context, sending exit to device', self._play_context.remote_addr)
connection.exec_command('exit') connection.exec_command('exit')
rc, out, err = connection.exec_command('prompt()') rc, out, err = connection.exec_command('prompt()')

4
lib/ansible/plugins/action/dellos6.py
View file

@ -60,6 +60,7 @@ class ActionModule(_ActionModule):
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
socket_path = self._get_socket_path(pc) socket_path = self._get_socket_path(pc)
@ -68,6 +69,7 @@ class ActionModule(_ActionModule):
if not os.path.exists(socket_path): if not os.path.exists(socket_path):
# start the connection if it isn't started # start the connection if it isn't started
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
if not rc == 0: if not rc == 0:
return {'failed': True, return {'failed': True,
'msg': 'unable to open shell. Please see: ' + 'msg': 'unable to open shell. Please see: ' +
@ -78,7 +80,7 @@ class ActionModule(_ActionModule):
# enable mode and not config module # enable mode and not config module
rc, out, err = connection.exec_command('prompt()') rc, out, err = connection.exec_command('prompt()')
while str(out).strip().endswith(')#'): while str(out).strip().endswith(')#'):
display.debug('wrong context, sending exit to device') display.vvvv('wrong context, sending exit to device', self._play_context.remote_addr)
connection.exec_command('exit') connection.exec_command('exit')
rc, out, err = connection.exec_command('prompt()') rc, out, err = connection.exec_command('prompt()')

4
lib/ansible/plugins/action/dellos9.py
View file

@ -64,6 +64,7 @@ class ActionModule(_ActionModule):
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
socket_path = self._get_socket_path(pc) socket_path = self._get_socket_path(pc)
@ -72,6 +73,7 @@ class ActionModule(_ActionModule):
if not os.path.exists(socket_path): if not os.path.exists(socket_path):
# start the connection if it isn't started # start the connection if it isn't started
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
if not rc == 0: if not rc == 0:
return {'failed': True, return {'failed': True,
'msg': 'unable to open shell. Please see: ' + 'msg': 'unable to open shell. Please see: ' +
@ -82,7 +84,7 @@ class ActionModule(_ActionModule):
# enable mode and not config module # enable mode and not config module
rc, out, err = connection.exec_command('prompt()') rc, out, err = connection.exec_command('prompt()')
while str(out).strip().endswith(')#'): while str(out).strip().endswith(')#'):
display.debug('wrong context, sending exit to device') display.vvvv('wrong context, sending exit to device', self._play_context.remote_addr)
connection.exec_command('exit') connection.exec_command('exit')
rc, out, err = connection.exec_command('prompt()') rc, out, err = connection.exec_command('prompt()')

3
lib/ansible/plugins/action/eos.py
View file

@ -65,6 +65,7 @@ class ActionModule(_ActionModule):
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
socket_path = self._get_socket_path(pc) socket_path = self._get_socket_path(pc)
@ -72,8 +73,8 @@ class ActionModule(_ActionModule):
if not os.path.exists(socket_path): if not os.path.exists(socket_path):
# start the connection if it isn't started # start the connection if it isn't started
display.vvvv('calling open_shell()', pc.remote_addr)
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
if not rc == 0: if not rc == 0:
return {'failed': True, return {'failed': True,
'msg': 'unable to open shell. Please see: ' + 'msg': 'unable to open shell. Please see: ' +

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

@ -63,12 +63,16 @@ class ActionModule(_ActionModule):
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
socket_path = self._get_socket_path(pc) socket_path = self._get_socket_path(pc)
display.vvvv('socket_path: %s' % socket_path, pc.remote_addr)
if not os.path.exists(socket_path): if not os.path.exists(socket_path):
# start the connection if it isn't started # start the connection if it isn't started
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
if not rc == 0: if not rc == 0:
return {'failed': True, return {'failed': True,
'msg': 'unable to open shell. Please see: ' + 'msg': 'unable to open shell. Please see: ' +
@ -79,7 +83,7 @@ class ActionModule(_ActionModule):
# enable mode and not config module # enable mode and not config module
rc, out, err = connection.exec_command('prompt()') rc, out, err = connection.exec_command('prompt()')
if str(out).strip().endswith(')#'): if str(out).strip().endswith(')#'):
display.vvv('wrong context, sending exit to device', self._play_context.remote_addr) display.vvvv('wrong context, sending exit to device', self._play_context.remote_addr)
connection.exec_command('exit') connection.exec_command('exit')
task_vars['ansible_socket'] = socket_path task_vars['ansible_socket'] = socket_path

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

@ -60,13 +60,16 @@ class ActionModule(_ActionModule):
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.timeout = provider['timeout'] or self._play_context.timeout pc.timeout = provider['timeout'] or self._play_context.timeout
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
socket_path = self._get_socket_path(pc) socket_path = self._get_socket_path(pc)
display.vvvv('socket_path: %s' % socket_path, pc.remote_addr)
if not os.path.exists(socket_path): if not os.path.exists(socket_path):
# start the connection if it isn't started # start the connection if it isn't started
display.vvvv('calling open_shell()', pc.remote_addr)
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
if rc != 0: if rc != 0:
return {'failed': True, return {'failed': True,
'msg': 'unable to open shell. Please see: ' + 'msg': 'unable to open shell. Please see: ' +

2
lib/ansible/plugins/action/junos.py
View file

@ -82,8 +82,10 @@ class ActionModule(_ActionModule):
# start the connection if it isn't started # start the connection if it isn't started
if pc.connection == 'netconf': if pc.connection == 'netconf':
rc, out, err = connection.exec_command('open_session()') rc, out, err = connection.exec_command('open_session()')
display.vvvv('open_session() returned %s %s %s' % (rc, out, err))
else: else:
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
if rc != 0: if rc != 0:
return {'failed': True, return {'failed': True,

1
lib/ansible/plugins/action/nxos.py
View file

@ -64,6 +64,7 @@ class ActionModule(_ActionModule):
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or self._play_context.timeout pc.timeout = provider['timeout'] or self._play_context.timeout
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
socket_path = self._get_socket_path(pc) socket_path = self._get_socket_path(pc)

1
lib/ansible/plugins/action/sros.py
View file

@ -70,6 +70,7 @@ class ActionModule(_ActionModule):
if not os.path.exists(socket_path): if not os.path.exists(socket_path):
# start the connection if it isn't started # start the connection if it isn't started
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
if not rc == 0: if not rc == 0:
return {'failed': True, return {'failed': True,
'msg': 'unable to open shell. Please see: ' + 'msg': 'unable to open shell. Please see: ' +

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

@ -60,6 +60,7 @@ class ActionModule(_ActionModule):
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or self._play_context.timeout pc.timeout = provider['timeout'] or self._play_context.timeout
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
socket_path = self._get_socket_path(pc) socket_path = self._get_socket_path(pc)
@ -68,8 +69,12 @@ class ActionModule(_ActionModule):
if not os.path.exists(socket_path): if not os.path.exists(socket_path):
# start the connection if it isn't started # start the connection if it isn't started
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
if rc != 0: display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
return {'failed': True, 'msg': 'unable to connect to control socket'} if not rc == 0:
return {'failed': True,
'msg': 'unable to open shell. Please see: ' +
'https://docs.ansible.com/ansible/network_debug_troubleshooting.html#unable-to-open-shell',
'rc': rc}
else: else:
# make sure we are in the right cli context which should be # make sure we are in the right cli context which should be
# enable mode and not config module # enable mode and not config module