Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Dec 26, 2024
1 parent fe8f201 commit e6c16ef
Show file tree
Hide file tree
Showing 9 changed files with 229 additions and 221 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ Name | Description
[cisco.ios.ios_user](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_user_module.rst)|Module to manage the aggregates of local users.
[cisco.ios.ios_vlans](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vlans_module.rst)|Resource module to configure VLANs.
[cisco.ios.ios_vrf](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vrf_module.rst)|Module to configure VRF definitions.
[cisco.ios.ios_vrf_address_family](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vrf_address_family_module.rst)|Resource module to configure VRF definitions.
[cisco.ios.ios_vrf_global](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vrf_global_module.rst)|Resource module to configure global VRF definitions.
[cisco.ios.ios_vrf_interfaces](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vrf_interfaces_module.rst)|Manages VRF configuration on interfaces.
[cisco.ios.ios_vxlan_vtep](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vxlan_vtep_module.rst)|Resource module to configure VXLAN VTEP interface.
Expand Down
2 changes: 1 addition & 1 deletion changelogs/fragments/add_vrf_address_family.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
minor_changes:
- Adds a new module `ios_vrf_address_family` to manage VRFs address families on Cisco IOS devices.
- Adds a new module `ios_vrf_address_family` to manage VRFs address families on Cisco IOS devices.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from __future__ import absolute_import, division, print_function


__metaclass__ = type

"""
Expand All @@ -18,15 +19,14 @@
"""

from ansible.module_utils.six import iteritems
from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import (
dict_merge,
)
from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module import (
ResourceModule,
)
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.facts import (
Facts,
from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import (
dict_merge,
)

from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.facts import Facts
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.rm_templates.vrf_address_family import (
Vrf_address_familyTemplate,
)
Expand Down Expand Up @@ -103,11 +103,10 @@ def __init__(self, module):
"route_replicate.from.vrf.vrf_name.unicast.static.route_map",
"route_target.export",
"route_target.import_config",

]

def execute_module(self):
""" Execute the module
"""Execute the module
:rtype: A dictionary
:returns: The result from module execution
Expand All @@ -118,8 +117,8 @@ def execute_module(self):
return self.result

def generate_commands(self):
""" Generate configuration commands to send based on
want, have and desired state.
"""Generate configuration commands to send based on
want, have and desired state.
"""
wantd = self.want
haved = self.have
Expand Down
6 changes: 3 additions & 3 deletions plugins/module_utils/network/ios/facts/facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.vlans.vlans import (
VlansFacts,
)
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.vrf_address_family.vrf_address_family import (
Vrf_address_familyFacts,
)
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.vrf_global.vrf_global import (
Vrf_globalFacts,
)
Expand All @@ -108,9 +111,6 @@
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.vxlan_vtep.vxlan_vtep import (
Vxlan_vtepFacts,
)
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.vrf_address_family.vrf_address_family import (
Vrf_address_familyFacts,
)


FACT_LEGACY_SUBSETS = dict(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from __future__ import absolute_import, division, print_function


__metaclass__ = type

"""
Expand All @@ -15,25 +16,23 @@
"""


from ansible_collections.ansible.netcommon.plugins.module_utils.network.common import (
utils,
from ansible_collections.ansible.netcommon.plugins.module_utils.network.common import utils

from ansible_collections.cisco.ios.plugins.module_utils.network.ios.argspec.vrf_address_family.vrf_address_family import (
Vrf_address_familyArgs,
)
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.rm_templates.vrf_address_family import (
Vrf_address_familyTemplate,
)
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.argspec.vrf_address_family.vrf_address_family import (
Vrf_address_familyArgs,
)
from ansible_collections.cisco.ios.plugins.module_utils.network.ios.utils.utils import (
flatten_config,
)


class Vrf_address_familyFacts(object):
""" The ios vrf_address_family facts class
"""
"""The ios vrf_address_family facts class"""

def __init__(self, module, subspec='config', options='options'):
def __init__(self, module, subspec="config", options="options"):
self._module = module
self.argument_spec = Vrf_address_familyArgs.argument_spec

Expand All @@ -53,7 +52,7 @@ def _flatten_config(self, config):
return "\n".join(finalConfig)

def populate_facts(self, connection, ansible_facts, data=None):
""" Populate the facts for Vrf_address_family network resource
"""Populate the facts for Vrf_address_family network resource
:param connection: the device connection
:param ansible_facts: Facts dictionary
Expand All @@ -74,7 +73,9 @@ def populate_facts(self, connection, ansible_facts, data=None):
finalConfig = self._flatten_config(data)

# parse native config using the Vrf_address_family template
vrf_address_family_parser = Vrf_address_familyTemplate(lines=finalConfig.splitlines(), module=self._module)
vrf_address_family_parser = Vrf_address_familyTemplate(
lines=finalConfig.splitlines(), module=self._module
)
obj = vrf_address_family_parser.parse()
objs = list(obj.values())

Expand All @@ -85,14 +86,16 @@ def populate_facts(self, connection, ansible_facts, data=None):
else:
vrf["address_families"] = []

ansible_facts['ansible_network_resources'].pop('vrf_address_family', None)
ansible_facts["ansible_network_resources"].pop("vrf_address_family", None)

params = utils.remove_empties(
vrf_address_family_parser.validate_config(self.argument_spec, {"config": objs}, redact=True)
vrf_address_family_parser.validate_config(
self.argument_spec, {"config": objs}, redact=True
),
)

facts['vrf_address_family'] = params.get("config", [])
ansible_facts['ansible_network_resources'].update(facts)
facts["vrf_address_family"] = params.get("config", [])
ansible_facts["ansible_network_resources"].update(facts)

return ansible_facts

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from __future__ import absolute_import, division, print_function


__metaclass__ = type

"""
Expand All @@ -15,6 +16,7 @@
"""

import re

from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.network_template import (
NetworkTemplate,
)
Expand Down Expand Up @@ -51,7 +53,7 @@ def __init__(self, lines=None, module=None):
"safi": (
"{{ safi if safi is defined else "
"'unicast' }}"
)
),
},
},
},
Expand Down Expand Up @@ -327,7 +329,8 @@ def __init__(self, lines=None, module=None):
),
"setval": (
"inter-as-hybrid csc next-hop "
"{{ inter_as_hybrid.csc.next_hop }}"),
"{{ inter_as_hybrid.csc.next_hop }}"
),
"result": {
'{{ name }}': {
'name': '{{ name }}',
Expand Down
2 changes: 2 additions & 0 deletions plugins/modules/ios_vrf_address_family.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

from __future__ import absolute_import, division, print_function


__metaclass__ = type

DOCUMENTATION = """
Expand Down Expand Up @@ -1120,6 +1121,7 @@
"""

from ansible.module_utils.basic import AnsibleModule

from ansible_collections.cisco.ios.plugins.module_utils.network.ios.argspec.vrf_address_family.vrf_address_family import (
Vrf_address_familyArgs,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ vrf definition test
maximum routes 1 2 reinstall 2
inter-as-hybrid next-hop 1.2.3.4
bgp next-hop Loopback23
exit-address-family
exit-address-family

0 comments on commit e6c16ef

Please sign in to comment.