8000 Enums: Fix failure to convert <<inherit>> by SchoolGuy · Pull Request #2920 · cobbler/cobbler · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Enums: Fix failure to convert <<inherit>> #2920

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

Merged
merged 1 commit into from
Jan 28, 2022
Merged

Enums: Fix failure to convert <<inherit>> #2920

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 cobbler/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ def to_enum(cls, value: Union[str, "ConvertableEnum"]) -> "ConvertableEnum":
"""
try:
if isinstance(value, str):
if value == VALUE_INHERITED:
try:
return cls["INHERITED"]
except KeyError as key_error:
raise ValueError("The enum given does not support inheritance!") from key_error
return cls[value.upper()]
elif isinstance(value, cls):
return value
Expand Down Expand Up @@ -133,7 +138,7 @@ class VirtDiskDrivers(ConvertableEnum):
This enum represents all virtual disk driver Cobbler can handle.
"""

INHERTIED = VALUE_INHERITED
INHERITED = VALUE_INHERITED
RAW = "raw"
QCOW2 = "qcow2"
QED = "qed"
Expand Down
2 changes: 1 addition & 1 deletion cobbler/items/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ def __init__(self, api, *args, **kwargs):
# FIXME: The virt_* attributes don't support inheritance yet
self._virt_auto_boot: Union[bool, str] = enums.VALUE_INHERITED
self._virt_cpus: Union[int, str] = enums.VALUE_INHERITED
self._virt_disk_driver = enums.VirtDiskDrivers.INHERTIED
self._virt_disk_driver = enums.VirtDiskDrivers.INHERITED
self._virt_file_size: Union[float, str] = enums.VALUE_INHERITED
self._virt_path = enums.VALUE_INHERITED
self._virt_pxe_boot = False
Expand Down
6 changes: 4 additions & 2 deletions tests/enums_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ def test_validate_arch(test_architecture, test_raise):
("qemu", does_not_raise()),
("<<inherit>>", does_not_raise()),
(enums.VirtType.QEMU, does_not_raise()),
(enums.VirtType.INHERITED, does_not_raise()),
(0, pytest.raises(TypeError))
])
def test_set_virt_type(value, expected_exception):
# Arrange

# Act
with expected_exception:
result = enums.VirtType.to_enum("qemu")
result = enums.VirtType.to_enum(value)

# Assert
if isinstance(value, str):
Expand All @@ -54,6 +55,7 @@ def test_set_virt_type(value, expected_exception):
@pytest.mark.parametrize("value,expected_exception", [
("allow", does_not_raise()),
(enums.TlsRequireCert.ALLOW, does_not_raise()),
(enums.VALUE_INHERITED, pytest.raises(ValueError)),
(0, pytest.raises(TypeError))
])
def test_validate_ldap_tls_reqcert(value, expected_exception):
Expand All @@ -75,7 +77,7 @@ def test_validate_ldap_tls_reqcert(value, expected_exception):
@pytest.mark.parametrize("test_driver,test_raise", [
(enums.VirtDiskDrivers.RAW, does_not_raise()),
(enums.VALUE_INHERITED, does_not_raise()),
(enums.VirtDiskDrivers.INHERTIED, does_not_raise()),
(enums.VirtDiskDrivers.INHERITED, does_not_raise()),
("qcow2", does_not_raise()),
("<<inherit>>", does_not_raise()),
("bad_driver", pytest.raises(ValueError)),
Expand Down
0