From 2704b208cc64ef8217bed512165f94c3314bba93 Mon Sep 17 00:00:00 2001 From: Gabriele Date: Fri, 30 Sep 2016 16:16:32 -0400 Subject: [PATCH] Fixing nxos_vtp_password (#5037) --- network/nxos/nxos_vtp_password.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/network/nxos/nxos_vtp_password.py b/network/nxos/nxos_vtp_password.py index d4528b70179..1f78c8e267e 100644 --- a/network/nxos/nxos_vtp_password.py +++ b/network/nxos/nxos_vtp_password.py @@ -286,10 +286,7 @@ def get_cli_body_ssh(command, response, module): body = response else: try: - if isinstance(response[0], str): - body = [json.loads(response[0])] - else: - body = response + body = [json.loads(response[0])] except ValueError: module.fail_json(msg='Command does not support JSON output', command=command) @@ -318,7 +315,7 @@ def execute_show(cmds, module, command_type=None): module.cli.add_commands(cmds, output=command_type) response = module.cli.run_commands() else: - module.cli.add_commands(cmds) + module.cli.add_commands(cmds, raw=True) response = module.cli.run_commands() except ShellError: clie = get_exception() @@ -462,6 +459,8 @@ def main(): changed = True execute_config_command(cmds, module) end_state = get_vtp_config(module) + if 'configure' in cmds: + cmds.pop(0) results = {} results['proposed'] = proposed