|
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
# Copyright: (c) 2017 Ansible Project
|
|
|
|
|
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
|
|
|
|
|
|
|
|
|
from __future__ import absolute_import, division, print_function
|
|
|
|
|
__metaclass__ = type
|
|
|
|
|
|
|
|
|
|
from itertools import product
|
|
|
|
|
|
|
|
|
|
import pytest
|
|
|
|
|
|
|
|
|
|
# the module we are actually testing (sort of)
|
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 ansible.module_utils.facts.system.distribution import DistributionFactCollector
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# to generate the testcase data, you can use the script gen_distribution_version_testcase.py in hacking/tests
|
|
|
|
|
TESTSETS = [
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"centos",
|
|
|
|
|
"7.2.1511",
|
|
|
|
|
"Core"
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/redhat-release": "CentOS Linux release 7.2.1511 (Core) \n",
|
|
|
|
|
"/etc/os-release": (
|
|
|
|
|
"NAME=\"CentOS Linux\"\nVERSION=\"7 (Core)\"\nID=\"centos\"\nID_LIKE=\"rhel fedora\"\nVERSION_ID=\"7\"\n"
|
|
|
|
|
"PRETTY_NAME=\"CentOS Linux 7 (Core)\"\nANSI_COLOR=\"0;31\"\nCPE_NAME=\"cpe:/o:centos:centos:7\"\n"
|
|
|
|
|
"HOME_URL=\"https://www.centos.org/\"\nBUG_REPORT_URL=\"https://bugs.centos.org/\"\n\nCENTOS_MANTISBT_PROJECT=\"CentOS-7\"\n"
|
|
|
|
|
"CENTOS_MANTISBT_PROJECT_VERSION=\"7\"\nREDHAT_SUPPORT_PRODUCT=\"centos\"\nREDHAT_SUPPORT_PRODUCT_VERSION=\"7\"\n\n"
|
|
|
|
|
),
|
|
|
|
|
"/etc/system-release": "CentOS Linux release 7.2.1511 (Core) \n"
|
|
|
|
|
},
|
|
|
|
|
"name": "CentOS 7.2.1511",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Core",
|
|
|
|
|
"distribution": "CentOS",
|
|
|
|
|
"distribution_major_version": "7",
|
|
|
|
|
"os_family": "RedHat",
|
|
|
|
|
"distribution_version": "7.2.1511",
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "CentOS 6.7",
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"centos",
|
|
|
|
|
"6.7",
|
|
|
|
|
"Final"
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/redhat-release": "CentOS release 6.7 (Final)\n",
|
|
|
|
|
"/etc/lsb-release": (
|
|
|
|
|
"LSB_VERSION=base-4.0-amd64:base-4.0-noarch:core-4.0-amd64:core-4.0-noarch:graphics-4.0-amd64:graphics-4.0-noarch:"
|
|
|
|
|
"printing-4.0-amd64:printing-4.0-noarch\n"
|
|
|
|
|
),
|
|
|
|
|
"/etc/system-release": "CentOS release 6.7 (Final)\n"
|
|
|
|
|
},
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Final",
|
|
|
|
|
"distribution": "CentOS",
|
|
|
|
|
"distribution_major_version": "6",
|
|
|
|
|
"os_family": "RedHat",
|
|
|
|
|
"distribution_version": "6.7"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "RedHat 7.2",
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"redhat",
|
|
|
|
|
"7.2",
|
|
|
|
|
"Maipo"
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/redhat-release": "Red Hat Enterprise Linux Server release 7.2 (Maipo)\n",
|
|
|
|
|
"/etc/os-release": (
|
|
|
|
|
"NAME=\"Red Hat Enterprise Linux Server\"\nVERSION=\"7.2 (Maipo)\"\nID=\"rhel\"\nID_LIKE=\"fedora\"\nVERSION_ID=\"7.2\"\n"
|
|
|
|
|
"PRETTY_NAME=\"Red Hat Enterprise Linux Server 7.2 (Maipo)\"\nANSI_COLOR=\"0;31\"\n"
|
|
|
|
|
"CPE_NAME=\"cpe:/o:redhat:enterprise_linux:7.2:GA:server\"\nHOME_URL=\"https://www.redhat.com/\"\n"
|
|
|
|
|
"BUG_REPORT_URL=\"https://bugzilla.redhat.com/\"\n\nREDHAT_BUGZILLA_PRODUCT=\"Red Hat Enterprise Linux 7\"\n"
|
|
|
|
|
"REDHAT_BUGZILLA_PRODUCT_VERSION=7.2\nREDHAT_SUPPORT_PRODUCT=\"Red Hat Enterprise Linux\"\n"
|
|
|
|
|
"REDHAT_SUPPORT_PRODUCT_VERSION=\"7.2\"\n"
|
|
|
|
|
),
|
|
|
|
|
"/etc/system-release": "Red Hat Enterprise Linux Server release 7.2 (Maipo)\n"
|
|
|
|
|
},
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Maipo",
|
|
|
|
|
"distribution": "RedHat",
|
|
|
|
|
"distribution_major_version": "7",
|
|
|
|
|
"os_family": "RedHat",
|
|
|
|
|
"distribution_version": "7.2"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "RedHat 6.7",
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"redhat",
|
|
|
|
|
"6.7",
|
|
|
|
|
"Santiago"
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/redhat-release": "Red Hat Enterprise Linux Server release 6.7 (Santiago)\n",
|
|
|
|
|
"/etc/lsb-release": (
|
|
|
|
|
"LSB_VERSION=base-4.0-amd64:base-4.0-noarch:core-4.0-amd64:core-4.0-noarch:graphics-4.0-amd64:graphics-4.0-noarch:"
|
|
|
|
|
"printing-4.0-amd64:printing-4.0-noarch\n"
|
|
|
|
|
),
|
|
|
|
|
"/etc/system-release": "Red Hat Enterprise Linux Server release 6.7 (Santiago)\n"
|
|
|
|
|
},
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Santiago",
|
|
|
|
|
"distribution": "RedHat",
|
|
|
|
|
"distribution_major_version": "6",
|
|
|
|
|
"os_family": "RedHat",
|
|
|
|
|
"distribution_version": "6.7"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "Virtuozzo 7.3",
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"redhat",
|
|
|
|
|
"7.3",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/redhat-release": "Virtuozzo Linux release 7.3\n",
|
|
|
|
|
"/etc/os-release": (
|
|
|
|
|
"NAME=\"Virtuozzo\"\n"
|
|
|
|
|
"VERSION=\"7.0.3\"\n"
|
|
|
|
|
"ID=\"virtuozzo\"\n"
|
|
|
|
|
"ID_LIKE=\"rhel fedora\"\n"
|
|
|
|
|
"VERSION_ID=\"7\"\n"
|
|
|
|
|
"PRETTY_NAME=\"Virtuozzo release 7.0.3\"\n"
|
|
|
|
|
"ANSI_COLOR=\"0;31\"\n"
|
|
|
|
|
"CPE_NAME=\"cpe:/o:virtuozzoproject:vz:7\"\n"
|
|
|
|
|
"HOME_URL=\"http://www.virtuozzo.com\"\n"
|
|
|
|
|
"BUG_REPORT_URL=\"https://bugs.openvz.org/\"\n"
|
|
|
|
|
),
|
|
|
|
|
"/etc/system-release": "Virtuozzo release 7.0.3 (640)\n"
|
|
|
|
|
},
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "NA",
|
|
|
|
|
"distribution": "Virtuozzo",
|
|
|
|
|
"distribution_major_version": "7",
|
|
|
|
|
"os_family": "RedHat",
|
|
|
|
|
"distribution_version": "7.3"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "openSUSE Leap 42.1",
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/os-release": """
|
|
|
|
|
NAME="openSUSE Leap"
|
|
|
|
|
VERSION="42.1"
|
|
|
|
|
VERSION_ID="42.1"
|
|
|
|
|
PRETTY_NAME="openSUSE Leap 42.1 (x86_64)"
|
|
|
|
|
ID=opensuse
|
|
|
|
|
ANSI_COLOR="0;32"
|
|
|
|
|
CPE_NAME="cpe:/o:opensuse:opensuse:42.1"
|
|
|
|
|
BUG_REPORT_URL="https://bugs.opensuse.org"
|
|
|
|
|
HOME_URL="https://opensuse.org/"
|
|
|
|
|
ID_LIKE="suse"
|
|
|
|
|
""",
|
|
|
|
|
"/etc/SuSE-release": """
|
|
|
|
|
openSUSE 42.1 (x86_64)
|
|
|
|
|
VERSION = 42.1
|
|
|
|
|
CODENAME = Malachite
|
|
|
|
|
# /etc/SuSE-release is deprecated and will be removed in the future, use /etc/os-release instead
|
|
|
|
|
"""
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": ['SuSE', '42.1', 'x86_64'],
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution": "openSUSE Leap",
|
|
|
|
|
"distribution_major_version": "42",
|
|
|
|
|
"distribution_release": "1",
|
|
|
|
|
"os_family": "Suse",
|
|
|
|
|
"distribution_version": "42.1",
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'name': 'openSUSE 13.2',
|
|
|
|
|
'input': {
|
|
|
|
|
'/etc/SuSE-release': """openSUSE 13.2 (x86_64)
|
|
|
|
|
VERSION = 13.2
|
|
|
|
|
CODENAME = Harlequin
|
|
|
|
|
# /etc/SuSE-release is deprecated and will be removed in the future, use /etc/os-release instead
|
|
|
|
|
""",
|
|
|
|
|
'/etc/os-release': """NAME=openSUSE
|
|
|
|
|
VERSION="13.2 (Harlequin)"
|
|
|
|
|
VERSION_ID="13.2"
|
|
|
|
|
PRETTY_NAME="openSUSE 13.2 (Harlequin) (x86_64)"
|
|
|
|
|
ID=opensuse
|
|
|
|
|
ANSI_COLOR="0;32"
|
|
|
|
|
CPE_NAME="cpe:/o:opensuse:opensuse:13.2"
|
|
|
|
|
BUG_REPORT_URL="https://bugs.opensuse.org"
|
|
|
|
|
HOME_URL="https://opensuse.org/"
|
|
|
|
|
ID_LIKE="suse"
|
|
|
|
|
"""
|
|
|
|
|
},
|
|
|
|
|
'platform.dist': ('SuSE', '13.2', 'x86_64'),
|
|
|
|
|
'result': {
|
|
|
|
|
'distribution': u'openSUSE',
|
|
|
|
|
'distribution_major_version': u'13',
|
|
|
|
|
'distribution_release': u'2',
|
|
|
|
|
'os_family': u'Suse',
|
|
|
|
|
'distribution_version': u'13.2'
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/os-release": (
|
|
|
|
|
"NAME=\"openSUSE Tumbleweed\"\n# VERSION=\"20160917\"\nID=opensuse\nID_LIKE=\"suse\"\nVERSION_ID=\"20160917\"\n"
|
|
|
|
|
"PRETTY_NAME=\"openSUSE Tumbleweed\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:opensuse:tumbleweed:20160917\"\n"
|
|
|
|
|
"BUG_REPORT_URL=\"https://bugs.opensuse.org\"\nHOME_URL=\"https://www.opensuse.org/\"\n"
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
"name": "openSUSE Tumbleweed 20160917",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "",
|
|
|
|
|
"distribution": "openSUSE Tumbleweed",
|
|
|
|
|
"distribution_major_version": "20160917",
|
|
|
|
|
"os_family": "Suse",
|
|
|
|
|
"distribution_version": "20160917"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/os-release": (
|
|
|
|
|
"NAME=\"openSUSE Leap\"\n# VERSION=\"15.0\"\nID=opensuse-leap\nID_LIKE=\"suse opensuse\"\nVERSION_ID=\"15.0\"\n"
|
|
|
|
|
"PRETTY_NAME=\"openSUSE Leap 15.0\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:opensuse:leap:15.0\"\n"
|
|
|
|
|
"BUG_REPORT_URL=\"https://bugs.opensuse.org\"\nHOME_URL=\"https://www.opensuse.org/\"\n"
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
"name": "openSUSE Leap 15.0",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "0",
|
|
|
|
|
"distribution": "openSUSE Leap",
|
|
|
|
|
"distribution_major_version": "15",
|
|
|
|
|
"os_family": "Suse",
|
|
|
|
|
"distribution_version": "15.0"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ # see https://github.com/ansible/ansible/issues/14837
|
|
|
|
|
"name": "SLES 11.3",
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/SuSE-release": """
|
|
|
|
|
SUSE Linux Enterprise Server 11 (x86_64)
|
|
|
|
|
VERSION = 11
|
|
|
|
|
PATCHLEVEL = 3
|
|
|
|
|
"""
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": ['SuSE', '11', 'x86_64'],
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution": "SLES",
|
|
|
|
|
"distribution_major_version": "11",
|
|
|
|
|
"distribution_release": "3",
|
|
|
|
|
"os_family": "Suse",
|
|
|
|
|
"distribution_version": "11.3",
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ # see https://github.com/ansible/ansible/issues/14837
|
|
|
|
|
"name": "SLES 11.4",
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/SuSE-release": """
|
|
|
|
|
SUSE Linux Enterprise Server 11 (x86_64)
|
|
|
|
|
VERSION = 11
|
|
|
|
|
PATCHLEVEL = 4
|
|
|
|
|
""",
|
|
|
|
|
"/etc/os-release": """
|
|
|
|
|
NAME="SLES"
|
|
|
|
|
VERSION="11.4"
|
|
|
|
|
VERSION_ID="11.4"
|
|
|
|
|
PRETTY_NAME="SUSE Linux Enterprise Server 11 SP4"
|
|
|
|
|
ID="sles"
|
|
|
|
|
ANSI_COLOR="0;32"
|
|
|
|
|
CPE_NAME="cpe:/o:suse:sles:11:4"
|
|
|
|
|
""",
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": ['SuSE', '11', 'x86_64'],
|
|
|
|
|
"result":{
|
|
|
|
|
"distribution": "SLES",
|
|
|
|
|
"distribution_major_version": "11",
|
|
|
|
|
"distribution_release": "4",
|
|
|
|
|
"os_family": "Suse",
|
|
|
|
|
"distribution_version": "11.4",
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ # see https://github.com/ansible/ansible/issues/14837
|
|
|
|
|
"name": "SLES 12 SP0",
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/SuSE-release": """
|
|
|
|
|
SUSE Linux Enterprise Server 12 (x86_64)
|
|
|
|
|
VERSION = 12
|
|
|
|
|
PATCHLEVEL = 0
|
|
|
|
|
# This file is deprecated and will be removed in a future service pack or release.
|
|
|
|
|
# Please check /etc/os-release for details about this release.
|
|
|
|
|
""",
|
|
|
|
|
"/etc/os-release": """
|
|
|
|
|
NAME="SLES"
|
|
|
|
|
VERSION="12"
|
|
|
|
|
VERSION_ID="12"
|
|
|
|
|
PRETTY_NAME="SUSE Linux Enterprise Server 12"
|
|
|
|
|
ID="sles"
|
|
|
|
|
ANSI_COLOR="0;32"
|
|
|
|
|
CPE_NAME="cpe:/o:suse:sles:12"
|
|
|
|
|
""",
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": ['SuSE', '12', 'x86_64'],
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution": "SLES",
|
|
|
|
|
"distribution_major_version": "12",
|
|
|
|
|
"distribution_release": "0",
|
|
|
|
|
"os_family": "Suse",
|
|
|
|
|
"distribution_version": "12",
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ # see https://github.com/ansible/ansible/issues/14837
|
|
|
|
|
"name": "SLES 12 SP1",
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/SuSE-release": """
|
|
|
|
|
SUSE Linux Enterprise Server 12 (x86_64)
|
|
|
|
|
VERSION = 12
|
|
|
|
|
PATCHLEVEL = 0
|
|
|
|
|
# This file is deprecated and will be removed in a future service pack or release.
|
|
|
|
|
# Please check /etc/os-release for details about this release.
|
|
|
|
|
""",
|
|
|
|
|
"/etc/os-release": """
|
|
|
|
|
NAME="SLES"
|
|
|
|
|
VERSION="12-SP1"
|
|
|
|
|
VERSION_ID="12.1"
|
|
|
|
|
PRETTY_NAME="SUSE Linux Enterprise Server 12 SP1"
|
|
|
|
|
ID="sles"
|
|
|
|
|
ANSI_COLOR="0;32"
|
|
|
|
|
CPE_NAME="cpe:/o:suse:sles:12:sp1"
|
|
|
|
|
""",
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": ['SuSE', '12', 'x86_64'],
|
|
|
|
|
"result":{
|
|
|
|
|
"distribution": "SLES",
|
|
|
|
|
"distribution_major_version": "12",
|
|
|
|
|
"distribution_release": "1",
|
|
|
|
|
"os_family": "Suse",
|
|
|
|
|
"distribution_version": "12.1",
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
"name": "Debian stretch/sid",
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/os-release": """
|
|
|
|
|
PRETTY_NAME="Debian GNU/Linux stretch/sid"
|
|
|
|
|
NAME="Debian GNU/Linux"
|
|
|
|
|
ID=debian
|
|
|
|
|
HOME_URL="https://www.debian.org/"
|
|
|
|
|
SUPPORT_URL="https://www.debian.org/support"
|
|
|
|
|
BUG_REPORT_URL="https://bugs.debian.org/"
|
|
|
|
|
""",
|
|
|
|
|
"/etc/debian_version": """
|
|
|
|
|
stretch/sid
|
|
|
|
|
""",
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": ('debian', 'stretch/sid', ''),
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution": "Debian",
|
|
|
|
|
"distribution_major_version": "stretch/sid",
|
|
|
|
|
"distribution_release": "NA",
|
|
|
|
|
"os_family": "Debian",
|
|
|
|
|
"distribution_version": "stretch/sid",
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'name': "Debian 7.9",
|
|
|
|
|
'input': {
|
|
|
|
|
'/etc/os-release': """PRETTY_NAME="Debian GNU/Linux 7 (wheezy)"
|
|
|
|
|
NAME="Debian GNU/Linux"
|
|
|
|
|
VERSION_ID="7"
|
|
|
|
|
VERSION="7 (wheezy)"
|
|
|
|
|
ID=debian
|
|
|
|
|
ANSI_COLOR="1;31"
|
|
|
|
|
HOME_URL="http://www.debian.org/"
|
|
|
|
|
SUPPORT_URL="http://www.debian.org/support/"
|
|
|
|
|
BUG_REPORT_URL="http://bugs.debian.org/"
|
|
|
|
|
"""
|
|
|
|
|
},
|
|
|
|
|
'platform.dist': ('debian', '7.9', ''),
|
|
|
|
|
'result': {
|
|
|
|
|
'distribution': u'Debian',
|
|
|
|
|
'distribution_major_version': u'7',
|
|
|
|
|
'distribution_release': u'wheezy',
|
|
|
|
|
"os_family": "Debian",
|
|
|
|
|
'distribution_version': u'7.9'
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'name': "SteamOS 2.0",
|
|
|
|
|
'input': {
|
|
|
|
|
'/etc/os-release': """PRETTY_NAME="SteamOS GNU/Linux 2.0 (brewmaster)"
|
|
|
|
|
NAME="SteamOS GNU/Linux"
|
|
|
|
|
VERSION_ID="2"
|
|
|
|
|
VERSION="2 (brewmaster)"
|
|
|
|
|
ID=steamos
|
|
|
|
|
ID_LIKE=debian
|
|
|
|
|
HOME_URL="http://www.steampowered.com/"
|
|
|
|
|
SUPPORT_URL="http://support.steampowered.com/"
|
|
|
|
|
BUG_REPORT_URL="http://support.steampowered.com/"
|
|
|
|
|
""",
|
|
|
|
|
'/etc/lsb-release': """DISTRIB_ID=SteamOS
|
|
|
|
|
DISTRIB_RELEASE=2.0
|
|
|
|
|
DISTRIB_CODENAME=brewmaster
|
|
|
|
|
DISTRIB_DESCRIPTION="SteamOS 2.0"
|
|
|
|
|
"""
|
|
|
|
|
},
|
|
|
|
|
'platform.dist': ('Steamos', '2.0', 'brewmaster'),
|
|
|
|
|
'result': {
|
|
|
|
|
'distribution': u'SteamOS',
|
|
|
|
|
'distribution_major_version': u'2',
|
|
|
|
|
'distribution_release': u'brewmaster',
|
|
|
|
|
"os_family": "Debian",
|
|
|
|
|
'distribution_version': u'2.0'
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'name': "Devuan",
|
|
|
|
|
'input': {
|
|
|
|
|
'/etc/os-release': """PRETTY_NAME="Devuan GNU/Linux 1 (jessie)"
|
|
|
|
|
NAME="Devuan GNU/Linux"
|
|
|
|
|
VERSION_ID="1"
|
|
|
|
|
VERSION="1 (jessie)"
|
|
|
|
|
ID=devuan
|
|
|
|
|
HOME_URL="http://www.devuan.org/"
|
|
|
|
|
SUPPORT_URL="http://www.devuan.org/support/"
|
|
|
|
|
BUG_REPORT_URL="https://bugs.devuan.org/"
|
|
|
|
|
"""
|
|
|
|
|
},
|
|
|
|
|
'platform.dist': ('', '', ''),
|
|
|
|
|
'result': {
|
|
|
|
|
'distribution': u'Devuan',
|
|
|
|
|
'distribution_major_version': u'1',
|
|
|
|
|
'distribution_release': u'jessie',
|
|
|
|
|
'os_family': 'Debian',
|
|
|
|
|
'distribution_version': u'1'
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"Ubuntu",
|
|
|
|
|
"16.04",
|
|
|
|
|
"xenial"
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/os-release": (
|
|
|
|
|
"NAME=\"Ubuntu\"\nVERSION=\"16.04 LTS (Xenial Xerus)\"\nID=ubuntu\nID_LIKE=debian\nPRETTY_NAME=\"Ubuntu 16.04 LTS\"\n"
|
|
|
|
|
"VERSION_ID=\"16.04\"\nHOME_URL=\"http://www.ubuntu.com/\"\nSUPPORT_URL=\"http://help.ubuntu.com/\"\n"
|
|
|
|
|
"BUG_REPORT_URL=\"http://bugs.launchpad.net/ubuntu/\"\nUBUNTU_CODENAME=xenial\n"
|
|
|
|
|
),
|
|
|
|
|
"/etc/lsb-release": "DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=16.04\nDISTRIB_CODENAME=xenial\nDISTRIB_DESCRIPTION=\"Ubuntu 16.04 LTS\"\n"
|
|
|
|
|
},
|
|
|
|
|
"name": "Ubuntu 16.04",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "xenial",
|
|
|
|
|
"distribution": "Ubuntu",
|
|
|
|
|
"distribution_major_version": "16",
|
|
|
|
|
"os_family": "Debian",
|
|
|
|
|
"distribution_version": "16.04"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'name': "Ubuntu 10.04 guess",
|
|
|
|
|
'input':
|
|
|
|
|
{
|
|
|
|
|
'/etc/lsb-release': """DISTRIB_ID=Ubuntu
|
|
|
|
|
DISTRIB_RELEASE=10.04
|
|
|
|
|
DISTRIB_CODENAME=lucid
|
|
|
|
|
DISTRIB_DESCRIPTION="Ubuntu 10.04.4 LTS
|
|
|
|
|
"""
|
|
|
|
|
},
|
|
|
|
|
'platform.dist': ('Ubuntu', '10.04', 'lucid'),
|
|
|
|
|
'result':
|
|
|
|
|
{
|
|
|
|
|
'distribution': u'Ubuntu',
|
|
|
|
|
'distribution_major_version': u'10',
|
|
|
|
|
'distribution_release': u'lucid',
|
|
|
|
|
"os_family": "Debian",
|
|
|
|
|
'distribution_version': u'10.04'
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'name': "Ubuntu 14.04",
|
|
|
|
|
'input': {
|
|
|
|
|
'/etc/lsb-release': """DISTRIB_ID=Ubuntu
|
|
|
|
|
DISTRIB_RELEASE=14.04
|
|
|
|
|
DISTRIB_CODENAME=trusty
|
|
|
|
|
DISTRIB_DESCRIPTION="Ubuntu 14.04.4 LTS"
|
|
|
|
|
""",
|
|
|
|
|
'/etc/os-release': """NAME="Ubuntu"
|
|
|
|
|
VERSION="14.04.4 LTS, Trusty Tahr"
|
|
|
|
|
ID=ubuntu
|
|
|
|
|
ID_LIKE=debian
|
|
|
|
|
PRETTY_NAME="Ubuntu 14.04.4 LTS"
|
|
|
|
|
VERSION_ID="14.04"
|
|
|
|
|
HOME_URL="http://www.ubuntu.com/"
|
|
|
|
|
SUPPORT_URL="http://help.ubuntu.com/"
|
|
|
|
|
BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"
|
|
|
|
|
"""
|
|
|
|
|
},
|
|
|
|
|
'platform.dist': ('Ubuntu', '14.04', 'trusty'),
|
|
|
|
|
'result': {
|
|
|
|
|
'distribution': u'Ubuntu',
|
|
|
|
|
'distribution_major_version': u'14',
|
|
|
|
|
'distribution_release': u'trusty',
|
|
|
|
|
"os_family": "Debian",
|
|
|
|
|
'distribution_version': u'14.04'
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'name': "Ubuntu 12.04",
|
|
|
|
|
'input': {'/etc/lsb-release': """DISTRIB_ID=Ubuntu
|
|
|
|
|
DISTRIB_RELEASE=12.04
|
|
|
|
|
DISTRIB_CODENAME=precise
|
|
|
|
|
DISTRIB_DESCRIPTION="Ubuntu 12.04.5 LTS"
|
|
|
|
|
""",
|
|
|
|
|
'/etc/os-release': """NAME="Ubuntu"
|
|
|
|
|
VERSION="12.04.5 LTS, Precise Pangolin"
|
|
|
|
|
ID=ubuntu
|
|
|
|
|
ID_LIKE=debian
|
|
|
|
|
PRETTY_NAME="Ubuntu precise (12.04.5 LTS)"
|
|
|
|
|
VERSION_ID="12.04"
|
|
|
|
|
"""},
|
|
|
|
|
'platform.dist': ('Ubuntu', '12.04', 'precise'),
|
|
|
|
|
'result': {'distribution': u'Ubuntu',
|
|
|
|
|
'distribution_major_version': u'12',
|
|
|
|
|
'distribution_release': u'precise',
|
|
|
|
|
"os_family": "Debian",
|
|
|
|
|
'distribution_version': u'12.04'}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"neon",
|
|
|
|
|
"16.04",
|
|
|
|
|
"xenial"
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/os-release": ("NAME=\"KDE neon\"\nVERSION=\"5.8\"\nID=neon\nID_LIKE=\"ubuntu debian\"\nPRETTY_NAME=\"KDE neon User Edition 5.8\"\n"
|
|
|
|
|
"VERSION_ID=\"16.04\"\nHOME_URL=\"http://neon.kde.org/\"\nSUPPORT_URL=\"http://neon.kde.org/\"\n"
|
|
|
|
|
"BUG_REPORT_URL=\"http://bugs.kde.org/\"\nVERSION_CODENAME=xenial\nUBUNTU_CODENAME=xenial\n"),
|
|
|
|
|
"/etc/lsb-release": "DISTRIB_ID=neon\nDISTRIB_RELEASE=16.04\nDISTRIB_CODENAME=xenial\nDISTRIB_DESCRIPTION=\"KDE neon User Edition 5.8\"\n"
|
|
|
|
|
},
|
|
|
|
|
"name": "KDE neon 16.04",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "xenial",
|
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
|
|
|
"distribution": "KDE neon",
|
|
|
|
|
"distribution_major_version": "16",
|
|
|
|
|
"os_family": "Debian",
|
|
|
|
|
"distribution_version": "16.04"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'name': 'Core OS',
|
|
|
|
|
'input': {
|
|
|
|
|
'/etc/os-release': """
|
|
|
|
|
NAME=CoreOS
|
|
|
|
|
ID=coreos
|
|
|
|
|
VERSION=976.0.0
|
|
|
|
|
VERSION_ID=976.0.0
|
|
|
|
|
BUILD_ID=2016-03-03-2324
|
|
|
|
|
PRETTY_NAME="CoreOS 976.0.0 (Coeur Rouge)"
|
|
|
|
|
ANSI_COLOR="1;32"
|
|
|
|
|
HOME_URL="https://coreos.com/"
|
|
|
|
|
BUG_REPORT_URL="https://github.com/coreos/bugs/issues"
|
|
|
|
|
""",
|
|
|
|
|
'/etc/lsb-release': """DISTRIB_ID=CoreOS
|
|
|
|
|
DISTRIB_RELEASE=976.0.0
|
|
|
|
|
DISTRIB_CODENAME="Coeur Rouge"
|
|
|
|
|
DISTRIB_DESCRIPTION="CoreOS 976.0.0 (Coeur Rouge)"
|
|
|
|
|
""",
|
|
|
|
|
},
|
|
|
|
|
'platform.dist': ('', '', ''),
|
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
|
|
|
'platform.release': '',
|
|
|
|
|
'result': {
|
|
|
|
|
"distribution": "CoreOS",
|
|
|
|
|
"distribution_major_version": "NA",
|
|
|
|
|
"distribution_release": "NA",
|
|
|
|
|
"distribution_version": "976.0.0",
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
# Solaris and derivatives: https://gist.github.com/natefoo/7af6f3d47bb008669467
|
|
|
|
|
{
|
|
|
|
|
"name": "SmartOS Global Zone",
|
|
|
|
|
"uname_v": "joyent_20160330T234717Z",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "SmartOS 20160330T234717Z x86_64",
|
|
|
|
|
"distribution": "SmartOS",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "joyent_20160330T234717Z"
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (" SmartOS 20160330T234717Z x86_64\n"
|
|
|
|
|
" Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.\n"
|
|
|
|
|
" Copyright 2010-2012 Joyent, Inc. All Rights Reserved.\n"
|
|
|
|
|
" Use is subject to license terms.\n\n"
|
|
|
|
|
" Built with the following components:\n\n[\n"
|
|
|
|
|
" { \"repo\": \"smartos-live\", \"branch\": \"release-20160331\", \"rev\": \"a77c410f2afe6dc9853a915733caec3609cc50f1\", "
|
|
|
|
|
"\"commit_date\": \"1459340323\", \"url\": \"git@github.com:joyent/smartos-live.git\" }\n , "
|
|
|
|
|
"{ \"repo\": \"illumos-joyent\", \"branch\": \"release-20160331\", \"rev\": \"ab664c06caf06e9ce7586bff956e7709df1e702e\", "
|
|
|
|
|
"\"commit_date\": \"1459362533\", \"url\": \"/root/data/jenkins/workspace/smartos/MG/build/illumos-joyent\" }\n"
|
|
|
|
|
" , { \"repo\": \"illumos-extra\", \"branch\": \"release-20160331\", "
|
|
|
|
|
"\"rev\": \"cc723855bceace3df7860b607c9e3827d47e0ff4\", \"commit_date\": \"1458153188\", "
|
|
|
|
|
"\"url\": \"/root/data/jenkins/workspace/smartos/MG/build/illumos-extra\" }\n , "
|
|
|
|
|
"{ \"repo\": \"kvm\", \"branch\": \"release-20160331\", \"rev\": \"a8befd521c7e673749c64f118585814009fe4b73\", "
|
|
|
|
|
"\"commit_date\": \"1450081968\", \"url\": \"/root/data/jenkins/workspace/smartos/MG/build/illumos-kvm\" }\n , "
|
|
|
|
|
"{ \"repo\": \"kvm-cmd\", \"branch\": \"release-20160331\", \"rev\": \"c1a197c8e4582c68739ab08f7e3198b2392c9820\", "
|
|
|
|
|
"\"commit_date\": \"1454723558\", \"url\": \"/root/data/jenkins/workspace/smartos/MG/build/illumos-kvm-cmd\" }\n , "
|
|
|
|
|
"{ \"repo\": \"mdata-client\", \"branch\": \"release-20160331\", \"rev\": \"58158c44603a3316928975deccc5d10864832770\", "
|
|
|
|
|
"\"commit_date\": \"1429917227\", \"url\": \"/root/data/jenkins/workspace/smartos/MG/build/mdata-client\" }\n]\n")
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "SmartOS Zone",
|
|
|
|
|
"uname_v": "joyent_20160330T234717Z",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "SmartOS x86_64",
|
|
|
|
|
"distribution": "SmartOS",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "14.3.0"
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (" SmartOS x86_64\n Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.\n"
|
|
|
|
|
" Copyright 2010-2013 Joyent, Inc. All Rights Reserved.\n Use is subject to license terms.\n"
|
|
|
|
|
" See joyent_20141002T182809Z for assembly date and time.\n"),
|
|
|
|
|
"/etc/product": "Name: Joyent Instance\nImage: base64 14.3.0\nDocumentation: http://wiki.joyent.com/jpc2/Base+Instance\n"
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "OpenIndiana",
|
|
|
|
|
"uname_v": "oi_151a9",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "OpenIndiana Development oi_151.1.9 X86 (powered by illumos)",
|
|
|
|
|
"distribution": "OpenIndiana",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "oi_151a9"
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (" OpenIndiana Development oi_151.1.9 X86 (powered by illumos)\n Copyright 2011 Oracle and/or its affiliates. "
|
|
|
|
|
"All rights reserved.\n Use is subject to license terms.\n "
|
|
|
|
|
"Assembled 17 January 2014\n")
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "OmniOS",
|
|
|
|
|
"uname_v": "omnios-10b9c79",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "OmniOS v11 r151012",
|
|
|
|
|
"distribution": "OmniOS",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "r151012"
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
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
|
|
|
# "platform.release": 'OmniOS',
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (
|
|
|
|
|
" OmniOS v11 r151012\n Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved.\n Use is subject to license terms.\n\n"
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "Nexenta 3",
|
|
|
|
|
"uname_v": "NexentaOS_134f",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Open Storage Appliance v3.1.6",
|
|
|
|
|
"distribution": "Nexenta",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "3.1.6"
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
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
|
|
|
"platform.release:": "",
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (" Open Storage Appliance v3.1.6\n Copyright (c) 2014 Nexenta Systems, Inc. "
|
|
|
|
|
"All Rights Reserved.\n Copyright (c) 2011 Oracle. All Rights Reserved.\n "
|
|
|
|
|
"Use is subject to license terms.\n")
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "Nexenta 4",
|
|
|
|
|
"uname_v": "NexentaOS_4:cd604cd066",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Open Storage Appliance 4.0.3-FP2",
|
|
|
|
|
"distribution": "Nexenta",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "4.0.3-FP2"
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (" Open Storage Appliance 4.0.3-FP2\n Copyright (c) 2014 Nexenta Systems, Inc. "
|
|
|
|
|
"All Rights Reserved.\n Copyright (c) 2010 Oracle. All Rights Reserved.\n "
|
|
|
|
|
"Use is subject to license terms.\n")
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "Solaris 10",
|
|
|
|
|
"uname_v": "Generic_141445-09",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Solaris 10 10/09 s10x_u8wos_08a X86",
|
|
|
|
|
"distribution": "Solaris",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "10"
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (" Solaris 10 10/09 s10x_u8wos_08a X86\n Copyright 2009 Sun Microsystems, Inc. "
|
|
|
|
|
"All Rights Reserved.\n Use is subject to license terms.\n "
|
|
|
|
|
"Assembled 16 September 2009\n")
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "Solaris 11",
|
|
|
|
|
"uname_v": "11.0",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Oracle Solaris 11 11/11 X86",
|
|
|
|
|
"distribution": "Solaris",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "11"
|
|
|
|
|
},
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (" Oracle Solaris 11 11/11 X86\n Copyright (c) 1983, 2011, Oracle and/or its affiliates. "
|
|
|
|
|
"All rights reserved.\n Assembled 18 October 2011\n")
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS"
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "Solaris 11.3",
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (
|
|
|
|
|
" Oracle Solaris 11.3 X86\n Copyright (c) 1983, 2015, Oracle and/or its affiliates. "
|
|
|
|
|
"All rights reserved.\n Assembled 06 October 2015\n"
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Oracle Solaris 11.3 X86",
|
|
|
|
|
"distribution": "Solaris",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "11.3"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "Solaris 10",
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/release": (" Oracle Solaris 10 1/13 s10x_u11wos_24a X86\n Copyright (c) 1983, 2013, Oracle and/or its affiliates. "
|
|
|
|
|
"All rights reserved.\n Assembled 17 January 2013\n")
|
|
|
|
|
},
|
|
|
|
|
"platform.system": "SunOS",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Oracle Solaris 10 1/13 s10x_u11wos_24a X86",
|
|
|
|
|
"distribution": "Solaris",
|
|
|
|
|
"os_family": "Solaris",
|
|
|
|
|
"distribution_version": "10"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"name": "Fedora 22",
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"fedora",
|
|
|
|
|
"22",
|
|
|
|
|
"Twenty Two"
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/redhat-release": "Fedora release 22 (Twenty Two)\n",
|
|
|
|
|
"/etc/os-release": (
|
|
|
|
|
"NAME=Fedora\nVERSION=\"22 (Twenty Two)\"\nID=fedora\nVERSION_ID=22\nPRETTY_NAME=\"Fedora 22 (Twenty Two)\"\n"
|
|
|
|
|
"ANSI_COLOR=\"0;34\"\nCPE_NAME=\"cpe:/o:fedoraproject:fedora:22\"\nHOME_URL=\"https://fedoraproject.org/\"\n"
|
|
|
|
|
"BUG_REPORT_URL=\"https://bugzilla.redhat.com/\"\nREDHAT_BUGZILLA_PRODUCT=\"Fedora\"\nREDHAT_BUGZILLA_PRODUCT_VERSION=22\n"
|
|
|
|
|
"REDHAT_SUPPORT_PRODUCT=\"Fedora\"\nREDHAT_SUPPORT_PRODUCT_VERSION=22\n"
|
|
|
|
|
"PRIVACY_POLICY_URL=https://fedoraproject.org/wiki/Legal:PrivacyPolicy\n"
|
|
|
|
|
),
|
|
|
|
|
"/etc/system-release": "Fedora release 22 (Twenty Two)\n"
|
|
|
|
|
},
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Twenty Two",
|
|
|
|
|
"distribution": "Fedora",
|
|
|
|
|
"distribution_major_version": "22",
|
|
|
|
|
"os_family": "RedHat",
|
|
|
|
|
"distribution_version": "22"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"fedora",
|
|
|
|
|
"25",
|
|
|
|
|
"Rawhide"
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/redhat-release": "Fedora release 25 (Rawhide)\n",
|
|
|
|
|
"/etc/os-release": (
|
|
|
|
|
"NAME=Fedora\nVERSION=\"25 (Workstation Edition)\"\nID=fedora\nVERSION_ID=25\n"
|
|
|
|
|
"PRETTY_NAME=\"Fedora 25 (Workstation Edition)\"\nANSI_COLOR=\"0;34\"\nCPE_NAME=\"cpe:/o:fedoraproject:fedora:25\"\n"
|
|
|
|
|
"HOME_URL=\"https://fedoraproject.org/\"\nBUG_REPORT_URL=\"https://bugzilla.redhat.com/\"\n"
|
|
|
|
|
"REDHAT_BUGZILLA_PRODUCT=\"Fedora\"\nREDHAT_BUGZILLA_PRODUCT_VERSION=rawhide\nREDHAT_SUPPORT_PRODUCT=\"Fedora\"\n"
|
|
|
|
|
"REDHAT_SUPPORT_PRODUCT_VERSION=rawhide\nPRIVACY_POLICY_URL=https://fedoraproject.org/wiki/Legal:PrivacyPolicy\n"
|
|
|
|
|
"VARIANT=\"Workstation Edition\"\nVARIANT_ID=workstation\n"
|
|
|
|
|
),
|
|
|
|
|
"/etc/system-release": "Fedora release 25 (Rawhide)\n"
|
|
|
|
|
},
|
|
|
|
|
"name": "Fedora 25",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "Rawhide",
|
|
|
|
|
"distribution": "Fedora",
|
|
|
|
|
"distribution_major_version": "25",
|
|
|
|
|
"os_family": "RedHat",
|
|
|
|
|
"distribution_version": "25"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/sourcemage-release": ("Source Mage GNU/Linux x86_64-pc-linux-gnu\nInstalled from tarball using chroot image (Grimoire 0.61-rc) "
|
|
|
|
|
"on Thu May 17 17:31:37 UTC 2012\n")
|
|
|
|
|
},
|
|
|
|
|
"name": "SMGL NA",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "NA",
|
|
|
|
|
"distribution": "SMGL",
|
|
|
|
|
"distribution_major_version": "NA",
|
|
|
|
|
"os_family": "SMGL",
|
|
|
|
|
"distribution_version": "NA"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
# ArchLinux with an empty /etc/arch-release and a /etc/os-release with "NAME=Arch Linux"
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/os-release": "NAME=\"Arch Linux\"\nPRETTY_NAME=\"Arch Linux\"\nID=arch\nID_LIKE=archlinux\nANSI_COLOR=\"0;36\"\nHOME_URL=\"https://www.archlinux.org/\"\nSUPPORT_URL=\"https://bbs.archlinux.org/\"\nBUG_REPORT_URL=\"https://bugs.archlinux.org/\"\n\n", # noqa
|
|
|
|
|
"/etc/arch-release": "",
|
|
|
|
|
},
|
|
|
|
|
"name": "Arch Linux NA",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "NA",
|
|
|
|
|
"distribution": "Archlinux",
|
|
|
|
|
"distribution_major_version": "NA",
|
|
|
|
|
"os_family": "Archlinux",
|
|
|
|
|
"distribution_version": "NA"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
# ClearLinux https://github.com/ansible/ansible/issues/31501#issuecomment-340861535
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"Clear Linux OS for Intel Architecture",
|
|
|
|
|
"18450",
|
|
|
|
|
"clear-linux-os"
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/usr/lib/os-release": '''
|
|
|
|
|
NAME="Clear Linux OS for Intel Architecture"
|
|
|
|
|
VERSION=1
|
|
|
|
|
ID=clear-linux-os
|
|
|
|
|
VERSION_ID=18450
|
|
|
|
|
PRETTY_NAME="Clear Linux OS for Intel Architecture"
|
|
|
|
|
ANSI_COLOR="1;35"
|
|
|
|
|
HOME_URL="https://clearlinux.org"
|
|
|
|
|
SUPPORT_URL="https://clearlinux.org"
|
|
|
|
|
BUG_REPORT_URL="mailto:dev@lists.clearlinux.org"
|
|
|
|
|
PRIVACY_POLICY_URL="http://www.intel.com/privacy"
|
|
|
|
|
'''
|
|
|
|
|
},
|
|
|
|
|
"name": "Clear Linux OS for Intel Architecture 1",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "clear-linux-os",
|
|
|
|
|
"distribution": "ClearLinux",
|
|
|
|
|
"distribution_major_version": "18450",
|
|
|
|
|
"os_family": "ClearLinux",
|
|
|
|
|
"distribution_version": "18450"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
# ArchLinux with no /etc/arch-release but with a /etc/os-release with NAME=Arch Linux
|
|
|
|
|
# The fact needs to map 'Arch Linux' to 'Archlinux' for compat with 2.3 and earlier facts
|
|
|
|
|
{
|
|
|
|
|
"platform.dist": [
|
|
|
|
|
"",
|
|
|
|
|
"",
|
|
|
|
|
""
|
|
|
|
|
],
|
|
|
|
|
"input": {
|
|
|
|
|
"/etc/os-release": "NAME=\"Arch Linux\"\nPRETTY_NAME=\"Arch Linux\"\nID=arch\nID_LIKE=archlinux\nANSI_COLOR=\"0;36\"\nHOME_URL=\"https://www.archlinux.org/\"\nSUPPORT_URL=\"https://bbs.archlinux.org/\"\nBUG_REPORT_URL=\"https://bugs.archlinux.org/\"\n\n", # noqa
|
|
|
|
|
},
|
|
|
|
|
"name": "Arch Linux no arch-release NA",
|
|
|
|
|
"result": {
|
|
|
|
|
"distribution_release": "NA",
|
|
|
|
|
"distribution": "Archlinux",
|
|
|
|
|
"distribution_major_version": "NA",
|
|
|
|
|
"os_family": "Archlinux",
|
|
|
|
|
"distribution_version": "NA"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize("stdin, testcase", product([{}], TESTSETS), ids=lambda x: x.get('name'), indirect=['stdin'])
|
|
|
|
|
def test_distribution_version(am, mocker, testcase):
|
|
|
|
|
"""tests the distribution parsing code of the Facts class
|
|
|
|
|
|
|
|
|
|
testsets have
|
|
|
|
|
* a name (for output/debugging only)
|
|
|
|
|
* input files that are faked
|
|
|
|
|
* those should be complete and also include "irrelevant" files that might be mistaken as coming from other distributions
|
|
|
|
|
* all files that are not listed here are assumed to not exist at all
|
|
|
|
|
* the output of pythons platform.dist()
|
|
|
|
|
* results for the ansible variables distribution* and os_family
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
# prepare some mock functions to get the testdata in
|
|
|
|
|
def mock_get_file_content(fname, default=None, strip=True):
|
|
|
|
|
"""give fake content if it exists, otherwise pretend the file is empty"""
|
|
|
|
|
data = default
|
|
|
|
|
if fname in testcase['input']:
|
|
|
|
|
# for debugging
|
|
|
|
|
print('faked %s for %s' % (fname, testcase['name']))
|
|
|
|
|
data = testcase['input'][fname].strip()
|
|
|
|
|
if strip and data is not None:
|
|
|
|
|
data = data.strip()
|
|
|
|
|
return data
|
|
|
|
|
|
|
|
|
|
def mock_get_uname_version(am):
|
|
|
|
|
return testcase.get('uname_v', None)
|
|
|
|
|
|
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
|
|
|
def mock_file_exists(fname, allow_empty=False):
|
|
|
|
|
if fname not in testcase['input']:
|
|
|
|
|
return False
|
|
|
|
|
|
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
|
|
|
if allow_empty:
|
|
|
|
|
return True
|
|
|
|
|
return bool(len(testcase['input'][fname]))
|
|
|
|
|
|
|
|
|
|
def mock_platform_system():
|
|
|
|
|
return testcase.get('platform.system', 'Linux')
|
|
|
|
|
|
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
|
|
|
def mock_platform_release():
|
|
|
|
|
return testcase.get('platform.release', '')
|
|
|
|
|
|
|
|
|
|
def mock_platform_version():
|
|
|
|
|
return testcase.get('platform.version', '')
|
|
|
|
|
|
|
|
|
|
mocker.patch('ansible.module_utils.facts.system.distribution.get_file_content', mock_get_file_content)
|
|
|
|
|
mocker.patch('ansible.module_utils.facts.system.distribution.get_uname_version', mock_get_uname_version)
|
|
|
|
|
mocker.patch('ansible.module_utils.facts.system.distribution._file_exists', mock_file_exists)
|
|
|
|
|
mocker.patch('platform.dist', lambda: testcase['platform.dist'])
|
|
|
|
|
mocker.patch('platform.system', mock_platform_system)
|
|
|
|
|
mocker.patch('platform.release', mock_platform_release)
|
|
|
|
|
mocker.patch('platform.version', mock_platform_version)
|
|
|
|
|
|
|
|
|
|
# run Facts()
|
|
|
|
|
distro_collector = DistributionFactCollector()
|
|
|
|
|
generated_facts = distro_collector.collect(am)
|
|
|
|
|
|
|
|
|
|
# compare with the expected output
|
|
|
|
|
|
|
|
|
|
# testcase['result'] has a list of variables and values it expects Facts() to set
|
|
|
|
|
for key, val in testcase['result'].items():
|
|
|
|
|
assert key in generated_facts
|
|
|
|
|
msg = 'Comparing value of %s on %s, should: %s, is: %s' %\
|
|
|
|
|
(key, testcase['name'], val, generated_facts[key])
|
|
|
|
|
assert generated_facts[key] == val, msg
|