From 9f0aec160b1c5d552cf7b88bf26b64467778d8d8 Mon Sep 17 00:00:00 2001 From: Gabriele Date: Fri, 30 Sep 2016 16:21:06 -0400 Subject: [PATCH] Fixing nxos_pim_interface (#5018) --- network/nxos/nxos_pim_interface.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/network/nxos/nxos_pim_interface.py b/network/nxos/nxos_pim_interface.py index 68f0cbb775c..9556b03ab65 100644 --- a/network/nxos/nxos_pim_interface.py +++ b/network/nxos/nxos_pim_interface.py @@ -373,10 +373,7 @@ def get_cli_body_ssh(command, response, module, text=False): 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) @@ -405,7 +402,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() @@ -915,6 +912,8 @@ def main(): time.sleep(1) get_existing = get_pim_interface(module, interface) end_state, jp_bidir, isauth = local_existing(get_existing) + if 'configure' in cmds: + cmds.pop(0) results['proposed'] = proposed results['existing'] = existing