diff options
| author | Gabriele <gabrielegerbino@gmail.com> | 2016-09-30 16:18:40 -0400 |
|---|---|---|
| committer | Peter Sprygada <privateip@users.noreply.github.com> | 2016-09-30 16:18:40 -0400 |
| commit | c7e711bd35a185870b9f98f85ef3458076bea66e (patch) | |
| tree | 474ef699da4525cb38a5a84556d91bdf369c9e48 /network/nxos | |
| parent | 7e2a87b43f9a8ac1ea1c7f7ade0965d76ccb4c4b (diff) | |
| download | ansible-modules-core-c7e711bd35a185870b9f98f85ef3458076bea66e.tar.gz | |
Fixing nxos_switchport (#5028)
Diffstat (limited to 'network/nxos')
| -rw-r--r-- | network/nxos/nxos_switchport.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/network/nxos/nxos_switchport.py b/network/nxos/nxos_switchport.py index 49fce57a..1b6cbf70 100644 --- a/network/nxos/nxos_switchport.py +++ b/network/nxos/nxos_switchport.py @@ -607,10 +607,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) @@ -639,7 +636,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() @@ -792,6 +789,8 @@ def main(): changed = True execute_config_command(cmds, module) end_state = get_switchport(interface, module) + if 'configure' in cmds: + cmds.pop(0) results = {} results['proposed'] = proposed |