summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-07-22 10:49:33 +0200
committerGitHub <noreply@github.com>2024-07-22 10:49:33 +0200
commita3d76254f4d47665f56261c9089a8a34761e0e18 (patch)
tree1ca3d162d7a6c859c079afb3ffe09248b6a954af /src/conf_mode
parent5be256235052592dab254f55f5f329feb5e955b0 (diff)
parent2b35ea81627277cd680ecd4ba79e944cc785c94b (diff)
downloadvyos-1x-a3d76254f4d47665f56261c9089a8a34761e0e18.tar.gz
vyos-1x-a3d76254f4d47665f56261c9089a8a34761e0e18.zip
Merge pull request #3836 from vyos/mergify/bp/circinus/pr-3834
interfaces: T6592: moving an interface between VRF instances failed (backport #3834)
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/vrf.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index 8d8c234c0..184725573 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -26,7 +26,7 @@ from vyos.ifconfig import Interface
from vyos.template import render
from vyos.template import render_to_string
from vyos.utils.dict import dict_search
-from vyos.utils.network import get_interface_config
+from vyos.utils.network import get_vrf_tableid
from vyos.utils.network import get_vrf_members
from vyos.utils.network import interface_exists
from vyos.utils.process import call
@@ -160,8 +160,8 @@ def verify(vrf):
# routing table id can't be changed - OS restriction
if interface_exists(name):
- tmp = str(dict_search('linkinfo.info_data.table', get_interface_config(name)))
- if tmp and tmp != vrf_config['table']:
+ tmp = get_vrf_tableid(name)
+ if tmp and tmp != int(vrf_config['table']):
raise ConfigError(f'VRF "{name}" table id modification not possible!')
# VRF routing table ID must be unique on the system