Skip to content

Fix RHEL 7 morphing selection for the Server os-release name #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabi200123 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

Fix RHEL 7 morphing selection for the Server os-release name #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion coriolis/osmorphing/redhat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
from coriolis.osmorphing import base

RED_HAT_DISTRO_IDENTIFIER = "Red Hat Enterprise Linux"
# RHEL 7 os-release NAME includes the "Server" variant. RHEL 8+ does not.
RED_HAT_SERVER_DISTRO_IDENTIFIER = "Red Hat Enterprise Linux Server"

LOG = logging.getLogger(__name__)

Expand All @@ -28,7 +30,10 @@ class BaseRedHatMorphingTools(base.BaseLinuxOSMorphingTools):

@classmethod
def check_os_supported(cls, detected_os_info):
if detected_os_info['distribution_name'] != (RED_HAT_DISTRO_IDENTIFIER):
if detected_os_info['distribution_name'] not in (
RED_HAT_DISTRO_IDENTIFIER,
RED_HAT_SERVER_DISTRO_IDENTIFIER,
):
return False
return cls._version_supported_util(
detected_os_info['release_version'], minimum=7
Expand Down
12 changes: 12 additions & 0 deletions coriolis/tests/osmorphing/test_redhat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@ def test_check_os_supported_release_version(self, release_version, expected):
)
self.assertEqual(expected, result)

def test_check_os_supported_rhel7_server_name(self):
self.detected_os_info['distribution_name'] = (
redhat.RED_HAT_SERVER_DISTRO_IDENTIFIER
)
self.detected_os_info['release_version'] = '7.9'

result = redhat.BaseRedHatMorphingTools.check_os_supported(
self.detected_os_info
)

self.assertTrue(result)

def test_check_os_not_supported(self):
self.detected_os_info['distribution_name'] = 'unsupported'

Expand Down
Loading