Facts Refresh (2.4 roadmap) (#23012)
Facts Refresh (2.4 roadmap)
This commit implements most of the 2.4 roadmap 'Facts Refresh'
- move facts.py to facts/__init__.py
- move facts Distribution() to its own class
- add a facts/utils.py
- move get_file_content and get_uname_version to facts/utils.py
- move Facts() class from facts/__init__ to facts/facts.py
- mv get_file_lines to facts/utils.py
- mv Ohai()/Facter() class to facts/ohai.py and facter.py
- Start moving fact Hardware() classes to facts/hardware/*.py
- mv HPUX() hardware class to facts/hardware/hpux.py
- move SunOSHardware() fact class to facts/hardware/sunos.py
- move OpenBSDHardware() class to facts/hardware/openbsd.py
- mv FreeBsdHardware() and DragonFlyHardware() to facts/hardware/
- mv NetBSDHardware() to facts/hardware/netbsd.py
- mv Darwin() hardware class to facts/hardware/darwin.py
- pep8/etc cleanups on facts/hardware/*.py
- Mv network facts classes to facts/network/*.py
- mv Virtual fact classes to facts/virtual
- mv Hardware.get_sysctl to facts/sysctl.py:get_sysctl
- Also mv get_uname_version from facts/utils.py -> distribution.py
since distribution.py is the only thing using it.
- add collector.py with new BaseFactCollector
- add a subclass for AnsibleFactCollector
- hook up dict key munging FactNamespaces
- add some test cases for testing the names of facts
- mv timeout stuff to facts.timeout
- rm ansible_facts()/get_all_facts() etc
- Instead of calling facts.ansible_facts(), fact collection
api used by setup.py is now to create an AnsibleFactCollector()
and call it's collect method.
- replace Facts.get_user_facts with UserFactCollector
- add a 'systems' facts package, mv UserFactCollector there
- mv get_dns_facts to DnsFactCollector
- mv get_env_facts to EnvFactCollector
- include the timeout length in exception message
- modules and module_utils that use AnsibleFactCollector
can now theoretically set the 'valid_subsets'
May be useful for network facts module that currently have
to reimplement a good chunk of facts.py to get gather_subsets
to work.
- get_local_facts -> system/LocalFactCollector
- get_date_time -> system/date_time.py
- get_fips_facts -> system/fips.py
- get_caps_facts() -> system/caps.py
- get_apparmor_facts -> system/apparmor.py
- get_selinux_facts -> system/selinux.py
- get_lsb_facts -> system/lsb.py
- get_service_mgr_facts -> system/service_mgr.py
- Facts.is_systemd_managed -> system/service_mgr.py
- get_pkg_mgr_facts -> system/pkg_mgr.py
- Facts()._get_mount_size_facts() -> facts.utils.get_mount_size()
- add unit test for EnvFactCollector
- add a test case for minimal gather_subsets
- add test case for collect_ids
- Make gather_subset match existing behavior or '!all'
If 'gather_subset' is provided as '!all', the existing behavior
(in 2.2/2.3) is that means 'dont collect any facts except those
from the Facts() class'. So 'skip everything except
'apparmor', 'caps', 'date_time', 'env', 'fips', 'local', 'lsb',
'pkg_mgr', 'python', 'selinux', 'service_mgr', 'user', 'platform', etc.
The new facts setup was making '!all' mean no facts at all, since
it can add/exclude at a finer granularity. Since that makes more
sense for the ansible collector, and the set of minimal facts to
collect is really more up to setup.py to decide we do just that.
So if setup.py needs to always collect some gather_subset, even
on !all, setup.py needs to have the that subset added to the
list it passes as minimal_gather_subset.
This should fix some intg tests that assume '!all' means that
some facts are still collected (user info and env for example).
If we want to make setup.py collect a more minimal set, we can do that.
- force facts_dicts.keys() to a list so py3 works
- split fact collector tests to test_collectors.py
- convert Facter(Facts) -> other/facter.py:FacterFactCollector
- add FactCollector.collect_with_namespace()
regular .collect() will return a dict with the key names
using the base names ('ip_address', 'service_mgr' etc)
.collect_with_namespace() will return a dict where the key names
have been transformed with the collectors namespace, if there is
one. For most, this means a namespace that adds 'ansible_' to the
start of the key name.
For 'FacterFactCollector', the namespace transforms the key to
'facter_*'.
- add test cases for collect_with_namespace
- move all the concrete 'which facts does setup.py' stuff to setup.py
The caller of AnsibleFactCollector.from_gather_subset() needs to
pass in the list of collector classes now.
- update system/setup.py to import all of the fact classes and pass
in that list.
- split the Distribution fact class up a bit
extracted the 'distro release' file handling (ie, linux
boxes with /etc/release, /etc/os-release etc) into its
own class.
- extract get_cmdline_facts -> cmdline.py
- extract get_public_ssh_host_keys -> system/ssh_pub_keys.py
- extract get_platform_facts -> system/platform.py
platform.py may be a good candidate for further splitting.
- rm test for plain Facts() base class
- let the base class for Collector unit tests provide collected_facts
some Collectors and/or their migrated Facts() subsclasses need
to look at facts collected by other modules ('ansible_architecture'
the main one...).
Collector.collect() has the collected_facts arg for this, so add
a class variable to BaseFactsTest so we can specify it.
- mv Ohai to other/ohai.py and convert to Collector
- update hardware/*.py to return facts (no side effects)
- mv AnsibleFactCollector to setup.py
- extra collector class gathering to module method in
facts/__init__.py (collector_classes_from_gather_subset)
- add a CollectorMetaDataCollector collector used to provide
the 'gather_setup' fact
- add unit test module for 'setup' module
(test/units/modules/system/setup.py)
- Collector init now doesnt need a module, but collect does
An instance of a FactCollector() isnt tied to a AnsibleModule
instance, but the collect() method can be, so optionally pass
in module to FactCollector.collect() (everywhere)
- add a default_collectors for list of default collectors
import and use it from setup.py module
eventually, would like to replace this with a plugin loader
style class finder/loader
- unit tests for module_utils/facts/__init__.py
- add unit tests for ohai facts collector
- remove self.facts side effect on populate() in hardware/sunos.py
- convert OpenBSDHardware() to rm side effects on self.facts
- try to rm some self.facts side effects in Network()
plumb in collected_facts from populate() where it is needed.
stop passing collected_facts into Network() [via cached_facts=,
where it eventually becomes self.facts]
- nothing provides Fact() cached_facts arg now, rm it
Facts() should be internal only implementation so nothing
should be using it.
Of course, now someone will.
- add a Collector.name attr to build a map of name->_fact_ids
To properly exclude a gather_subset spec like '!hardware', we
need to know that 'hardware' also means 'devices', 'dmi', etc.
Before, '!hardware' would remove the 'hardware' collector name
but not 'devices'. Since both would end up in id_collector_map,
we would still end up with the HardwareCollector in the collector
list. End result being that '!hardware' wouldn't stop hardware
from being collected.
So we need to be able to build that map, so add the Collector.name
attribute that is the primary name (like 'hardware') and let
Collector._fact_ids be the other fact ids that a collector is
responsible for.
Construct the aliases_map of Collector.name -> set of _fact_ids
in fact/__init__.py get_collector_names, and use it when we are
populating the exclude set.
- refactor of distribution.py
make the big OS_FAMILY literal a little easier to read
Also keys can now be any string instead of python literals
99% sure the test for 'KDE Neon' was wrong
I don't see how/where it should or could get 'Neon' instead
of 'KDE Neon' as provided in os-release NAME=
Use 'distribution' string for key to OS_MAP
ie, we dont need to make it a valid python label anymore so dont.
move _has_dist_file to module as _file_exists
easier to mock without mucking with os.path
mv platform.system() calls to within get_distribution_facts() instead
of Distribution() init.
- remove _json compat module
The code in here was to support:
-a 'json' python module that was not the standard one included
with python since 2.6.
- potentially fallback to simplejson if 'json' was not available.
'json' is available for all supported python versions now so
no longer needed.
- mv get_collector_names -> facts.collector
- mv collector_classes_from_gather_subset -> facts.collector
- mv collector tests from test_facts -> test_collector
- Use six's reduce() in sunos/netbsd hardware facts
- rm extraneous get_uname_version in utils
only system/distribution.py uses it
- Remove Facts() subclass metaclass usage
- using fact_id and a platform id for matching collectors
gut most of Facts() subclasses
rm Facts() subclasses with weird metaclass
only add collectors that match the fact_ids and the platform_info
to the list of collectors used.
atm, a collectors platform_id will default to 'Generic', and
any platform matches 'Generic'
goal is to select collector classes including matching the
systems platform in collector.py, instead of relying on
metaclasses in hardware/*. To finish this, the various
Facts() subclasses will need to be replaced entirely with
Collector() subclasses.
use collector classmethod platform_match() to match the platform
This lets the particular class decide if it is compatible with
a given platform_info. platform_info is a dict like obj, so it could be
expanded in the future.
Add a default platform_match to BaseFactCollector that matches
platform_info['system'] == cls._platform
They were needed previously to trigger a module
load on all the collector classes when we import
facts/hardare so that the Hardware() and related
classes that used __new__ and find_all_subclasses()
would work.
Now that is done in collectors based on platform matching
at runtime we dont need to do it py module import/parse
time. So the non empty __init__.pys are no longer needed
and their is a more flexible mechanism for selection
platform specific stuff.
facts/facts.py is no longer used, rm'ed
- if we dont find an implement class for gather spec.. just ignore it.
Would be useful to add a warn to warn about this case.
- Fix SD-UX typo (should be HP-UX)
- Port fix for #21893 (0 sockets) to this branch
This readds the change from 8ad182059d5a085e4f8ecfe8ae63bad14a7dc01c
that got lost in merge/rebase
Fixes #21893
- port sunos fact locale fix for #24542 to this branch
based on e558ec19cd1fd9d00e299cf1938d4ca3cec85cda
Fixes #24542
Solaris fact fix (#24793)
ensure locale for solaris fact gathering
fixes issue with locale interfering with proper reading of decimals
- raise exceptions in the air like we just dont care.
Pretty much ignore any not exit exception in facts
collection. And add some test cases.
- added new selinux fact to clarify python lib
the selinux fact is boolean false when the library is not installed,
a dictionary/hash otherwise, but this is ambigous
added new fact so we can eventually remove the type dichtomy and normalize it as a dict
Re-add of devel commit 85c7a7b844bf429fc9cc0ffce5dd9bf05ed47b5a to
the new code layout, since it got removed in merge/rebase
8 years ago
|
|
|
# unit tests for ansible other facter fact collector
|
|
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
#
|
|
|
|
|
# Ansible is free software: you can redistribute it and/or modify
|
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
# (at your option) any later version.
|
|
|
|
|
#
|
|
|
|
|
# Ansible is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
#
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
|
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# Make coding more python3-ish
|
|
|
|
|
from __future__ import (absolute_import, division)
|
|
|
|
|
__metaclass__ = type
|
|
|
|
|
|
|
|
|
|
from units.compat.mock import Mock, patch
|
Facts Refresh (2.4 roadmap) (#23012)
Facts Refresh (2.4 roadmap)
This commit implements most of the 2.4 roadmap 'Facts Refresh'
- move facts.py to facts/__init__.py
- move facts Distribution() to its own class
- add a facts/utils.py
- move get_file_content and get_uname_version to facts/utils.py
- move Facts() class from facts/__init__ to facts/facts.py
- mv get_file_lines to facts/utils.py
- mv Ohai()/Facter() class to facts/ohai.py and facter.py
- Start moving fact Hardware() classes to facts/hardware/*.py
- mv HPUX() hardware class to facts/hardware/hpux.py
- move SunOSHardware() fact class to facts/hardware/sunos.py
- move OpenBSDHardware() class to facts/hardware/openbsd.py
- mv FreeBsdHardware() and DragonFlyHardware() to facts/hardware/
- mv NetBSDHardware() to facts/hardware/netbsd.py
- mv Darwin() hardware class to facts/hardware/darwin.py
- pep8/etc cleanups on facts/hardware/*.py
- Mv network facts classes to facts/network/*.py
- mv Virtual fact classes to facts/virtual
- mv Hardware.get_sysctl to facts/sysctl.py:get_sysctl
- Also mv get_uname_version from facts/utils.py -> distribution.py
since distribution.py is the only thing using it.
- add collector.py with new BaseFactCollector
- add a subclass for AnsibleFactCollector
- hook up dict key munging FactNamespaces
- add some test cases for testing the names of facts
- mv timeout stuff to facts.timeout
- rm ansible_facts()/get_all_facts() etc
- Instead of calling facts.ansible_facts(), fact collection
api used by setup.py is now to create an AnsibleFactCollector()
and call it's collect method.
- replace Facts.get_user_facts with UserFactCollector
- add a 'systems' facts package, mv UserFactCollector there
- mv get_dns_facts to DnsFactCollector
- mv get_env_facts to EnvFactCollector
- include the timeout length in exception message
- modules and module_utils that use AnsibleFactCollector
can now theoretically set the 'valid_subsets'
May be useful for network facts module that currently have
to reimplement a good chunk of facts.py to get gather_subsets
to work.
- get_local_facts -> system/LocalFactCollector
- get_date_time -> system/date_time.py
- get_fips_facts -> system/fips.py
- get_caps_facts() -> system/caps.py
- get_apparmor_facts -> system/apparmor.py
- get_selinux_facts -> system/selinux.py
- get_lsb_facts -> system/lsb.py
- get_service_mgr_facts -> system/service_mgr.py
- Facts.is_systemd_managed -> system/service_mgr.py
- get_pkg_mgr_facts -> system/pkg_mgr.py
- Facts()._get_mount_size_facts() -> facts.utils.get_mount_size()
- add unit test for EnvFactCollector
- add a test case for minimal gather_subsets
- add test case for collect_ids
- Make gather_subset match existing behavior or '!all'
If 'gather_subset' is provided as '!all', the existing behavior
(in 2.2/2.3) is that means 'dont collect any facts except those
from the Facts() class'. So 'skip everything except
'apparmor', 'caps', 'date_time', 'env', 'fips', 'local', 'lsb',
'pkg_mgr', 'python', 'selinux', 'service_mgr', 'user', 'platform', etc.
The new facts setup was making '!all' mean no facts at all, since
it can add/exclude at a finer granularity. Since that makes more
sense for the ansible collector, and the set of minimal facts to
collect is really more up to setup.py to decide we do just that.
So if setup.py needs to always collect some gather_subset, even
on !all, setup.py needs to have the that subset added to the
list it passes as minimal_gather_subset.
This should fix some intg tests that assume '!all' means that
some facts are still collected (user info and env for example).
If we want to make setup.py collect a more minimal set, we can do that.
- force facts_dicts.keys() to a list so py3 works
- split fact collector tests to test_collectors.py
- convert Facter(Facts) -> other/facter.py:FacterFactCollector
- add FactCollector.collect_with_namespace()
regular .collect() will return a dict with the key names
using the base names ('ip_address', 'service_mgr' etc)
.collect_with_namespace() will return a dict where the key names
have been transformed with the collectors namespace, if there is
one. For most, this means a namespace that adds 'ansible_' to the
start of the key name.
For 'FacterFactCollector', the namespace transforms the key to
'facter_*'.
- add test cases for collect_with_namespace
- move all the concrete 'which facts does setup.py' stuff to setup.py
The caller of AnsibleFactCollector.from_gather_subset() needs to
pass in the list of collector classes now.
- update system/setup.py to import all of the fact classes and pass
in that list.
- split the Distribution fact class up a bit
extracted the 'distro release' file handling (ie, linux
boxes with /etc/release, /etc/os-release etc) into its
own class.
- extract get_cmdline_facts -> cmdline.py
- extract get_public_ssh_host_keys -> system/ssh_pub_keys.py
- extract get_platform_facts -> system/platform.py
platform.py may be a good candidate for further splitting.
- rm test for plain Facts() base class
- let the base class for Collector unit tests provide collected_facts
some Collectors and/or their migrated Facts() subsclasses need
to look at facts collected by other modules ('ansible_architecture'
the main one...).
Collector.collect() has the collected_facts arg for this, so add
a class variable to BaseFactsTest so we can specify it.
- mv Ohai to other/ohai.py and convert to Collector
- update hardware/*.py to return facts (no side effects)
- mv AnsibleFactCollector to setup.py
- extra collector class gathering to module method in
facts/__init__.py (collector_classes_from_gather_subset)
- add a CollectorMetaDataCollector collector used to provide
the 'gather_setup' fact
- add unit test module for 'setup' module
(test/units/modules/system/setup.py)
- Collector init now doesnt need a module, but collect does
An instance of a FactCollector() isnt tied to a AnsibleModule
instance, but the collect() method can be, so optionally pass
in module to FactCollector.collect() (everywhere)
- add a default_collectors for list of default collectors
import and use it from setup.py module
eventually, would like to replace this with a plugin loader
style class finder/loader
- unit tests for module_utils/facts/__init__.py
- add unit tests for ohai facts collector
- remove self.facts side effect on populate() in hardware/sunos.py
- convert OpenBSDHardware() to rm side effects on self.facts
- try to rm some self.facts side effects in Network()
plumb in collected_facts from populate() where it is needed.
stop passing collected_facts into Network() [via cached_facts=,
where it eventually becomes self.facts]
- nothing provides Fact() cached_facts arg now, rm it
Facts() should be internal only implementation so nothing
should be using it.
Of course, now someone will.
- add a Collector.name attr to build a map of name->_fact_ids
To properly exclude a gather_subset spec like '!hardware', we
need to know that 'hardware' also means 'devices', 'dmi', etc.
Before, '!hardware' would remove the 'hardware' collector name
but not 'devices'. Since both would end up in id_collector_map,
we would still end up with the HardwareCollector in the collector
list. End result being that '!hardware' wouldn't stop hardware
from being collected.
So we need to be able to build that map, so add the Collector.name
attribute that is the primary name (like 'hardware') and let
Collector._fact_ids be the other fact ids that a collector is
responsible for.
Construct the aliases_map of Collector.name -> set of _fact_ids
in fact/__init__.py get_collector_names, and use it when we are
populating the exclude set.
- refactor of distribution.py
make the big OS_FAMILY literal a little easier to read
Also keys can now be any string instead of python literals
99% sure the test for 'KDE Neon' was wrong
I don't see how/where it should or could get 'Neon' instead
of 'KDE Neon' as provided in os-release NAME=
Use 'distribution' string for key to OS_MAP
ie, we dont need to make it a valid python label anymore so dont.
move _has_dist_file to module as _file_exists
easier to mock without mucking with os.path
mv platform.system() calls to within get_distribution_facts() instead
of Distribution() init.
- remove _json compat module
The code in here was to support:
-a 'json' python module that was not the standard one included
with python since 2.6.
- potentially fallback to simplejson if 'json' was not available.
'json' is available for all supported python versions now so
no longer needed.
- mv get_collector_names -> facts.collector
- mv collector_classes_from_gather_subset -> facts.collector
- mv collector tests from test_facts -> test_collector
- Use six's reduce() in sunos/netbsd hardware facts
- rm extraneous get_uname_version in utils
only system/distribution.py uses it
- Remove Facts() subclass metaclass usage
- using fact_id and a platform id for matching collectors
gut most of Facts() subclasses
rm Facts() subclasses with weird metaclass
only add collectors that match the fact_ids and the platform_info
to the list of collectors used.
atm, a collectors platform_id will default to 'Generic', and
any platform matches 'Generic'
goal is to select collector classes including matching the
systems platform in collector.py, instead of relying on
metaclasses in hardware/*. To finish this, the various
Facts() subclasses will need to be replaced entirely with
Collector() subclasses.
use collector classmethod platform_match() to match the platform
This lets the particular class decide if it is compatible with
a given platform_info. platform_info is a dict like obj, so it could be
expanded in the future.
Add a default platform_match to BaseFactCollector that matches
platform_info['system'] == cls._platform
They were needed previously to trigger a module
load on all the collector classes when we import
facts/hardare so that the Hardware() and related
classes that used __new__ and find_all_subclasses()
would work.
Now that is done in collectors based on platform matching
at runtime we dont need to do it py module import/parse
time. So the non empty __init__.pys are no longer needed
and their is a more flexible mechanism for selection
platform specific stuff.
facts/facts.py is no longer used, rm'ed
- if we dont find an implement class for gather spec.. just ignore it.
Would be useful to add a warn to warn about this case.
- Fix SD-UX typo (should be HP-UX)
- Port fix for #21893 (0 sockets) to this branch
This readds the change from 8ad182059d5a085e4f8ecfe8ae63bad14a7dc01c
that got lost in merge/rebase
Fixes #21893
- port sunos fact locale fix for #24542 to this branch
based on e558ec19cd1fd9d00e299cf1938d4ca3cec85cda
Fixes #24542
Solaris fact fix (#24793)
ensure locale for solaris fact gathering
fixes issue with locale interfering with proper reading of decimals
- raise exceptions in the air like we just dont care.
Pretty much ignore any not exit exception in facts
collection. And add some test cases.
- added new selinux fact to clarify python lib
the selinux fact is boolean false when the library is not installed,
a dictionary/hash otherwise, but this is ambigous
added new fact so we can eventually remove the type dichtomy and normalize it as a dict
Re-add of devel commit 85c7a7b844bf429fc9cc0ffce5dd9bf05ed47b5a to
the new code layout, since it got removed in merge/rebase
8 years ago
|
|
|
|
|
|
|
|
from .. base import BaseFactsTest
|
|
|
|
|
|
|
|
|
|
from ansible.module_utils.facts.other.facter import FacterFactCollector
|
|
|
|
|
|
|
|
|
|
facter_json_output = '''
|
|
|
|
|
{
|
|
|
|
|
"operatingsystemmajrelease": "25",
|
|
|
|
|
"hardwareisa": "x86_64",
|
|
|
|
|
"kernel": "Linux",
|
|
|
|
|
"path": "/home/testuser/src/ansible/bin:/home/testuser/perl5/bin:/home/testuser/perl5/bin:/home/testuser/bin:/home/testuser/.local/bin:/home/testuser/pythons/bin:/usr/lib64/qt-3.3/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/testuser/.cabal/bin:/home/testuser/gopath/bin:/home/testuser/.rvm/bin",
|
Facts Refresh (2.4 roadmap) (#23012)
Facts Refresh (2.4 roadmap)
This commit implements most of the 2.4 roadmap 'Facts Refresh'
- move facts.py to facts/__init__.py
- move facts Distribution() to its own class
- add a facts/utils.py
- move get_file_content and get_uname_version to facts/utils.py
- move Facts() class from facts/__init__ to facts/facts.py
- mv get_file_lines to facts/utils.py
- mv Ohai()/Facter() class to facts/ohai.py and facter.py
- Start moving fact Hardware() classes to facts/hardware/*.py
- mv HPUX() hardware class to facts/hardware/hpux.py
- move SunOSHardware() fact class to facts/hardware/sunos.py
- move OpenBSDHardware() class to facts/hardware/openbsd.py
- mv FreeBsdHardware() and DragonFlyHardware() to facts/hardware/
- mv NetBSDHardware() to facts/hardware/netbsd.py
- mv Darwin() hardware class to facts/hardware/darwin.py
- pep8/etc cleanups on facts/hardware/*.py
- Mv network facts classes to facts/network/*.py
- mv Virtual fact classes to facts/virtual
- mv Hardware.get_sysctl to facts/sysctl.py:get_sysctl
- Also mv get_uname_version from facts/utils.py -> distribution.py
since distribution.py is the only thing using it.
- add collector.py with new BaseFactCollector
- add a subclass for AnsibleFactCollector
- hook up dict key munging FactNamespaces
- add some test cases for testing the names of facts
- mv timeout stuff to facts.timeout
- rm ansible_facts()/get_all_facts() etc
- Instead of calling facts.ansible_facts(), fact collection
api used by setup.py is now to create an AnsibleFactCollector()
and call it's collect method.
- replace Facts.get_user_facts with UserFactCollector
- add a 'systems' facts package, mv UserFactCollector there
- mv get_dns_facts to DnsFactCollector
- mv get_env_facts to EnvFactCollector
- include the timeout length in exception message
- modules and module_utils that use AnsibleFactCollector
can now theoretically set the 'valid_subsets'
May be useful for network facts module that currently have
to reimplement a good chunk of facts.py to get gather_subsets
to work.
- get_local_facts -> system/LocalFactCollector
- get_date_time -> system/date_time.py
- get_fips_facts -> system/fips.py
- get_caps_facts() -> system/caps.py
- get_apparmor_facts -> system/apparmor.py
- get_selinux_facts -> system/selinux.py
- get_lsb_facts -> system/lsb.py
- get_service_mgr_facts -> system/service_mgr.py
- Facts.is_systemd_managed -> system/service_mgr.py
- get_pkg_mgr_facts -> system/pkg_mgr.py
- Facts()._get_mount_size_facts() -> facts.utils.get_mount_size()
- add unit test for EnvFactCollector
- add a test case for minimal gather_subsets
- add test case for collect_ids
- Make gather_subset match existing behavior or '!all'
If 'gather_subset' is provided as '!all', the existing behavior
(in 2.2/2.3) is that means 'dont collect any facts except those
from the Facts() class'. So 'skip everything except
'apparmor', 'caps', 'date_time', 'env', 'fips', 'local', 'lsb',
'pkg_mgr', 'python', 'selinux', 'service_mgr', 'user', 'platform', etc.
The new facts setup was making '!all' mean no facts at all, since
it can add/exclude at a finer granularity. Since that makes more
sense for the ansible collector, and the set of minimal facts to
collect is really more up to setup.py to decide we do just that.
So if setup.py needs to always collect some gather_subset, even
on !all, setup.py needs to have the that subset added to the
list it passes as minimal_gather_subset.
This should fix some intg tests that assume '!all' means that
some facts are still collected (user info and env for example).
If we want to make setup.py collect a more minimal set, we can do that.
- force facts_dicts.keys() to a list so py3 works
- split fact collector tests to test_collectors.py
- convert Facter(Facts) -> other/facter.py:FacterFactCollector
- add FactCollector.collect_with_namespace()
regular .collect() will return a dict with the key names
using the base names ('ip_address', 'service_mgr' etc)
.collect_with_namespace() will return a dict where the key names
have been transformed with the collectors namespace, if there is
one. For most, this means a namespace that adds 'ansible_' to the
start of the key name.
For 'FacterFactCollector', the namespace transforms the key to
'facter_*'.
- add test cases for collect_with_namespace
- move all the concrete 'which facts does setup.py' stuff to setup.py
The caller of AnsibleFactCollector.from_gather_subset() needs to
pass in the list of collector classes now.
- update system/setup.py to import all of the fact classes and pass
in that list.
- split the Distribution fact class up a bit
extracted the 'distro release' file handling (ie, linux
boxes with /etc/release, /etc/os-release etc) into its
own class.
- extract get_cmdline_facts -> cmdline.py
- extract get_public_ssh_host_keys -> system/ssh_pub_keys.py
- extract get_platform_facts -> system/platform.py
platform.py may be a good candidate for further splitting.
- rm test for plain Facts() base class
- let the base class for Collector unit tests provide collected_facts
some Collectors and/or their migrated Facts() subsclasses need
to look at facts collected by other modules ('ansible_architecture'
the main one...).
Collector.collect() has the collected_facts arg for this, so add
a class variable to BaseFactsTest so we can specify it.
- mv Ohai to other/ohai.py and convert to Collector
- update hardware/*.py to return facts (no side effects)
- mv AnsibleFactCollector to setup.py
- extra collector class gathering to module method in
facts/__init__.py (collector_classes_from_gather_subset)
- add a CollectorMetaDataCollector collector used to provide
the 'gather_setup' fact
- add unit test module for 'setup' module
(test/units/modules/system/setup.py)
- Collector init now doesnt need a module, but collect does
An instance of a FactCollector() isnt tied to a AnsibleModule
instance, but the collect() method can be, so optionally pass
in module to FactCollector.collect() (everywhere)
- add a default_collectors for list of default collectors
import and use it from setup.py module
eventually, would like to replace this with a plugin loader
style class finder/loader
- unit tests for module_utils/facts/__init__.py
- add unit tests for ohai facts collector
- remove self.facts side effect on populate() in hardware/sunos.py
- convert OpenBSDHardware() to rm side effects on self.facts
- try to rm some self.facts side effects in Network()
plumb in collected_facts from populate() where it is needed.
stop passing collected_facts into Network() [via cached_facts=,
where it eventually becomes self.facts]
- nothing provides Fact() cached_facts arg now, rm it
Facts() should be internal only implementation so nothing
should be using it.
Of course, now someone will.
- add a Collector.name attr to build a map of name->_fact_ids
To properly exclude a gather_subset spec like '!hardware', we
need to know that 'hardware' also means 'devices', 'dmi', etc.
Before, '!hardware' would remove the 'hardware' collector name
but not 'devices'. Since both would end up in id_collector_map,
we would still end up with the HardwareCollector in the collector
list. End result being that '!hardware' wouldn't stop hardware
from being collected.
So we need to be able to build that map, so add the Collector.name
attribute that is the primary name (like 'hardware') and let
Collector._fact_ids be the other fact ids that a collector is
responsible for.
Construct the aliases_map of Collector.name -> set of _fact_ids
in fact/__init__.py get_collector_names, and use it when we are
populating the exclude set.
- refactor of distribution.py
make the big OS_FAMILY literal a little easier to read
Also keys can now be any string instead of python literals
99% sure the test for 'KDE Neon' was wrong
I don't see how/where it should or could get 'Neon' instead
of 'KDE Neon' as provided in os-release NAME=
Use 'distribution' string for key to OS_MAP
ie, we dont need to make it a valid python label anymore so dont.
move _has_dist_file to module as _file_exists
easier to mock without mucking with os.path
mv platform.system() calls to within get_distribution_facts() instead
of Distribution() init.
- remove _json compat module
The code in here was to support:
-a 'json' python module that was not the standard one included
with python since 2.6.
- potentially fallback to simplejson if 'json' was not available.
'json' is available for all supported python versions now so
no longer needed.
- mv get_collector_names -> facts.collector
- mv collector_classes_from_gather_subset -> facts.collector
- mv collector tests from test_facts -> test_collector
- Use six's reduce() in sunos/netbsd hardware facts
- rm extraneous get_uname_version in utils
only system/distribution.py uses it
- Remove Facts() subclass metaclass usage
- using fact_id and a platform id for matching collectors
gut most of Facts() subclasses
rm Facts() subclasses with weird metaclass
only add collectors that match the fact_ids and the platform_info
to the list of collectors used.
atm, a collectors platform_id will default to 'Generic', and
any platform matches 'Generic'
goal is to select collector classes including matching the
systems platform in collector.py, instead of relying on
metaclasses in hardware/*. To finish this, the various
Facts() subclasses will need to be replaced entirely with
Collector() subclasses.
use collector classmethod platform_match() to match the platform
This lets the particular class decide if it is compatible with
a given platform_info. platform_info is a dict like obj, so it could be
expanded in the future.
Add a default platform_match to BaseFactCollector that matches
platform_info['system'] == cls._platform
They were needed previously to trigger a module
load on all the collector classes when we import
facts/hardare so that the Hardware() and related
classes that used __new__ and find_all_subclasses()
would work.
Now that is done in collectors based on platform matching
at runtime we dont need to do it py module import/parse
time. So the non empty __init__.pys are no longer needed
and their is a more flexible mechanism for selection
platform specific stuff.
facts/facts.py is no longer used, rm'ed
- if we dont find an implement class for gather spec.. just ignore it.
Would be useful to add a warn to warn about this case.
- Fix SD-UX typo (should be HP-UX)
- Port fix for #21893 (0 sockets) to this branch
This readds the change from 8ad182059d5a085e4f8ecfe8ae63bad14a7dc01c
that got lost in merge/rebase
Fixes #21893
- port sunos fact locale fix for #24542 to this branch
based on e558ec19cd1fd9d00e299cf1938d4ca3cec85cda
Fixes #24542
Solaris fact fix (#24793)
ensure locale for solaris fact gathering
fixes issue with locale interfering with proper reading of decimals
- raise exceptions in the air like we just dont care.
Pretty much ignore any not exit exception in facts
collection. And add some test cases.
- added new selinux fact to clarify python lib
the selinux fact is boolean false when the library is not installed,
a dictionary/hash otherwise, but this is ambigous
added new fact so we can eventually remove the type dichtomy and normalize it as a dict
Re-add of devel commit 85c7a7b844bf429fc9cc0ffce5dd9bf05ed47b5a to
the new code layout, since it got removed in merge/rebase
8 years ago
|
|
|
"memorysize": "15.36 GB",
|
|
|
|
|
"memoryfree": "4.88 GB",
|
|
|
|
|
"swapsize": "7.70 GB",
|
|
|
|
|
"swapfree": "6.75 GB",
|
|
|
|
|
"swapsize_mb": "7880.00",
|
|
|
|
|
"swapfree_mb": "6911.41",
|
|
|
|
|
"memorysize_mb": "15732.95",
|
|
|
|
|
"memoryfree_mb": "4997.68",
|
|
|
|
|
"lsbmajdistrelease": "25",
|
|
|
|
|
"macaddress": "02:42:ea:15:d8:84",
|
|
|
|
|
"id": "testuser",
|
|
|
|
|
"domain": "example.com",
|
|
|
|
|
"augeasversion": "1.7.0",
|
|
|
|
|
"os": {
|
|
|
|
|
"name": "Fedora",
|
|
|
|
|
"family": "RedHat",
|
|
|
|
|
"release": {
|
|
|
|
|
"major": "25",
|
|
|
|
|
"full": "25"
|
|
|
|
|
},
|
|
|
|
|
"lsb": {
|
|
|
|
|
"distcodename": "TwentyFive",
|
|
|
|
|
"distid": "Fedora",
|
|
|
|
|
"distdescription": "Fedora release 25 (Twenty Five)",
|
|
|
|
|
"release": ":core-4.1-amd64:core-4.1-noarch:cxx-4.1-amd64:cxx-4.1-noarch:desktop-4.1-amd64:desktop-4.1-noarch:languages-4.1-amd64:languages-4.1-noarch:printing-4.1-amd64:printing-4.1-noarch",
|
|
|
|
|
"distrelease": "25",
|
|
|
|
|
"majdistrelease": "25"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"processors": {
|
|
|
|
|
"models": [
|
|
|
|
|
"Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz"
|
|
|
|
|
],
|
|
|
|
|
"count": 8,
|
|
|
|
|
"physicalcount": 1
|
|
|
|
|
},
|
|
|
|
|
"architecture": "x86_64",
|
|
|
|
|
"hardwaremodel": "x86_64",
|
|
|
|
|
"operatingsystem": "Fedora",
|
|
|
|
|
"processor0": "Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"processor1": "Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"processor2": "Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"processor3": "Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"processor4": "Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"processor5": "Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"processor6": "Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"processor7": "Intel(R) Core(TM) i7-4800MQ CPU @ 2.70GHz",
|
|
|
|
|
"processorcount": 8,
|
|
|
|
|
"uptime_seconds": 1558090,
|
|
|
|
|
"fqdn": "myhostname.example.com",
|
|
|
|
|
"rubyversion": "2.3.3",
|
|
|
|
|
"gid": "testuser",
|
|
|
|
|
"physicalprocessorcount": 1,
|
|
|
|
|
"netmask": "255.255.0.0",
|
|
|
|
|
"uniqueid": "a8c01301",
|
|
|
|
|
"uptime_days": 18,
|
|
|
|
|
"interfaces": "docker0,em1,lo,vethf20ff12,virbr0,virbr1,virbr0_nic,virbr1_nic,wlp4s0",
|
|
|
|
|
"ipaddress_docker0": "172.17.0.1",
|
|
|
|
|
"macaddress_docker0": "02:42:ea:15:d8:84",
|
|
|
|
|
"netmask_docker0": "255.255.0.0",
|
|
|
|
|
"mtu_docker0": 1500,
|
|
|
|
|
"macaddress_em1": "3c:97:0e:e9:28:8e",
|
|
|
|
|
"mtu_em1": 1500,
|
|
|
|
|
"ipaddress_lo": "127.0.0.1",
|
|
|
|
|
"netmask_lo": "255.0.0.0",
|
|
|
|
|
"mtu_lo": 65536,
|
|
|
|
|
"macaddress_vethf20ff12": "ae:6e:2b:1e:a1:31",
|
|
|
|
|
"mtu_vethf20ff12": 1500,
|
|
|
|
|
"ipaddress_virbr0": "192.168.137.1",
|
|
|
|
|
"macaddress_virbr0": "52:54:00:ce:82:5e",
|
|
|
|
|
"netmask_virbr0": "255.255.255.0",
|
|
|
|
|
"mtu_virbr0": 1500,
|
|
|
|
|
"ipaddress_virbr1": "192.168.121.1",
|
|
|
|
|
"macaddress_virbr1": "52:54:00:b4:68:a9",
|
|
|
|
|
"netmask_virbr1": "255.255.255.0",
|
|
|
|
|
"mtu_virbr1": 1500,
|
|
|
|
|
"macaddress_virbr0_nic": "52:54:00:ce:82:5e",
|
|
|
|
|
"mtu_virbr0_nic": 1500,
|
|
|
|
|
"macaddress_virbr1_nic": "52:54:00:b4:68:a9",
|
|
|
|
|
"mtu_virbr1_nic": 1500,
|
|
|
|
|
"ipaddress_wlp4s0": "192.168.1.19",
|
|
|
|
|
"macaddress_wlp4s0": "5c:51:4f:e6:a8:e3",
|
|
|
|
|
"netmask_wlp4s0": "255.255.255.0",
|
|
|
|
|
"mtu_wlp4s0": 1500,
|
|
|
|
|
"virtual": "physical",
|
|
|
|
|
"is_virtual": false,
|
|
|
|
|
"partitions": {
|
|
|
|
|
"sda2": {
|
|
|
|
|
"size": "499091456"
|
|
|
|
|
},
|
|
|
|
|
"sda1": {
|
|
|
|
|
"uuid": "32caaec3-ef40-4691-a3b6-438c3f9bc1c0",
|
|
|
|
|
"size": "1024000",
|
|
|
|
|
"mount": "/boot"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"lsbdistcodename": "TwentyFive",
|
|
|
|
|
"lsbrelease": ":core-4.1-amd64:core-4.1-noarch:cxx-4.1-amd64:cxx-4.1-noarch:desktop-4.1-amd64:desktop-4.1-noarch:languages-4.1-amd64:languages-4.1-noarch:printing-4.1-amd64:printing-4.1-noarch", # noqa
|
|
|
|
|
"filesystems": "btrfs,ext2,ext3,ext4,xfs",
|
|
|
|
|
"system_uptime": {
|
|
|
|
|
"seconds": 1558090,
|
|
|
|
|
"hours": 432,
|
|
|
|
|
"days": 18,
|
|
|
|
|
"uptime": "18 days"
|
|
|
|
|
},
|
|
|
|
|
"ipaddress": "172.17.0.1",
|
|
|
|
|
"timezone": "EDT",
|
|
|
|
|
"ps": "ps -ef",
|
|
|
|
|
"rubyplatform": "x86_64-linux",
|
|
|
|
|
"rubysitedir": "/usr/local/share/ruby/site_ruby",
|
|
|
|
|
"uptime": "18 days",
|
|
|
|
|
"lsbdistrelease": "25",
|
|
|
|
|
"operatingsystemrelease": "25",
|
|
|
|
|
"facterversion": "2.4.3",
|
|
|
|
|
"kernelrelease": "4.9.14-200.fc25.x86_64",
|
|
|
|
|
"lsbdistdescription": "Fedora release 25 (Twenty Five)",
|
|
|
|
|
"network_docker0": "172.17.0.0",
|
|
|
|
|
"network_lo": "127.0.0.0",
|
|
|
|
|
"network_virbr0": "192.168.137.0",
|
|
|
|
|
"network_virbr1": "192.168.121.0",
|
|
|
|
|
"network_wlp4s0": "192.168.1.0",
|
|
|
|
|
"lsbdistid": "Fedora",
|
|
|
|
|
"selinux": true,
|
|
|
|
|
"selinux_enforced": false,
|
|
|
|
|
"selinux_policyversion": "30",
|
|
|
|
|
"selinux_current_mode": "permissive",
|
|
|
|
|
"selinux_config_mode": "permissive",
|
|
|
|
|
"selinux_config_policy": "targeted",
|
|
|
|
|
"hostname": "myhostname",
|
|
|
|
|
"osfamily": "RedHat",
|
|
|
|
|
"kernelmajversion": "4.9",
|
|
|
|
|
"blockdevice_sr0_size": 1073741312,
|
|
|
|
|
"blockdevice_sr0_vendor": "MATSHITA",
|
|
|
|
|
"blockdevice_sr0_model": "DVD-RAM UJ8E2",
|
|
|
|
|
"blockdevice_sda_size": 256060514304,
|
|
|
|
|
"blockdevice_sda_vendor": "ATA",
|
|
|
|
|
"blockdevice_sda_model": "SAMSUNG MZ7TD256",
|
|
|
|
|
"blockdevices": "sda,sr0",
|
|
|
|
|
"uptime_hours": 432,
|
|
|
|
|
"kernelversion": "4.9.14"
|
|
|
|
|
}
|
|
|
|
|
'''
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TestFacterCollector(BaseFactsTest):
|
|
|
|
|
__test__ = True
|
|
|
|
|
gather_subset = ['!all', 'facter']
|
|
|
|
|
valid_subsets = ['facter']
|
|
|
|
|
fact_namespace = 'ansible_facter'
|
|
|
|
|
collector_class = FacterFactCollector
|
|
|
|
|
|
|
|
|
|
def _mock_module(self):
|
|
|
|
|
mock_module = Mock()
|
|
|
|
|
mock_module.params = {'gather_subset': self.gather_subset,
|
|
|
|
|
'gather_timeout': 10,
|
|
|
|
|
'filter': '*'}
|
|
|
|
|
mock_module.get_bin_path = Mock(return_value='/not/actually/facter')
|
|
|
|
|
mock_module.run_command = Mock(return_value=(0, facter_json_output, ''))
|
|
|
|
|
return mock_module
|
|
|
|
|
|
|
|
|
|
@patch('ansible.module_utils.facts.other.facter.FacterFactCollector.get_facter_output')
|
|
|
|
|
def test_bogus_json(self, mock_get_facter_output):
|
|
|
|
|
module = self._mock_module()
|
|
|
|
|
|
|
|
|
|
# bogus json
|
|
|
|
|
mock_get_facter_output.return_value = '{'
|
|
|
|
|
|
|
|
|
|
fact_collector = self.collector_class()
|
|
|
|
|
facts_dict = fact_collector.collect(module=module)
|
|
|
|
|
|
|
|
|
|
self.assertIsInstance(facts_dict, dict)
|
|
|
|
|
self.assertEqual(facts_dict, {})
|
|
|
|
|
|
|
|
|
|
@patch('ansible.module_utils.facts.other.facter.FacterFactCollector.run_facter')
|
|
|
|
|
def test_facter_non_zero_return_code(self, mock_run_facter):
|
|
|
|
|
module = self._mock_module()
|
|
|
|
|
|
|
|
|
|
# bogus json
|
|
|
|
|
mock_run_facter.return_value = (1, '{}', '')
|
|
|
|
|
|
|
|
|
|
fact_collector = self.collector_class()
|
|
|
|
|
facts_dict = fact_collector.collect(module=module)
|
|
|
|
|
|
|
|
|
|
self.assertIsInstance(facts_dict, dict)
|
|
|
|
|
|
|
|
|
|
# This assumes no 'facter' entry at all is correct
|
|
|
|
|
self.assertNotIn('facter', facts_dict)
|
|
|
|
|
self.assertEqual(facts_dict, {})
|