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

To fix the NoneType error raised in ios_l2_interface when Access Mode VLAN is unassigned (#42312)

Browse source 
* to fix the bug41657

* to fix review comment
This commit is contained in:
Sumit Jaiswal 2018-07-05 10:58:54 +05:30 committed by GitHub
parent 376b30ece4
commit 828dd1a663
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/network/ios/ios_l2_interface.py
View file

@ -154,10 +154,18 @@ def interface_is_portchannel(name, module):
def get_switchport(name, module): def get_switchport(name, module):
config = run_commands(module, ['show interface {0} switchport'.format(name)])[0] config = run_commands(module, ['show interface {0} switchport'.format(name)])[0]
mode = re.search(r'Administrative Mode: (?:.* )?(\w+)$', config, re.M).group(1) mode = re.search(r'Administrative Mode: (?:.* )?(\w+)$', config, re.M)
access = re.search(r'Access Mode VLAN: (\d+)', config).group(1) access = re.search(r'Access Mode VLAN: (\d+)', config)
native = re.search(r'Trunking Native Mode VLAN: (\d+)', config).group(1) native = re.search(r'Trunking Native Mode VLAN: (\d+)', config)
trunk = re.search(r'Trunking VLANs Enabled: (.+)$', config, re.M).group(1) trunk = re.search(r'Trunking VLANs Enabled: (.+)$', config, re.M)
if mode:
mode = mode.group(1)
if access:
access = access.group(1)
if native:
native = native.group(1)
if trunk:
trunk = trunk.group(1)
if trunk == 'ALL': if trunk == 'ALL':
trunk = '1-4094' trunk = '1-4094'