diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-07-30 08:07:29 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-07-30 08:07:29 +0200 |
| commit | 9b99a01653e3315b1abc9ef98824ca71bd283047 (patch) | |
| tree | 5228b3ef3c66fd6fa78678d71b5b4ef1d8c7dde3 | |
| parent | adeac78ed6585b16102bd82581b54c75819714b2 (diff) | |
| download | vyos-1x-9b99a01653e3315b1abc9ef98824ca71bd283047.tar.gz vyos-1x-9b99a01653e3315b1abc9ef98824ca71bd283047.zip | |
pbr: T6430: refactor to use vyos.utils.network.get_vrf_tableid()
Commit 452068ce78 ("interfaces: T6592: moving an interface between VRF instances
failed") added a similar but more detailed implementation of get_vrf_table_id()
that was added in commit adeac78ed of this PR. Move to the common available
implementation.
| -rw-r--r-- | python/vyos/firewall.py | 6 | ||||
| -rw-r--r-- | python/vyos/utils/network.py | 3 | ||||
| -rwxr-xr-x | src/conf_mode/policy_route.py | 6 |
3 files changed, 6 insertions, 9 deletions
diff --git a/python/vyos/firewall.py b/python/vyos/firewall.py index 89cd68183..facd498ca 100644 --- a/python/vyos/firewall.py +++ b/python/vyos/firewall.py @@ -30,7 +30,7 @@ from vyos.utils.dict import dict_search_args from vyos.utils.dict import dict_search_recursive from vyos.utils.process import cmd from vyos.utils.process import run -from vyos.utils.network import get_vrf_table_id +from vyos.utils.network import get_vrf_tableid from vyos.defaults import rt_global_table from vyos.defaults import rt_global_vrf @@ -482,8 +482,8 @@ def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): if vrf_name == 'default': table = rt_global_vrf else: - # NOTE: VRF->table ID lookup depends on the VRF iface already existing. - table = get_vrf_table_id(vrf_name) + # NOTE: VRF->table ID lookup depends on the VRF iface already existing. + table = get_vrf_tableid(vrf_name) if 'table' in rule_conf['set']: set_table = True table = rule_conf['set']['table'] diff --git a/python/vyos/utils/network.py b/python/vyos/utils/network.py index d297a1ddb..8fce08de0 100644 --- a/python/vyos/utils/network.py +++ b/python/vyos/utils/network.py @@ -74,9 +74,6 @@ def get_vrf_members(vrf: str) -> list: pass return interfaces -def get_vrf_table_id(vrf: str): - return get_interface_config(vrf)['linkinfo']['info_data']['table'] - def get_interface_vrf(interface): """ Returns VRF of given interface """ from vyos.utils.dict import dict_search diff --git a/src/conf_mode/policy_route.py b/src/conf_mode/policy_route.py index da9002b59..223175b8a 100755 --- a/src/conf_mode/policy_route.py +++ b/src/conf_mode/policy_route.py @@ -25,7 +25,7 @@ from vyos.template import render from vyos.utils.dict import dict_search_args from vyos.utils.process import cmd from vyos.utils.process import run -from vyos.utils.network import get_vrf_table_id +from vyos.utils.network import get_vrf_tableid from vyos.defaults import rt_global_table from vyos.defaults import rt_global_vrf from vyos import ConfigError @@ -165,14 +165,14 @@ def apply_table_marks(policy): if set_vrf == 'default': vrf_table_id = rt_global_vrf else: - vrf_table_id = get_vrf_table_id(set_vrf) + vrf_table_id = get_vrf_tableid(set_vrf) elif set_table: if set_table == 'main': vrf_table_id = rt_global_table else: vrf_table_id = set_table if vrf_table_id is not None: - vrf_table_id = int(vrf_table_id) + vrf_table_id = int(vrf_table_id) if vrf_table_id in tables: continue tables.append(vrf_table_id) |