From 02ef320c24f4a2303959514692ae10107d461319 Mon Sep 17 00:00:00 2001 From: Nilashish Chakraborty Date: Tue, 21 Aug 2018 20:58:08 +0530 Subject: [PATCH] Fix ios_l2_interface vlan bug CP in 2.6 (#44445) * FIX ISSUE:#43878 when the vlans string have a final comma. (#43879) (cherry picked from commit 401c45384e053f369a4a0f8ee63393b32b495c37) * Added changelog --- changelogs/fragments/fix_ios_l2_interface_vlan.yaml | 3 +++ lib/ansible/modules/network/ios/ios_l2_interface.py | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/fix_ios_l2_interface_vlan.yaml diff --git a/changelogs/fragments/fix_ios_l2_interface_vlan.yaml b/changelogs/fragments/fix_ios_l2_interface_vlan.yaml new file mode 100644 index 00000000000..bba5588c2d0 --- /dev/null +++ b/changelogs/fragments/fix_ios_l2_interface_vlan.yaml @@ -0,0 +1,3 @@ +--- +bugfixes: + - ios_l2_interface - fix bug when list of vlans ends with comma (https://github.com/ansible/ansible/pull/43879) diff --git a/lib/ansible/modules/network/ios/ios_l2_interface.py b/lib/ansible/modules/network/ios/ios_l2_interface.py index a3d983e48ac..2bb2f66a5c4 100644 --- a/lib/ansible/modules/network/ios/ios_l2_interface.py +++ b/lib/ansible/modules/network/ios/ios_l2_interface.py @@ -303,11 +303,12 @@ def vlan_range_to_list(vlans): for part in vlans.split(','): if part.lower() == 'none': break - if '-' in part: - start, stop = (int(i) for i in part.split('-')) - result.extend(range(start, stop + 1)) - else: - result.append(int(part)) + if part: + if '-' in part: + start, stop = (int(i) for i in part.split('-')) + result.extend(range(start, stop + 1)) + else: + result.append(int(part)) return sorted(result)