-
Notifications
You must be signed in to change notification settings - Fork 351
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
wlb: T7196: Migrate interface wildcards to nftables format
* wlb: T7196: Migrate interface wildcards to nftables format * wlb: T7196: Fix exclude/interface verify check * wlb: T7196: Extra sanity check on ipv4 address function
- Loading branch information
1 parent
4ce3b92
commit 92ad401
Showing
5 changed files
with
44 additions
and
7 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
interface-definitions/include/version/wanloadbalance-version.xml.i
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
<!-- include start from include/version/wanloadbalance-version.xml.i --> | ||
<syntaxVersion component='wanloadbalance' version='3'></syntaxVersion> | ||
<syntaxVersion component='wanloadbalance' version='4'></syntaxVersion> | ||
<!-- include end --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#!/usr/bin/python3 | ||
|
||
# Copyright 2024 VyOS maintainers and contributors <[email protected]> | ||
# Copyright 2024-2025 VyOS maintainers and contributors <[email protected]> | ||
# | ||
# This library is free software; you can redistribute it and/or | ||
# modify it under the terms of the GNU Lesser General Public | ||
|
@@ -95,7 +95,7 @@ def on_state_change(lb, ifname, state): | |
def get_ipv4_address(ifname): | ||
# Get primary ipv4 address on interface (for source nat) | ||
addr_json = get_interface_address(ifname) | ||
if 'addr_info' in addr_json and len(addr_json['addr_info']) > 0: | ||
if addr_json and 'addr_info' in addr_json and len(addr_json['addr_info']) > 0: | ||
for addr_info in addr_json['addr_info']: | ||
if addr_info['family'] == 'inet': | ||
if 'local' in addr_info: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
# Copyright 2025 VyOS maintainers and contributors <[email protected]> | ||
# | ||
# This library is free software; you can redistribute it and/or | ||
# modify it under the terms of the GNU Lesser General Public | ||
# License as published by the Free Software Foundation; either | ||
# version 2.1 of the License, or (at your option) any later version. | ||
# | ||
# This library is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
# Lesser General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU Lesser General Public License | ||
# along with this library. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
from vyos.configtree import ConfigTree | ||
|
||
base = ['load-balancing', 'wan'] | ||
|
||
def migrate(config: ConfigTree) -> None: | ||
if not config.exists(base): | ||
# Nothing to do | ||
return | ||
|
||
if config.exists(base + ['rule']): | ||
for rule in config.list_nodes(base + ['rule']): | ||
rule_base = base + ['rule', rule] | ||
|
||
if config.exists(rule_base + ['inbound-interface']): | ||
ifname = config.return_value(rule_base + ['inbound-interface']) | ||
|
||
if ifname.endswith('+'): | ||
config.set(rule_base + ['inbound-interface'], value=ifname.replace('+', '*')) |