ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 05:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix nxos_facts for nxapi transport (#23302)

Browse source 
* Partial revert of 2e476e64cd

This broke handling of nxos_facts over nxapi

* Fix nxos_facts tests not run in isolation
This commit is contained in:
Nathaniel Case 2017-04-05 11:47:37 -04:00 • committed by GitHub
commit d890167575
2 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

46
lib/ansible/modules/network/nxos/nxos_facts.py
View file

@ -218,7 +218,6 @@ class FactsBase(object):
yield self.transform_dict(item, keymap)
class Default(FactsBase):
VERSION_MAP = frozenset([
@ -315,23 +314,38 @@ class Interfaces(FactsBase):
return interfaces
def populate_neighbors(self, data):
# if there are no neighbors the show command returns
# ERROR: No neighbour information
if data.startswith('ERROR'):
return dict()
lines = data.split('\n')
regex = re.compile('(\S+)\s+(\S+)\s+\d+\s+\w+\s+(\S+)')
objects = dict()
if isinstance(data, str):
# if there are no neighbors the show command returns
# ERROR: No neighbour information
if data.startswith('ERROR'):
return dict()
lines = data.split('\n')
regex = re.compile('(\S+)\s+(\S+)\s+\d+\s+\w+\s+(\S+)')
for item in data.split('\n')[4:-1]:
match = regex.match(item)
if match:
nbor = {'host': match.group(1), 'port': match.group(3)}
if match.group(2) not in objects:
objects[match.group(2)] = []
objects[match.group(2)].append(nbor)
elif isinstance(data, dict):
data = data['TABLE_nbor']['ROW_nbor']
if isinstance(data, dict):
data = [data]
for item in data:
local_intf = item['l_port_id']
if local_intf not in objects:
objects[local_intf] = list()
nbor = dict()
nbor['port'] = item['port_id']
nbor['host'] = item['chassis_id']
objects[local_intf].append(nbor)
for item in data.split('\n')[4:-1]:
match = regex.match(item)
if match:
nbor = {'host': match.group(1), 'port': match.group(3)}
if match.group(2) not in objects:
objects[match.group(2)] = []
objects[match.group(2)].append(nbor)
return objects
def parse_ipv6_interfaces(self, data):