ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 14:20:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Network module code cleanup (#5061)

Browse source 
* Fix imports in junos_template

* Python 3 compatibility in eos_command

* Python 3 compatibility for ios_command

* Clean up issues with ios_facts

* Python 3 compatibility for ios_facts

* Import shuffle in ios_template

* Python 3 compatibility for iosxr_command

* Clean up iosxr_facts.py

* Python 3 compatibility for iosxr_facts

* Python 3 compatibility for junos_command

* Python 3 compatibility for ops_command

* Cleanup issues with ops_facts

* Python 3 compatibility for ops_facts

* Cleanup issues with ops_template

* Python 3 compatibility for vyos_command

* Cleanup issues with vyos_facts

* Python 3 compatibility for vyos_facts
This commit is contained in:
Nathaniel Case 2016-09-27 17:06:03 -04:00 • committed by Matt Clay
commit aa82f48dc8
12 changed files with 74 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/modules/network/iosxr/iosxr_facts.py
View file

@ -116,11 +116,12 @@ ansible_net_neighbors:
type: dict
"""
import re
import itertools
from ansible.module_utils.basic import get_exception
import ansible.module_utils.iosxr
from ansible.module_utils.netcli import CommandRunner, AddCommandError
from ansible.module_utils.iosxr import NetworkModule
from ansible.module_utils.network import NetworkModule
from ansible.module_utils.six import iteritems
from ansible.module_utils.six.moves import zip
def add_command(runner, command):
@ -139,6 +140,9 @@ class FactsBase(object):
self.commands()
def commands(self):
raise NotImplementedError
class Default(FactsBase):
def commands(self):
@ -223,7 +227,7 @@ class Interfaces(FactsBase):
def populate_interfaces(self, interfaces):
facts = dict()
for key, value in interfaces.iteritems():
for key, value in iteritems(interfaces):
intf = dict()
intf['description'] = self.parse_description(value)
intf['macaddress'] = self.parse_macaddress(value)
@ -244,11 +248,11 @@ class Interfaces(FactsBase):
return facts
def populate_ipv6_interfaces(self, data):
for key, value in data.iteritems():
for key, value in iteritems(data):
self.facts['interfaces'][key]['ipv6'] = list()
addresses = re.findall(r'\s+(.+), subnet', value, re.M)
subnets = re.findall(r', subnet is (.+)$', value, re.M)
for addr, subnet in itertools.izip(addresses, subnets):
for addr, subnet in zip(addresses, subnets):
ipv6 = dict(address=addr.strip(), subnet=subnet.strip())
self.add_ip_address(addr.strip(), 'ipv6')
self.facts['interfaces'][key]['ipv6'].append(ipv6)
@ -276,6 +280,7 @@ class Interfaces(FactsBase):
def parse_interfaces(self, data):
parsed = dict()
key = ''
for line in data.split('\n'):
if len(line) == 0:
continue
@ -416,11 +421,10 @@ def main():
inst.populate()
facts.update(inst.facts)
except Exception:
raise
module.exit_json(out=module.from_json(runner.items))
ansible_facts = dict()
for key, value in facts.iteritems():
for key, value in iteritems(facts):
key = 'ansible_net_%s' % key
ansible_facts[key] = value