cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix flow in eos_l2_interface (#57059)

Browse source 
* Also fix test debug labels
This commit is contained in:
Nathaniel Case 2019-05-28 14:06:57 -04:00 committed by GitHub
parent cf00883c9d
commit 1b66a13186
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/modules/network/eos/eos_l2_interface.py
View file

@ -215,7 +215,8 @@ def map_config_to_obj(module, warnings):
if "Interface does not exist" in command_result[0]:
warnings.append("Could not gather switchport information for {0}: {1}".format(item, command_result[0]))
continue
elif command_result[0] != "":
if command_result[0]:
switchport_cfg = command_result[0].split(':')[1].strip()
if switchport_cfg == 'Enabled':
@ -226,17 +227,16 @@ def map_config_to_obj(module, warnings):
obj = {
'name': item.lower(),
'state': state,
'access_vlan': parse_config_argument(configobj, item, 'switchport access vlan'),
'native_vlan': parse_config_argument(configobj, item, 'switchport trunk native vlan'),
'trunk_allowed_vlans': parse_config_argument(configobj, item, 'switchport trunk allowed vlan'),
}
if obj['access_vlan']:
obj['mode'] = 'access'
else:
obj['mode'] = 'trunk'
obj['access_vlan'] = parse_config_argument(configobj, item, 'switchport access vlan')
obj['native_vlan'] = parse_config_argument(configobj, item, 'switchport trunk native vlan')
obj['trunk_allowed_vlans'] = parse_config_argument(configobj, item, 'switchport trunk allowed vlan')
if obj['access_vlan']:
obj['mode'] = 'access'
else:
obj['mode'] = 'trunk'
instances.append(obj)
instances.append(obj)
return instances

4
test/integration/targets/eos_l2_interface/tests/cli/no_interface.yaml
View file

@ -1,6 +1,6 @@
---
- debug:
msg: "START eos_l3_interface/cli/no_interface.yaml on connection={{ ansible_connection }}"
msg: "START eos_l2_interface/cli/no_interface.yaml on connection={{ ansible_connection }}"
- name: Create fake interface
eos_interface:
@ -33,4 +33,4 @@
that: "result.warnings is not defined"
- debug:
msg: "END eos_l3_interface/cli/no_interface.yaml on connection={{ ansible_connection }}"
msg: "END eos_l2_interface/cli/no_interface.yaml on connection={{ ansible_connection }}"

4
test/integration/targets/eos_l2_interface/tests/eapi/no_interface.yaml
View file

@ -1,6 +1,6 @@
---
- debug:
msg: "START eos_l3_interface/eapi/no_interface.yaml on connection={{ ansible_connection }}"
msg: "START eos_l2_interface/eapi/no_interface.yaml on connection={{ ansible_connection }}"
- name: Create fake interface
eos_interface:
@ -34,4 +34,4 @@
that: "result.warnings is not defined"
- debug:
msg: "END eos_l3_interface/eapi/no_interface.yaml on connection={{ ansible_connection }}"
msg: "END eos_l2_interface/eapi/no_interface.yaml on connection={{ ansible_connection }}"