From 72d630b83107d01bfc8e8edbd135e3b481984441 Mon Sep 17 00:00:00 2001 From: Trishna Guha Date: Mon, 4 Jun 2018 11:31:32 +0530 Subject: [PATCH] fix nxos_udld failing with httpapi (#41074) Signed-off-by: Trishna Guha --- lib/ansible/modules/network/nxos/nxos_udld.py | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/lib/ansible/modules/network/nxos/nxos_udld.py b/lib/ansible/modules/network/nxos/nxos_udld.py index 1adb3f0b43..40677d1b03 100644 --- a/lib/ansible/modules/network/nxos/nxos_udld.py +++ b/lib/ansible/modules/network/nxos/nxos_udld.py @@ -115,22 +115,6 @@ PARAM_TO_DEFAULT_KEYMAP = { } -def execute_show_command(command, module, command_type='cli_show'): - device_info = get_capabilities(module) - network_api = device_info.get('network_api', 'nxapi') - - if network_api == 'cliconf': - if 'show run' not in command: - command += ' | json' - cmds = [command] - body = run_commands(module, cmds) - elif network_api == 'nxapi': - cmds = [command] - body = run_commands(module, cmds) - - return body - - def flatten_list(command_lists): flat_command_list = [] for command in command_lists: @@ -184,8 +168,8 @@ def get_commands_remove_udld_global(existing): def get_udld_global(module): - command = 'show udld global' - udld_table = execute_show_command(command, module)[0] + command = 'show udld global | json' + udld_table = run_commands(module, [command])[0] status = str(udld_table.get('udld-global-mode', None)) if status == 'enabled-aggressive':