mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Make logging consistent for network platforms (#23605)
This commit is contained in:
Ganesh Nalawade
GitHub
parent
89fc098488
commit
89752cc34f
10 changed files with 31 additions and 8 deletions
|
|
@ -64,6 +64,7 @@ class ActionModule(_ActionModule):
|
|||
pc.become = provider['authorize'] or False
|
||||
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)
|
||||
|
||||
socket_path = self._get_socket_path(pc)
|
||||
|
|
@ -72,6 +73,7 @@ class ActionModule(_ActionModule):
|
|||
if not os.path.exists(socket_path):
|
||||
# start the connection if it isn't started
|
||||
rc, out, err = connection.exec_command('open_shell()')
|
||||
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
|
||||
if not rc == 0:
|
||||
return {'failed': True,
|
||||
'msg': 'unable to open shell. Please see: ' +
|
||||
|
|
@ -82,7 +84,7 @@ class ActionModule(_ActionModule):
|
|||
# enable mode and not config module
|
||||
rc, out, err = connection.exec_command('prompt()')
|
||||
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')
|
||||
rc, out, err = connection.exec_command('prompt()')
|
||||
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ class ActionModule(_ActionModule):
|
|||
pc.become = provider['authorize'] or False
|
||||
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)
|
||||
|
||||
socket_path = self._get_socket_path(pc)
|
||||
|
|
@ -68,6 +69,7 @@ class ActionModule(_ActionModule):
|
|||
if not os.path.exists(socket_path):
|
||||
# start the connection if it isn't started
|
||||
rc, out, err = connection.exec_command('open_shell()')
|
||||
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
|
||||
if not rc == 0:
|
||||
return {'failed': True,
|
||||
'msg': 'unable to open shell. Please see: ' +
|
||||
|
|
@ -78,7 +80,7 @@ class ActionModule(_ActionModule):
|
|||
# enable mode and not config module
|
||||
rc, out, err = connection.exec_command('prompt()')
|
||||
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')
|
||||
rc, out, err = connection.exec_command('prompt()')
|
||||
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ class ActionModule(_ActionModule):
|
|||
pc.become = provider['authorize'] or False
|
||||
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)
|
||||
|
||||
socket_path = self._get_socket_path(pc)
|
||||
|
|
@ -72,6 +73,7 @@ class ActionModule(_ActionModule):
|
|||
if not os.path.exists(socket_path):
|
||||
# start the connection if it isn't started
|
||||
rc, out, err = connection.exec_command('open_shell()')
|
||||
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
|
||||
if not rc == 0:
|
||||
return {'failed': True,
|
||||
'msg': 'unable to open shell. Please see: ' +
|
||||
|
|
@ -82,7 +84,7 @@ class ActionModule(_ActionModule):
|
|||
# enable mode and not config module
|
||||
rc, out, err = connection.exec_command('prompt()')
|
||||
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')
|
||||
rc, out, err = connection.exec_command('prompt()')
|
||||
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ class ActionModule(_ActionModule):
|
|||
pc.become = provider['authorize'] or False
|
||||
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)
|
||||
|
||||
socket_path = self._get_socket_path(pc)
|
||||
|
|
@ -72,8 +73,8 @@ class ActionModule(_ActionModule):
|
|||
|
||||
if not os.path.exists(socket_path):
|
||||
# start the connection if it isn't started
|
||||
display.vvvv('calling open_shell()', pc.remote_addr)
|
||||
rc, out, err = connection.exec_command('open_shell()')
|
||||
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
|
||||
if not rc == 0:
|
||||
return {'failed': True,
|
||||
'msg': 'unable to open shell. Please see: ' +
|
||||
|
|
|
|||
|
|
@ -63,12 +63,16 @@ class ActionModule(_ActionModule):
|
|||
pc.become = provider['authorize'] or False
|
||||
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)
|
||||
|
||||
socket_path = self._get_socket_path(pc)
|
||||
display.vvvv('socket_path: %s' % socket_path, pc.remote_addr)
|
||||
|
||||
if not os.path.exists(socket_path):
|
||||
# start the connection if it isn't started
|
||||
rc, out, err = connection.exec_command('open_shell()')
|
||||
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
|
||||
if not rc == 0:
|
||||
return {'failed': True,
|
||||
'msg': 'unable to open shell. Please see: ' +
|
||||
|
|
@ -79,7 +83,7 @@ class ActionModule(_ActionModule):
|
|||
# enable mode and not config module
|
||||
rc, out, err = connection.exec_command('prompt()')
|
||||
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')
|
||||
|
||||
task_vars['ansible_socket'] = socket_path
|
||||
|
|
|
|||
|
|
@ -60,13 +60,16 @@ class ActionModule(_ActionModule):
|
|||
pc.password = provider['password'] or self._play_context.password
|
||||
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)
|
||||
|
||||
socket_path = self._get_socket_path(pc)
|
||||
display.vvvv('socket_path: %s' % socket_path, pc.remote_addr)
|
||||
|
||||
if not os.path.exists(socket_path):
|
||||
# start the connection if it isn't started
|
||||
display.vvvv('calling open_shell()', pc.remote_addr)
|
||||
rc, out, err = connection.exec_command('open_shell()')
|
||||
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
|
||||
if rc != 0:
|
||||
return {'failed': True,
|
||||
'msg': 'unable to open shell. Please see: ' +
|
||||
|
|
|
|||
|
|
@ -82,8 +82,10 @@ class ActionModule(_ActionModule):
|
|||
# start the connection if it isn't started
|
||||
if pc.connection == 'netconf':
|
||||
rc, out, err = connection.exec_command('open_session()')
|
||||
display.vvvv('open_session() returned %s %s %s' % (rc, out, err))
|
||||
else:
|
||||
rc, out, err = connection.exec_command('open_shell()')
|
||||
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
|
||||
|
||||
if rc != 0:
|
||||
return {'failed': True,
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ class ActionModule(_ActionModule):
|
|||
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
|
||||
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)
|
||||
|
||||
socket_path = self._get_socket_path(pc)
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ class ActionModule(_ActionModule):
|
|||
if not os.path.exists(socket_path):
|
||||
# start the connection if it isn't started
|
||||
rc, out, err = connection.exec_command('open_shell()')
|
||||
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
|
||||
if not rc == 0:
|
||||
return {'failed': True,
|
||||
'msg': 'unable to open shell. Please see: ' +
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ class ActionModule(_ActionModule):
|
|||
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
|
||||
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)
|
||||
|
||||
socket_path = self._get_socket_path(pc)
|
||||
|
|
@ -68,8 +69,12 @@ class ActionModule(_ActionModule):
|
|||
if not os.path.exists(socket_path):
|
||||
# start the connection if it isn't started
|
||||
rc, out, err = connection.exec_command('open_shell()')
|
||||
if rc != 0:
|
||||
return {'failed': True, 'msg': 'unable to connect to control socket'}
|
||||
display.vvvv('open_shell() returned %s %s %s' % (rc, out, err))
|
||||
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:
|
||||
# make sure we are in the right cli context which should be
|
||||
# enable mode and not config module
|
||||
|
|
|
|||
Loading…
Reference in a new issue