diff options
| author | CaptTrews <capttrews@gmail.com> | 2019-09-05 01:42:12 +0000 |
|---|---|---|
| committer | CaptTrews <capttrews@gmail.com> | 2019-09-05 01:42:12 +0000 |
| commit | b2f06b4d8e99eca07a222b5b83a0964142f1fff5 (patch) | |
| tree | abffb517ab4dffc9759fa40cc441eab6750ee94d /plugins/module_utils | |
| parent | 1ca6a9d12befb1a0d523661d1bf70991149b99c9 (diff) | |
| download | vyos.vyos-b2f06b4d8e99eca07a222b5b83a0964142f1fff5.tar.gz vyos.vyos-b2f06b4d8e99eca07a222b5b83a0964142f1fff5.zip | |
Updated from network content collector
Signed-off-by: CaptTrews <capttrews@gmail.com>
Diffstat (limited to 'plugins/module_utils')
| -rw-r--r-- | plugins/module_utils/network/vyos/argspec/facts/facts.py | 16 | ||||
| -rw-r--r-- | plugins/module_utils/network/vyos/facts/facts.py | 11 |
2 files changed, 2 insertions, 25 deletions
diff --git a/plugins/module_utils/network/vyos/argspec/facts/facts.py b/plugins/module_utils/network/vyos/argspec/facts/facts.py index 1dd1510..46fabaa 100644 --- a/plugins/module_utils/network/vyos/argspec/facts/facts.py +++ b/plugins/module_utils/network/vyos/argspec/facts/facts.py @@ -16,21 +16,7 @@ class FactsArgs(object): # pylint: disable=R0903 def __init__(self, **kwargs): pass - choices = [ - "all", - "interfaces", - "!interfaces", - "l3_interfaces", - "!l3_interfaces", - "lag_interfaces", - "!lag_interfaces", - "lldp_global", - "!lldp_global", - "lldp_interfaces", - "!lldp_interfaces", - ] - argument_spec = { "gather_subset": dict(default=["!config"], type="list"), - "gather_network_resources": dict(choices=choices, type="list"), + "gather_network_resources": dict(type="list"), } diff --git a/plugins/module_utils/network/vyos/facts/facts.py b/plugins/module_utils/network/vyos/facts/facts.py index d4aec70..bb292e1 100644 --- a/plugins/module_utils/network/vyos/facts/facts.py +++ b/plugins/module_utils/network/vyos/facts/facts.py @@ -9,9 +9,6 @@ calls the appropriate facts gathering function from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.facts.facts import ( - FactsArgs, -) from ansible.module_utils.network.common.facts.facts import FactsBase from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.facts.interfaces.interfaces import ( InterfacesFacts, @@ -65,15 +62,9 @@ class Facts(FactsBase): :rtype: dict :return: the facts gathered """ - netres_choices = FactsArgs.argument_spec[ - "gather_network_resources" - ].get("choices", []) if self.VALID_RESOURCE_SUBSETS: self.get_network_resources_facts( - netres_choices, - FACT_RESOURCE_SUBSETS, - resource_facts_type, - data, + FACT_RESOURCE_SUBSETS, resource_facts_type, data ) if self.VALID_LEGACY_GATHER_SUBSETS: self.get_network_legacy_facts( |