diff --git a/changelogs/fragments/eos_vlan_more_than_6_nics.yaml b/changelogs/fragments/eos_vlan_more_than_6_nics.yaml new file mode 100644 index 00000000000..302ab5efdb1 --- /dev/null +++ b/changelogs/fragments/eos_vlan_more_than_6_nics.yaml @@ -0,0 +1,2 @@ +bugfixes: + - eos_vlan - fixed eos_vlan not working when having more than 6 interfaces (https://github.com/ansible/ansible/pull/38347) diff --git a/lib/ansible/modules/network/eos/eos_vlan.py b/lib/ansible/modules/network/eos/eos_vlan.py index 423329165b0..5958b9b0b0d 100644 --- a/lib/ansible/modules/network/eos/eos_vlan.py +++ b/lib/ansible/modules/network/eos/eos_vlan.py @@ -213,24 +213,22 @@ def map_obj_to_commands(updates, module): def map_config_to_obj(module): objs = [] - output = run_commands(module, ['show vlan']) - lines = output[0].strip().splitlines()[2:] + vlans = run_commands(module, ['show vlan conf | json']) - for l in lines: - splitted_line = re.split(r'\s{2,}', l.strip()) + for vlan in vlans[0]['vlans']: obj = {} - obj['vlan_id'] = splitted_line[0] - obj['name'] = splitted_line[1] - obj['state'] = splitted_line[2] + obj['vlan_id'] = vlan + obj['name'] = vlans[0]['vlans'][vlan]['name'] + obj['state'] = vlans[0]['vlans'][vlan]['status'] + obj['interfaces'] = [] - if obj['state'] == 'suspended': - obj['state'] = 'suspend' + interfaces = vlans[0]['vlans'][vlan] - obj['interfaces'] = [] - if len(splitted_line) > 3: + for interface in interfaces['interfaces']: + obj['interfaces'].append(interface) - for i in splitted_line[3].split(','): - obj['interfaces'].append(i.strip().replace('Et', 'ethernet')) + if obj['state'] == 'suspended': + obj['state'] = 'suspend' objs.append(obj)