ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Dist version fix for Red Hat and more tests (#15663)

Browse source 
* add tests for centos6, rhel6 and rhel7

* gen_distribution_version_testcase with python2.6

* remove unused imports

* fix redhat/vmware/... parsing

* add centos7 test case
This commit is contained in:
Robin Roth 2016-04-29 22:18:50 +02:00 committed by Toshio Kuratomi
parent 6f4f8e6e79
commit 1d6608e84f
3 changed files with 156 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hacking/tests/gen_distribution_version_testcase.py
View file

@ -46,11 +46,14 @@ dist = platform.dist()
facts = ['distribution', 'distribution_version', 'distribution_release', 'distribution_major_version'] facts = ['distribution', 'distribution_version', 'distribution_release', 'distribution_major_version']
ansible_out = subprocess.check_output(['ansible', 'localhost', '-m', 'setup']) ansible_out = subprocess.Popen(['ansible', 'localhost', '-m', 'setup'], stdout=subprocess.PIPE).communicate()[0]
parsed = json.loads(ansible_out[ansible_out.index('{'):]) parsed = json.loads(ansible_out[ansible_out.index('{'):])
ansible_facts = {} ansible_facts = {}
for fact in facts: for fact in facts:
ansible_facts[fact] = parsed['ansible_facts']['ansible_'+fact] try:
ansible_facts[fact] = parsed['ansible_facts']['ansible_'+fact]
except:
ansible_facts[fact] = "N/A"
nicename = ansible_facts['distribution'] + ' ' + ansible_facts['distribution_version'] nicename = ansible_facts['distribution'] + ' ' + ansible_facts['distribution_version']

146
lib/ansible/module_utils/facts.py
View file

@ -605,25 +605,31 @@ class Distribution(object):
""" """
OSDIST_LIST = ( OSDIST_LIST = (
('/etc/oracle-release', 'OracleLinux'), {'path': '/etc/oracle-release', 'name': 'OracleLinux'},
('/etc/slackware-version', 'Slackware'), {'path': '/etc/slackware-version', 'name': 'Slackware'},
('/etc/redhat-release', 'RedHat'), {'path': '/etc/redhat-release', 'name': 'RedHat'},
('/etc/vmware-release', 'VMwareESX'), {'path': '/etc/vmware-release', 'name': 'VMwareESX', 'allowempty': True},
('/etc/openwrt_release', 'OpenWrt'), {'path': '/etc/openwrt_release', 'name': 'OpenWrt'},
('/etc/system-release', 'OtherLinux'), {'path': '/etc/system-release', 'name': 'Amazon'},
('/etc/alpine-release', 'Alpine'), {'path': '/etc/alpine-release', 'name': 'Alpine'},
('/etc/release', 'Solaris'), {'path': '/etc/release', 'name': 'Solaris'},
('/etc/arch-release', 'Archlinux'), {'path': '/etc/arch-release', 'name': 'Archlinux', 'allowempty': True},
('/etc/os-release', 'SuSE'), {'path': '/etc/os-release', 'name': 'SuSE'},
('/etc/SuSE-release', 'SuSE'), {'path': '/etc/SuSE-release', 'name': 'SuSE'},
('/etc/gentoo-release', 'Gentoo'), {'path': '/etc/gentoo-release', 'name': 'Gentoo'},
('/etc/os-release', 'Debian'), {'path': '/etc/os-release', 'name': 'Debian'},
('/etc/lsb-release', 'Mandriva'), {'path': '/etc/lsb-release', 'name': 'Mandriva'},
('/etc/altlinux-release', 'Altlinux'), {'path': '/etc/altlinux-release', 'name': 'Altlinux'},
('/etc/os-release', 'NA'), {'path': '/etc/os-release', 'name': 'NA'},
('/etc/coreos/update.conf', 'Coreos'), {'path': '/etc/coreos/update.conf', 'name': 'Coreos'},
) )
SEARCH_STRING = {
'OracleLinux': 'Oracle Linux',
'RedHat': 'Red Hat',
'Altlinux': 'ALT Linux',
}
# A list with OS Family members # A list with OS Family members
OS_FAMILY = dict( OS_FAMILY = dict(
RedHat = 'RedHat', Fedora = 'RedHat', CentOS = 'RedHat', Scientific = 'RedHat', RedHat = 'RedHat', Fedora = 'RedHat', CentOS = 'RedHat', Scientific = 'RedHat',
@ -675,36 +681,47 @@ class Distribution(object):
self.facts['distribution_release'] = dist[2] or 'NA' self.facts['distribution_release'] = dist[2] or 'NA'
# Try to handle the exceptions now ... # Try to handle the exceptions now ...
# self.facts['distribution_debug'] = [] # self.facts['distribution_debug'] = []
for (path, name) in self.OSDIST_LIST: for ddict in self.OSDIST_LIST:
name = ddict['name']
path = ddict['path']
# TODO: remove this hack if tested with Fedora and Altlinux
if self.facts['distribution'] in ('Fedora', 'Altlinux', ):
# Once we determine the value is one of these distros
# we trust the values are always correct
break
if not os.path.exists(path): if not os.path.exists(path):
continue continue
if os.path.getsize(path) == 0: if os.path.getsize(path) == 0:
continue if 'allowempty' in ddict and ddict['allowempty']:
self.facts['distribution'] = name
break
else:
continue
try: data = get_file_content(path)
if name in self.SEARCH_STRING:
# look for the distribution string in the data and replace according to RELEASE_NAME_MAP
# only the distribution name is set, the version is assumed to be correct from platform.dist()
if self.SEARCH_STRING[name] in data:
# this sets distribution=RedHat if 'Red Hat' shows up in data
self.facts['distribution'] = name
else:
# this sets distribution to what's in the data, e.g. CentOS, Scientific, ...
self.facts['distribution'] = data.split()[0]
break
else:
# call a dedicated function for parsing the file content
distfunc = getattr(self, 'get_distribution_' + name) distfunc = getattr(self, 'get_distribution_' + name)
data = get_file_content(path)
parsed = distfunc(name, data, path) parsed = distfunc(name, data, path)
if parsed is None or parsed: if parsed is None or parsed:
# distfunc return False if parsing failed
# break only if parsing was succesful # break only if parsing was succesful
# otherwise continue with other distributions # otherwise continue with other distributions
# to debug multiple matching release files, one can use:
# self.facts['distribution_debug'].append({path + ' ' + name:
# (parsed,
# self.facts['distribution'],
# self.facts['distribution_version'],
# self.facts['distribution_release'],
# )})
break break
except AttributeError:
pass # to debug multiple matching release files, one can use:
# self.facts['distribution_debug'].append({path + ' ' + name:
# (parsed,
# self.facts['distribution'],
# self.facts['distribution_version'],
# self.facts['distribution_release'],
# )})
self.facts['os_family'] = self.facts['distribution'] self.facts['os_family'] = self.facts['distribution']
distro = self.facts['distribution'].replace(' ', '_') distro = self.facts['distribution'].replace(' ', '_')
@ -738,47 +755,30 @@ class Distribution(object):
else: else:
self.facts['distribution_version'] = 'release' self.facts['distribution_version'] = 'release'
def get_distribution_Archlinux(self, name, data, path):
if not 'Arch Linux' in data:
self.facts['distribution'] = data.split()[0]
def get_distribution_Slackware(self, name, data, path): def get_distribution_Slackware(self, name, data, path):
if 'Slackware' in data: if 'Slackware' not in data:
self.facts['distribution'] = name return False # TODO: remove
version = re.findall('\w+[.]\w+', data) self.facts['distribution'] = name
if version: version = re.findall('\w+[.]\w+', data)
self.facts['distribution_version'] = version[0] if version:
self.facts['distribution_version'] = version[0]
def get_distribution_OracleLinux(self, name, data, path): def get_distribution_Amazon(self, name, data, path):
if not 'Oracle Linux' in data: if 'Amazon' not in data:
self.facts['distribution'] = data.split()[0] return False # TODO: remove
self.facts['distribution'] = 'Amazon'
def get_distribution_RedHat(self, name, data, path): self.facts['distribution_version'] = data.split()[-1]
if not 'Red Hat' in data:
self.facts['distribution'] = data.split()[0]
def get_distribution_Altlinux(self, name, data, path):
if not 'ALT Linux' in data:
self.facts['distribution'] = data.split()[0]
def get_distribution_OtherLinux(self, name, data, path):
if 'Amazon' in data:
self.facts['distribution'] = 'Amazon'
self.facts['distribution_version'] = data.split()[-1]
else:
return False # TODO: remove if tested without this
def get_distribution_OpenWrt(self, name, data, path): def get_distribution_OpenWrt(self, name, data, path):
if 'OpenWrt' in data: if 'OpenWrt' not in data:
self.facts['distribution'] = name return False # TODO: remove
version = re.search('DISTRIB_RELEASE="(.*)"', data) self.facts['distribution'] = name
if version: version = re.search('DISTRIB_RELEASE="(.*)"', data)
self.facts['distribution_version'] = version.groups()[0] if version:
release = re.search('DISTRIB_CODENAME="(.*)"', data) self.facts['distribution_version'] = version.groups()[0]
if release: release = re.search('DISTRIB_CODENAME="(.*)"', data)
self.facts['distribution_release'] = release.groups()[0] if release:
else: self.facts['distribution_release'] = release.groups()[0]
return False # TODO: remove if tested without this
def get_distribution_Alpine(self, name, data, path): def get_distribution_Alpine(self, name, data, path):
self.facts['distribution'] = 'Alpine' self.facts['distribution'] = 'Alpine'

79
test/units/module_utils/test_distribution_version.py
View file

@ -22,9 +22,6 @@ import sys
# to work around basic.py reading stdin # to work around basic.py reading stdin
import json import json
from io import BytesIO, StringIO
from ansible.compat.six import PY3
from ansible.utils.unicode import to_bytes
from units.mock.procenv import swap_stdin_and_argv from units.mock.procenv import swap_stdin_and_argv
@ -38,6 +35,82 @@ from ansible.compat.tests.mock import patch
# to generate the testcase data, you can use the script gen_distribution_version_testcase.py in hacking/tests # to generate the testcase data, you can use the script gen_distribution_version_testcase.py in hacking/tests
TESTSETS = [ 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\"\nPRETTY_NAME=\"CentOS Linux 7 (Core)\"\nANSI_COLOR=\"0;31\"\nCPE_NAME=\"cpe:/o:centos:centos:7\"\nHOME_URL=\"https://www.centos.org/\"\nBUG_REPORT_URL=\"https://bugs.centos.org/\"\n\nCENTOS_MANTISBT_PROJECT=\"CentOS-7\"\nCENTOS_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",
"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",
"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\"\nPRETTY_NAME=\"Red Hat Enterprise Linux Server 7.2 (Maipo)\"\nANSI_COLOR=\"0;31\"\nCPE_NAME=\"cpe:/o:redhat:enterprise_linux:7.2:GA:server\"\nHOME_URL=\"https://www.redhat.com/\"\nBUG_REPORT_URL=\"https://bugzilla.redhat.com/\"\n\nREDHAT_BUGZILLA_PRODUCT=\"Red Hat Enterprise Linux 7\"\nREDHAT_BUGZILLA_PRODUCT_VERSION=7.2\nREDHAT_SUPPORT_PRODUCT=\"Red Hat Enterprise Linux\"\nREDHAT_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",
"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",
"distribution_version": "6.7"
}
},
{
"name" : "openSUSE Leap 42.1", "name" : "openSUSE Leap 42.1",
"input": { "input": {
"/etc/os-release": "/etc/os-release":