Skip to content

Commit

Permalink
wlb: T7196: Fix exclude/interface verify check
Browse files Browse the repository at this point in the history
  • Loading branch information
sarthurdev committed Feb 26, 2025
1 parent 84e5788 commit b870857
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion smoketest/scripts/cli/test_load-balancing_wan.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
# Copyright (C) 2022-2024 VyOS maintainers and contributors
# Copyright (C) 2022-2025 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
Expand Down Expand Up @@ -272,6 +272,9 @@ def test_criteria_failover_hook(self):
self.cli_set(base_path + ['wan', 'interface-health', isp2_iface, 'failure-count', '1'])
self.cli_set(base_path + ['wan', 'interface-health', isp2_iface, 'nexthop', '192.0.2.2'])
self.cli_set(base_path + ['wan', 'interface-health', isp2_iface, 'success-count', '1'])
self.cli_set(base_path + ['wan', 'rule', '5', 'exclude'])
self.cli_set(base_path + ['wan', 'rule', '5', 'inbound-interface', 'eth*'])
self.cli_set(base_path + ['wan', 'rule', '5', 'destination', 'address', '10.0.0.0/8'])
self.cli_set(base_path + ['wan', 'rule', '10', 'failover'])
self.cli_set(base_path + ['wan', 'rule', '10', 'inbound-interface', lan_iface])
self.cli_set(base_path + ['wan', 'rule', '10', 'protocol', 'udp'])
Expand All @@ -291,6 +294,7 @@ def test_criteria_failover_hook(self):
# Verify isp1 + criteria

nftables_search = [
[f'iifname "eth*"', 'ip daddr 10.0.0.0/8', 'return'],
[f'iifname "{lan_iface}"', 'ip saddr 198.51.100.0/24', 'udp sport 53', 'ip daddr 192.0.2.0/24', 'udp dport 53', f'jump wlb_mangle_isp_{isp1_iface}']
]

Expand Down
6 changes: 3 additions & 3 deletions src/conf_mode/load-balancing_wan.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
# Copyright (C) 2023-2024 VyOS maintainers and contributors
# Copyright (C) 2023-2025 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
Expand Down Expand Up @@ -71,8 +71,8 @@ def verify(lb):

if 'rule' in lb:
for rule_id, rule_conf in lb['rule'].items():
if 'interface' not in rule_conf:
raise ConfigError(f'Interface not specified on load-balancing wan rule {rule_id}')
if 'interface' not in rule_conf and 'exclude' not in rule_conf:
raise ConfigError(f'Interface or exclude not specified on load-balancing wan rule {rule_id}')

if 'failover' in rule_conf and 'exclude' in rule_conf:
raise ConfigError(f'Failover cannot be configured with exclude on load-balancing wan rule {rule_id}')
Expand Down

0 comments on commit b870857

Please sign in to comment.