Skip to content
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

NAS-130230 / 24.10 / Prevent removing failover group from critical interfaces #14083

Merged
merged 3 commits into from
Jul 25, 2024
+19 −0
Merged

NAS-130230 / 24.10 / Prevent removing failover group from critical interfaces #14083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f6e0ee
Add error if removing failover group
aiden3c Jul 25, 2024
60080fb
Added test
aiden3c Jul 25, 2024
91b3286
Suggested changes
aiden3c Jul 25, 2024
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
6 changes: 6 additions & 0 deletions src/middlewared/middlewared/plugins/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,6 +1049,12 @@ def _get_filters(key):
f'{schema_name}.{i}',
f'{str(validation_attrs[i][0]) + str(validation_attrs[i][2])}',
)
else:
if data.get('failover_critical') and data.get('failover_group') is None:
verrors.add(
f'{schema_name}.failover_group',
'A failover group is required when configuring a critical failover interface.'
)

# creating a "failover" lagg interface on HA systems and trying
# to mark it "critical for failover" isn't allowed as it can cause
Expand Down
13 changes: 13 additions & 0 deletions tests/api2/test_005_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
apifolder = os.getcwd()
sys.path.append(apifolder)

import errno
import pytest

from middlewared.service_exception import ValidationError, ValidationErrors
from auto_config import interface, ha, netmask
from middlewared.test.integration.utils.client import client, truenas_server
from middlewared.test.integration.utils import call
Expand Down Expand Up @@ -118,3 +120,14 @@ def test_002_configure_interface(request, ws_client, get_payload):

def test_003_recheck_ipvx(request):
assert int(call('tunable.get_sysctl', f'net.ipv6.conf.{interface}.autoconf')) == 0

def test_004_remove_critical_failover_group(request):
with pytest.raises(ValidationErrors) as ve:
call('interface.update', interface, {'failover_group': None, 'failover_critical': True})
assert ve.value.errors == [
ValidationError(
'interface_update.failover_group',
'A failover group is required when configuring a critical failover interface.',
errno.EINVAL
)
]
Loading