diff --git a/README.md b/README.md index 68feaa41f..f43002977 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,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_global](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vrf_global_module.rst)|Resource module to configure VRF definitions. [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. diff --git a/plugins/module_utils/network/ios/argspec/vrf_global/vrf_global.py b/plugins/module_utils/network/ios/argspec/vrf_global/vrf_global.py index 1d0400aec..1917031b1 100644 --- a/plugins/module_utils/network/ios/argspec/vrf_global/vrf_global.py +++ b/plugins/module_utils/network/ios/argspec/vrf_global/vrf_global.py @@ -5,6 +5,7 @@ from __future__ import absolute_import, division, print_function + __metaclass__ = type ############################################# @@ -29,8 +30,7 @@ class Vrf_globalArgs(object): # pylint: disable=R0903 - """The arg spec for the ios_vrf_global module - """ + """The arg spec for the ios_vrf_global module""" argument_spec = { "config": { diff --git a/plugins/module_utils/network/ios/config/vrf_global/vrf_global.py b/plugins/module_utils/network/ios/config/vrf_global/vrf_global.py index fa88bdd78..6c60e18c6 100644 --- a/plugins/module_utils/network/ios/config/vrf_global/vrf_global.py +++ b/plugins/module_utils/network/ios/config/vrf_global/vrf_global.py @@ -105,4 +105,4 @@ def _compare(self, want, have): self.compare(parsers=self.parsers, want=want, have=have) def _get_config(self): - return self._connection.get("show running-config vrf") \ No newline at end of file + return self._connection.get("show running-config vrf") diff --git a/plugins/module_utils/network/ios/facts/facts.py b/plugins/module_utils/network/ios/facts/facts.py index 05a4d99e5..7e7266b76 100644 --- a/plugins/module_utils/network/ios/facts/facts.py +++ b/plugins/module_utils/network/ios/facts/facts.py @@ -99,12 +99,13 @@ 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.vxlan_vtep.vxlan_vtep import ( - Vxlan_vtepFacts, -) from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.vrf_global.vrf_global import ( Vrf_globalFacts, ) +from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.vxlan_vtep.vxlan_vtep import ( + Vxlan_vtepFacts, +) + FACT_LEGACY_SUBSETS = dict( default=Default, diff --git a/plugins/module_utils/network/ios/facts/vrf_global/vrf_global.py b/plugins/module_utils/network/ios/facts/vrf_global/vrf_global.py index a95640ab6..49372dd00 100644 --- a/plugins/module_utils/network/ios/facts/vrf_global/vrf_global.py +++ b/plugins/module_utils/network/ios/facts/vrf_global/vrf_global.py @@ -5,6 +5,7 @@ from __future__ import absolute_import, division, print_function + __metaclass__ = type """ @@ -14,22 +15,20 @@ based on the configuration. """ -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_global.vrf_global import ( + Vrf_globalArgs, ) from ansible_collections.cisco.ios.plugins.module_utils.network.ios.rm_templates.vrf_global import ( Vrf_globalTemplate, ) -from ansible_collections.cisco.ios.plugins.module_utils.network.ios.argspec.vrf_global.vrf_global import ( - Vrf_globalArgs, -) class Vrf_globalFacts(object): - """ The ios vrf_global facts class - """ + """The ios vrf_global 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_globalArgs.argument_spec @@ -39,7 +38,7 @@ def get_config(self, connection): return connection.get("show running-config vrf") def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for Vrf_global network resource + """Populate the facts for Vrf_global network resource :param connection: the device connection :param ansible_facts: Facts dictionary @@ -58,13 +57,13 @@ def populate_facts(self, connection, ansible_facts, data=None): vrf_global_parser = Vrf_globalTemplate(lines=data.splitlines(), module=self._module) objs = list(vrf_global_parser.parse().values()) - ansible_facts['ansible_network_resources'].pop('vrf_global', None) + ansible_facts["ansible_network_resources"].pop("vrf_global", None) params = utils.remove_empties( - vrf_global_parser.validate_config(self.argument_spec, {"config": objs}, redact=True) + vrf_global_parser.validate_config(self.argument_spec, {"config": objs}, redact=True), ) - facts['vrf_global'] = params.get("config", {}) - ansible_facts['ansible_network_resources'].update(facts) + facts["vrf_global"] = params.get("config", {}) + ansible_facts["ansible_network_resources"].update(facts) return ansible_facts diff --git a/plugins/module_utils/network/ios/rm_templates/vrf_global.py b/plugins/module_utils/network/ios/rm_templates/vrf_global.py index 2f261ad9e..95477c081 100644 --- a/plugins/module_utils/network/ios/rm_templates/vrf_global.py +++ b/plugins/module_utils/network/ios/rm_templates/vrf_global.py @@ -5,6 +5,7 @@ from __future__ import absolute_import, division, print_function + __metaclass__ = type """ @@ -15,6 +16,7 @@ """ import re + from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.network_template import ( NetworkTemplate, ) @@ -25,7 +27,7 @@ def __init__(self, lines=None, module=None): super(Vrf_globalTemplate, self).__init__( lines=lines, tmplt=self, - module=module + module=module, ) # fmt: off diff --git a/plugins/modules/ios_vrf_global.py b/plugins/modules/ios_vrf_global.py index 2a8adb507..3a6d04c36 100644 --- a/plugins/modules/ios_vrf_global.py +++ b/plugins/modules/ios_vrf_global.py @@ -10,6 +10,7 @@ from __future__ import absolute_import, division, print_function + __metaclass__ = type DOCUMENTATION = """ @@ -162,6 +163,7 @@ """ from ansible.module_utils.basic import AnsibleModule + from ansible_collections.cisco.ios.ios.plugins.module_utils.network.ios.argspec.vrf_global.vrf_global import ( Vrf_globalArgs, )