mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Clean up import statements for nxos_rollback (#23540)
* Clean up import statements for nxos_rollback * Don't try to deal with pre-2.3 logic
This commit is contained in:
parent
89752cc34f
commit
e518b6f5b4
2 changed files with 15 additions and 72 deletions
|
@ -78,70 +78,18 @@ status:
|
|||
'''
|
||||
|
||||
|
||||
import re
|
||||
from ansible.module_utils.nxos import get_config, load_config, run_commands
|
||||
from ansible.module_utils.nxos import nxos_argument_spec, check_args
|
||||
from ansible.module_utils.nxos import nxos_argument_spec, run_commands
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.netcfg import CustomNetworkConfig
|
||||
|
||||
import re
|
||||
|
||||
|
||||
def execute_commands(cmds, module, command_type=None):
|
||||
command_type_map = {
|
||||
'cli_show': 'json',
|
||||
'cli_show_ascii': 'text'
|
||||
}
|
||||
|
||||
try:
|
||||
if command_type:
|
||||
response = module.execute(cmds, command_type=command_type)
|
||||
else:
|
||||
response = module.execute(cmds)
|
||||
except ShellError:
|
||||
clie = get_exception()
|
||||
module.fail_json(msg='Error sending {0}'.format(cmds),
|
||||
error=str(clie))
|
||||
except AttributeError:
|
||||
try:
|
||||
if command_type:
|
||||
command_type = command_type_map.get(command_type)
|
||||
module.cli.add_commands(cmds, output=command_type)
|
||||
response = module.cli.run_commands()
|
||||
else:
|
||||
module.cli.add_commands(cmds, output=command_type)
|
||||
response = module.cli.run_commands()
|
||||
except ShellError:
|
||||
clie = get_exception()
|
||||
module.fail_json(msg='Error sending {0}'.format(cmds),
|
||||
error=str(clie))
|
||||
return response
|
||||
|
||||
|
||||
def prepare_show_command(command, module):
|
||||
if module.params['transport'] == 'cli':
|
||||
execute_commands(command, module)
|
||||
elif module.params['transport'] == 'nxapi':
|
||||
execute_commands(command, module, command_type='cli_show_ascii')
|
||||
|
||||
|
||||
def checkpoint(filename, module):
|
||||
commands = ['terminal dont-ask', 'checkpoint file %s' % filename]
|
||||
prepare_show_command(commands, module)
|
||||
run_commands(module, commands)
|
||||
|
||||
|
||||
def rollback(filename, module):
|
||||
commands = ['rollback running-config file %s' % filename]
|
||||
try:
|
||||
module.configure(commands)
|
||||
except AttributeError:
|
||||
try:
|
||||
module.cli.add_commands(commands, output='config')
|
||||
module.cli.run_commands()
|
||||
except ShellError:
|
||||
clie = get_exception()
|
||||
module.fail_json(msg='Error sending CLI commands',
|
||||
error=str(clie), commands=commands)
|
||||
run_commands(module, commands)
|
||||
|
||||
|
||||
def main():
|
||||
|
@ -166,7 +114,7 @@ def main():
|
|||
status = None
|
||||
filename = None
|
||||
changed = False
|
||||
try:
|
||||
|
||||
if checkpoint_file:
|
||||
checkpoint(checkpoint_file, module)
|
||||
status = 'checkpoint file created'
|
||||
|
@ -175,13 +123,9 @@ def main():
|
|||
status = 'rollback executed'
|
||||
changed = True
|
||||
filename = rollback_to or checkpoint_file
|
||||
except ShellError:
|
||||
clie = get_exception()
|
||||
module.fail_json(msg=str(clie))
|
||||
|
||||
module.exit_json(changed=changed, status=status, filename=filename)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
|
|
|
@ -588,7 +588,6 @@ lib/ansible/modules/network/nxos/nxos_pim_rp_address.py
|
|||
lib/ansible/modules/network/nxos/nxos_ping.py
|
||||
lib/ansible/modules/network/nxos/nxos_portchannel.py
|
||||
lib/ansible/modules/network/nxos/nxos_reboot.py
|
||||
lib/ansible/modules/network/nxos/nxos_rollback.py
|
||||
lib/ansible/modules/network/nxos/nxos_smu.py
|
||||
lib/ansible/modules/network/nxos/nxos_snapshot.py
|
||||
lib/ansible/modules/network/nxos/nxos_snmp_community.py
|
||||
|
|
Loading…
Reference in a new issue