summaryrefslogtreecommitdiff
path: root/network/nxos
diff options
context:
space:
mode:
authorGabriele <gabrielegerbino@gmail.com>2016-09-30 16:16:10 -0400
committerPeter Sprygada <privateip@users.noreply.github.com>2016-09-30 16:16:10 -0400
commit137d1373d330c52c43c25c83986b7b0210013d51 (patch)
tree4cb61ee97d3b1ef916dccf4eb440cbb9db9907b5 /network/nxos
parentac42b85225388cedefc002fec93b4be81249b52c (diff)
downloadansible-modules-core-137d1373d330c52c43c25c83986b7b0210013d51.tar.gz
Fixing nxos_vtp_version (#5038)
Diffstat (limited to 'network/nxos')
-rw-r--r--network/nxos/nxos_vtp_version.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/network/nxos/nxos_vtp_version.py b/network/nxos/nxos_vtp_version.py
index 0d24e9c3..90fad190 100644
--- a/network/nxos/nxos_vtp_version.py
+++ b/network/nxos/nxos_vtp_version.py
@@ -264,10 +264,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)
@@ -296,7 +293,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()
@@ -400,6 +397,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