saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add Virtuozzo Linux as os_family=Redhat

Browse source
This commit is contained in:
Noah Ablaseau 2023-11-22 11:31:41 -05:00 • committed by Daniel Wozniak
parent de002b6bcb
commit abf906ad1c
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/grains/core.py
View file

@ -1701,6 +1701,7 @@ _OS_NAME_MAP = {
"oracleserv": "OEL",
"cloudserve": "CloudLinux",
"cloudlinux": "CloudLinux",
"virtuozzo": "Virtuozzo",
"almalinux": "AlmaLinux",
"pidora": "Fedora",
"scientific": "ScientificLinux",
@ -1771,6 +1772,7 @@ _OS_FAMILY_MAP = {
"Scientific": "RedHat",
"Amazon": "RedHat",
"CloudLinux": "RedHat",
"Virtuozzo": "RedHat",
"AlmaLinux": "RedHat",
"OVS": "RedHat",
"OEL": "RedHat",

30
tests/pytests/unit/grains/test_core.py
View file

@ -1154,6 +1154,36 @@ def test_almalinux_8_os_grains():
}
_run_os_grains_tests(_os_release_data, {}, expectation)
@pytest.mark.skip_unless_on_linux
def test_virtuozzo_7_os_grains():
"""
Test if OS grains are parsed correctly in Virtuozzo 7
"""
_os_release_data = {
"NAME": "Virtuozzo",
"ID": "virtuozzo",
"PRETTY_NAME": "Virtuozzo release 7.5.4",
"VERSION": "7.5.4",
"ID_LIKE": "rhel fedora",
"VERSION_ID": "7",
"ANSI_COLOR": "0;31",
"CPE_NAME": "cpe:/o:virtuozzoproject:vz:7",
"HOME_URL": "http://www.virtuozzo.com",
"BUG_REPORT_URL": "https://bugs.openvz.org",
}
expectation = {
"os": "Virtuozzo",
"os_family": "RedHat",
"osfullname": "Virtuozzo",
"oscodename": "Virtuozzo release 7.5.4",
"osrelease": "7",
"osrelease_info": (7),
"osmajorrelease": 7,
"osfinger": "Virtuozzo-7",
}
_run_os_grains_tests(_os_release_data, {}, expectation)
@pytest.mark.skip_unless_on_linux
def test_endeavouros_os_grains():