60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
|
From 27770ed415e010055fea3a2cf599b56cd4aedf5e Mon Sep 17 00:00:00 2001
|
||
|
From: =?UTF-8?q?Julio=20Gonz=C3=A1lez=20Gil?=
|
||
|
<juliogonzalez@users.noreply.github.com>
|
||
|
Date: Wed, 12 Feb 2020 10:05:45 +0100
|
||
|
Subject: [PATCH] Add Astra Linux Common Edition to the OS Family list
|
||
|
(#209)
|
||
|
|
||
|
---
|
||
|
salt/grains/core.py | 1 +
|
||
|
tests/unit/grains/test_core.py | 20 ++++++++++++++++++++
|
||
|
2 files changed, 21 insertions(+)
|
||
|
|
||
|
diff --git a/salt/grains/core.py b/salt/grains/core.py
|
||
|
index 31ed8a77aa..67e263d37b 100644
|
||
|
--- a/salt/grains/core.py
|
||
|
+++ b/salt/grains/core.py
|
||
|
@@ -1508,6 +1508,7 @@ _OS_FAMILY_MAP = {
|
||
|
'Funtoo': 'Gentoo',
|
||
|
'AIX': 'AIX',
|
||
|
'TurnKey': 'Debian',
|
||
|
+ 'AstraLinuxCE': 'Debian',
|
||
|
}
|
||
|
|
||
|
# Matches any possible format:
|
||
|
diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
|
||
|
index 09e197a2e4..700eac2b08 100644
|
||
|
--- a/tests/unit/grains/test_core.py
|
||
|
+++ b/tests/unit/grains/test_core.py
|
||
|
@@ -605,6 +605,26 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
|
||
|
}
|
||
|
self._run_os_grains_tests("ubuntu-17.10", _os_release_map, expectation)
|
||
|
|
||
|
+ @skipIf(not salt.utils.platform.is_linux(), 'System is not Linux')
|
||
|
+ def test_astralinuxce_2_os_grains(self):
|
||
|
+ '''
|
||
|
+ Test if OS grains are parsed correctly in Astra Linux CE 2.12.22 "orel"
|
||
|
+ '''
|
||
|
+ _os_release_map = {
|
||
|
+ 'linux_distribution': ('AstraLinuxCE', '2.12.22', 'orel'),
|
||
|
+ }
|
||
|
+ expectation = {
|
||
|
+ 'os': 'AstraLinuxCE',
|
||
|
+ 'os_family': 'Debian',
|
||
|
+ 'oscodename': 'orel',
|
||
|
+ 'osfullname': 'AstraLinuxCE',
|
||
|
+ 'osrelease': '2.12.22',
|
||
|
+ 'osrelease_info': (2, 12, 22),
|
||
|
+ 'osmajorrelease': 2,
|
||
|
+ 'osfinger': 'AstraLinuxCE-2',
|
||
|
+ }
|
||
|
+ self._run_os_grains_tests("astralinuxce-2.12.22", _os_release_map, expectation)
|
||
|
+
|
||
|
@skipIf(not salt.utils.platform.is_windows(), 'System is not Windows')
|
||
|
def test_windows_platform_data(self):
|
||
|
'''
|
||
|
--
|
||
|
2.23.0
|
||
|
|
||
|
|