mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #34134 from meaksh/salt-suse-os-detection
Fixed behavior for SUSE OS grains in 2016.3
This commit is contained in:
Mike Place
GitHub
commit
3acda896f2
2 changed files with 260 additions and 1 deletions
|
|
@ -1037,6 +1037,7 @@ _OS_FAMILY_MAP = {
|
|||
'SUSE': 'Suse',
|
||||
'openSUSE Leap': 'Suse',
|
||||
'openSUSE Tumbleweed': 'Suse',
|
||||
'SLES_SAP': 'Suse',
|
||||
'Solaris': 'Solaris',
|
||||
'SmartOS': 'Solaris',
|
||||
'OpenIndiana Development': 'Solaris',
|
||||
|
|
@ -1264,6 +1265,14 @@ def os_data():
|
|||
grains['lsb_distrib_release'] = os_release['VERSION_ID']
|
||||
if 'PRETTY_NAME' in os_release:
|
||||
grains['lsb_distrib_codename'] = os_release['PRETTY_NAME']
|
||||
if 'CPE_NAME' in os_release:
|
||||
if ":suse:" in os_release['CPE_NAME'] or ":opensuse:" in os_release['CPE_NAME']:
|
||||
grains['os'] = "SUSE"
|
||||
# openSUSE `osfullname` grain normalization
|
||||
if os_release.get("NAME") == "openSUSE Leap":
|
||||
grains['osfullname'] = "Leap"
|
||||
elif os_release.get("VERSION") == "Tumbleweed":
|
||||
grains['osfullname'] = os_release["VERSION"]
|
||||
elif os.path.isfile('/etc/SuSE-release'):
|
||||
grains['lsb_distrib_id'] = 'SUSE'
|
||||
version = ''
|
||||
|
|
@ -1371,7 +1380,8 @@ def os_data():
|
|||
shortname = distroname.replace(' ', '').lower()[:10]
|
||||
# this maps the long names from the /etc/DISTRO-release files to the
|
||||
# traditional short names that Salt has used.
|
||||
grains['os'] = _OS_NAME_MAP.get(shortname, distroname)
|
||||
if 'os' not in grains:
|
||||
grains['os'] = _OS_NAME_MAP.get(shortname, distroname)
|
||||
grains.update(_linux_cpudata())
|
||||
grains.update(_linux_gpu_data())
|
||||
elif grains['kernel'] == 'SunOS':
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ from salttesting.helpers import ensure_in_syspath
|
|||
from salttesting.mock import (
|
||||
MagicMock,
|
||||
patch,
|
||||
mock_open,
|
||||
NO_MOCK,
|
||||
NO_MOCK_REASON
|
||||
)
|
||||
|
|
@ -119,6 +120,254 @@ class CoreGrainsTestCase(TestCase):
|
|||
|
||||
self.assertEqual(os_grains.get('os_family'), 'Debian')
|
||||
|
||||
@skipIf(not salt.utils.is_linux(), 'System is not Linux')
|
||||
def test_suse_os_from_cpe_data(self):
|
||||
'''
|
||||
Test if 'os' grain is parsed from CPE_NAME of /etc/os-release
|
||||
'''
|
||||
_path_exists_map = {
|
||||
'/proc/1/cmdline': False
|
||||
}
|
||||
_path_isfile_map = {
|
||||
'/etc/os-release': True,
|
||||
}
|
||||
_os_release_map = {
|
||||
'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'
|
||||
}
|
||||
|
||||
path_exists_mock = MagicMock(side_effect=lambda x: _path_exists_map[x])
|
||||
path_isfile_mock = MagicMock(
|
||||
side_effect=lambda x: _path_isfile_map.get(x, False)
|
||||
)
|
||||
empty_mock = MagicMock(return_value={})
|
||||
osarch_mock = MagicMock(return_value="amd64")
|
||||
os_release_mock = MagicMock(return_value=_os_release_map)
|
||||
|
||||
orig_import = __import__
|
||||
|
||||
def _import_mock(name, *args):
|
||||
if name == 'lsb_release':
|
||||
raise ImportError('No module named lsb_release')
|
||||
return orig_import(name, *args)
|
||||
|
||||
# Skip the first if statement
|
||||
with patch.object(salt.utils, 'is_proxy',
|
||||
MagicMock(return_value=False)):
|
||||
# Skip the selinux/systemd stuff (not pertinent)
|
||||
with patch.object(core, '_linux_bin_exists',
|
||||
MagicMock(return_value=False)):
|
||||
# Skip the init grain compilation (not pertinent)
|
||||
with patch.object(os.path, 'exists', path_exists_mock):
|
||||
# Ensure that lsb_release fails to import
|
||||
with patch('__builtin__.__import__',
|
||||
side_effect=_import_mock):
|
||||
# Skip all the /etc/*-release stuff (not pertinent)
|
||||
with patch.object(os.path, 'isfile', path_isfile_mock):
|
||||
with patch.object(core, '_parse_os_release', os_release_mock):
|
||||
# Mock platform.linux_distribution to give us the
|
||||
# OS name that we want.
|
||||
distro_mock = MagicMock(
|
||||
return_value=('SUSE Linux Enterprise Server ', '12', 'x86_64')
|
||||
)
|
||||
with patch.object(platform, 'linux_distribution', distro_mock):
|
||||
with patch.object(core, '_linux_gpu_data', empty_mock):
|
||||
with patch.object(core, '_linux_cpudata', empty_mock):
|
||||
with patch.object(core, '_virtual', empty_mock):
|
||||
# Mock the osarch
|
||||
with patch.dict(core.__salt__, {'cmd.run': osarch_mock}):
|
||||
os_grains = core.os_data()
|
||||
|
||||
self.assertEqual(os_grains.get('os_family'), 'Suse')
|
||||
self.assertEqual(os_grains.get('os'), 'SUSE')
|
||||
|
||||
def _run_suse_os_grains_tests(self, os_release_map):
|
||||
path_isfile_mock = MagicMock(side_effect=lambda x: x in os_release_map['files'])
|
||||
empty_mock = MagicMock(return_value={})
|
||||
osarch_mock = MagicMock(return_value="amd64")
|
||||
os_release_mock = MagicMock(return_value=os_release_map.get('os_release_file'))
|
||||
|
||||
orig_import = __import__
|
||||
|
||||
def _import_mock(name, *args):
|
||||
if name == 'lsb_release':
|
||||
raise ImportError('No module named lsb_release')
|
||||
return orig_import(name, *args)
|
||||
|
||||
# Skip the first if statement
|
||||
with patch.object(salt.utils, 'is_proxy',
|
||||
MagicMock(return_value=False)):
|
||||
# Skip the selinux/systemd stuff (not pertinent)
|
||||
with patch.object(core, '_linux_bin_exists',
|
||||
MagicMock(return_value=False)):
|
||||
# Skip the init grain compilation (not pertinent)
|
||||
with patch.object(os.path, 'exists', path_isfile_mock):
|
||||
# Ensure that lsb_release fails to import
|
||||
with patch('__builtin__.__import__',
|
||||
side_effect=_import_mock):
|
||||
# Skip all the /etc/*-release stuff (not pertinent)
|
||||
with patch.object(os.path, 'isfile', path_isfile_mock):
|
||||
with patch.object(core, '_parse_os_release', os_release_mock):
|
||||
# Mock platform.linux_distribution to give us the
|
||||
# OS name that we want.
|
||||
distro_mock = MagicMock(
|
||||
return_value=('SUSE test', 'version', 'arch')
|
||||
)
|
||||
with patch("salt.utils.fopen", mock_open()) as suse_release_file:
|
||||
suse_release_file.return_value.__iter__.return_value = os_release_map.get('suse_release_file', '').splitlines()
|
||||
with patch.object(platform, 'linux_distribution', distro_mock):
|
||||
with patch.object(core, '_linux_gpu_data', empty_mock):
|
||||
with patch.object(core, '_linux_cpudata', empty_mock):
|
||||
with patch.object(core, '_virtual', empty_mock):
|
||||
# Mock the osarch
|
||||
with patch.dict(core.__salt__, {'cmd.run': osarch_mock}):
|
||||
os_grains = core.os_data()
|
||||
|
||||
self.assertEqual(os_grains.get('os'), 'SUSE')
|
||||
self.assertEqual(os_grains.get('os_family'), 'Suse')
|
||||
self.assertEqual(os_grains.get('osfullname'), os_release_map['osfullname'])
|
||||
self.assertEqual(os_grains.get('oscodename'), os_release_map['oscodename'])
|
||||
self.assertEqual(os_grains.get('osrelease'), os_release_map['osrelease'])
|
||||
self.assertListEqual(list(os_grains.get('osrelease_info')), os_release_map['osrelease_info'])
|
||||
|
||||
@skipIf(not salt.utils.is_linux(), 'System is not Linux')
|
||||
def test_suse_os_grains_sles11sp3(self):
|
||||
'''
|
||||
Test if OS grains are parsed correctly in SLES 11 SP3
|
||||
'''
|
||||
_os_release_map = {
|
||||
'suse_release_file': '''SUSE Linux Enterprise Server 11 (x86_64)
|
||||
VERSION = 11
|
||||
PATCHLEVEL = 3
|
||||
''',
|
||||
'oscodename': 'SUSE Linux Enterprise Server 11 SP3',
|
||||
'osfullname': "SLES",
|
||||
'osrelease': '11.3',
|
||||
'osrelease_info': [11, 3],
|
||||
'files': ["/etc/SuSE-release"],
|
||||
}
|
||||
self._run_suse_os_grains_tests(_os_release_map)
|
||||
|
||||
@skipIf(not salt.utils.is_linux(), 'System is not Linux')
|
||||
def test_suse_os_grains_sles11sp4(self):
|
||||
'''
|
||||
Test if OS grains are parsed correctly in SLES 11 SP4
|
||||
'''
|
||||
_os_release_map = {
|
||||
'os_release_file': {
|
||||
'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'
|
||||
},
|
||||
'oscodename': 'SUSE Linux Enterprise Server 11 SP4',
|
||||
'osfullname': "SLES",
|
||||
'osrelease': '11.4',
|
||||
'osrelease_info': [11, 4],
|
||||
'files': ["/etc/os-release"],
|
||||
}
|
||||
self._run_suse_os_grains_tests(_os_release_map)
|
||||
|
||||
@skipIf(not salt.utils.is_linux(), 'System is not Linux')
|
||||
def test_suse_os_grains_sles12(self):
|
||||
'''
|
||||
Test if OS grains are parsed correctly in SLES 12
|
||||
'''
|
||||
_os_release_map = {
|
||||
'os_release_file': {
|
||||
'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'
|
||||
},
|
||||
'oscodename': 'SUSE Linux Enterprise Server 12',
|
||||
'osfullname': "SLES",
|
||||
'osrelease': '12',
|
||||
'osrelease_info': [12],
|
||||
'files': ["/etc/os-release"],
|
||||
}
|
||||
self._run_suse_os_grains_tests(_os_release_map)
|
||||
|
||||
@skipIf(not salt.utils.is_linux(), 'System is not Linux')
|
||||
def test_suse_os_grains_sles12sp1(self):
|
||||
'''
|
||||
Test if OS grains are parsed correctly in SLES 12 SP1
|
||||
'''
|
||||
_os_release_map = {
|
||||
'os_release_file': {
|
||||
'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'
|
||||
},
|
||||
'oscodename': 'SUSE Linux Enterprise Server 12 SP1',
|
||||
'osfullname': "SLES",
|
||||
'osrelease': '12.1',
|
||||
'osrelease_info': [12, 1],
|
||||
'files': ["/etc/os-release"],
|
||||
}
|
||||
self._run_suse_os_grains_tests(_os_release_map)
|
||||
|
||||
@skipIf(not salt.utils.is_linux(), 'System is not Linux')
|
||||
def test_suse_os_grains_opensuse_leap_42_1(self):
|
||||
'''
|
||||
Test if OS grains are parsed correctly in openSUSE Leap 42.1
|
||||
'''
|
||||
_os_release_map = {
|
||||
'os_release_file': {
|
||||
'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'
|
||||
},
|
||||
'oscodename': 'openSUSE Leap 42.1 (x86_64)',
|
||||
'osfullname': "Leap",
|
||||
'osrelease': '42.1',
|
||||
'osrelease_info': [42, 1],
|
||||
'files': ["/etc/os-release"],
|
||||
}
|
||||
self._run_suse_os_grains_tests(_os_release_map)
|
||||
|
||||
@skipIf(not salt.utils.is_linux(), 'System is not Linux')
|
||||
def test_suse_os_grains_tumbleweed(self):
|
||||
'''
|
||||
Test if OS grains are parsed correctly in openSUSE Tumbleweed
|
||||
'''
|
||||
_os_release_map = {
|
||||
'os_release_file': {
|
||||
'NAME': 'openSUSE',
|
||||
'VERSION': 'Tumbleweed',
|
||||
'VERSION_ID': '20160504',
|
||||
'PRETTY_NAME': 'openSUSE Tumbleweed (20160504) (x86_64)',
|
||||
'ID': 'opensuse',
|
||||
'ANSI_COLOR': '0;32',
|
||||
'CPE_NAME': 'cpe:/o:opensuse:opensuse:20160504'
|
||||
},
|
||||
'oscodename': 'openSUSE Tumbleweed (20160504) (x86_64)',
|
||||
'osfullname': "Tumbleweed",
|
||||
'osrelease': '20160504',
|
||||
'osrelease_info': [20160504],
|
||||
'files': ["/etc/os-release"],
|
||||
}
|
||||
self._run_suse_os_grains_tests(_os_release_map)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
from integration import run_tests
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue