From a6c021219e33d1f69eb7ac02489cb6fc7382554c Mon Sep 17 00:00:00 2001 From: Gabriele Date: Fri, 30 Sep 2016 16:21:35 -0400 Subject: [PATCH] Fixing nxos_ntp_auth (#5016) --- network/nxos/nxos_ntp_auth.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/network/nxos/nxos_ntp_auth.py b/network/nxos/nxos_ntp_auth.py index 28da3a74468..1161709970f 100644 --- a/network/nxos/nxos_ntp_auth.py +++ b/network/nxos/nxos_ntp_auth.py @@ -308,10 +308,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) @@ -340,7 +337,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() @@ -555,6 +552,8 @@ def main(): delta = dict(set(end_state.iteritems()).difference(existing.iteritems())) if delta or (len(existing) != len(end_state)): changed = True + if 'configure' in cmds: + cmds.pop(0) results = {} results['proposed'] = proposed