From 15ac94f87c7d3e29351cad034db82ceeeef0c0f6 Mon Sep 17 00:00:00 2001 From: Trishna Guha Date: Wed, 4 Jul 2018 00:20:57 +0530 Subject: [PATCH] fix nxos_linkagg issue (#41550) (#41620) * fix nxos_linkagg issue (#41550) * fix nxos_linkagg issue * fix shippable (cherry picked from commit 119e6d680b38b4d091967002ce05cd7f3f3eddbc) * changelog Signed-off-by: Trishna Guha --- changelogs/fragments/nxos_linkagg_bugfix_2.5.6.yaml | 2 ++ lib/ansible/modules/network/nxos/nxos_linkagg.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/nxos_linkagg_bugfix_2.5.6.yaml diff --git a/changelogs/fragments/nxos_linkagg_bugfix_2.5.6.yaml b/changelogs/fragments/nxos_linkagg_bugfix_2.5.6.yaml new file mode 100644 index 00000000000..5d84e381463 --- /dev/null +++ b/changelogs/fragments/nxos_linkagg_bugfix_2.5.6.yaml @@ -0,0 +1,2 @@ +bugfixes: +- Fix nxos_linkagg (https://github.com/ansible/ansible/pull/41550). diff --git a/lib/ansible/modules/network/nxos/nxos_linkagg.py b/lib/ansible/modules/network/nxos/nxos_linkagg.py index f36ff090ccc..f3f47a316aa 100644 --- a/lib/ansible/modules/network/nxos/nxos_linkagg.py +++ b/lib/ansible/modules/network/nxos/nxos_linkagg.py @@ -349,7 +349,7 @@ def map_config_to_obj(module): try: channels = output['TABLE_channel']['ROW_channel'] - except KeyError: + except (TypeError, KeyError): return objs if channels: