diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-03-14 11:12:07 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2021-03-14 14:46:01 +0100 |
commit | 7d67e8609471b6a5c9761a99301f368bd6747e13 (patch) | |
tree | 1425013d29db56847e4ca642018d2edde234afcb /src/conf_mode | |
parent | 007284ed9333ae65f7355ac49631965fef76a1db (diff) | |
download | vyos-1x-7d67e8609471b6a5c9761a99301f368bd6747e13.tar.gz vyos-1x-7d67e8609471b6a5c9761a99301f368bd6747e13.zip |
vyos.util: rename get_json_iface_options() -> get_interface_config()
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-x | src/conf_mode/interfaces-tunnel.py | 4 | ||||
-rwxr-xr-x | src/conf_mode/protocols_ospf.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py index b63312750..cab94a5b0 100755 --- a/src/conf_mode/interfaces-tunnel.py +++ b/src/conf_mode/interfaces-tunnel.py @@ -34,7 +34,7 @@ from vyos.ifconfig import Interface from vyos.ifconfig import TunnelIf from vyos.template import is_ipv4 from vyos.template import is_ipv6 -from vyos.util import get_json_iface_options +from vyos.util import get_interface_config from vyos.util import dict_search from vyos import ConfigError from vyos import airbag @@ -103,7 +103,7 @@ def apply(tunnel): # There is no other solution to destroy and recreate the tunnel. encap = '' remote = '' - tmp = get_json_iface_options(interface) + tmp = get_interface_config(interface) if tmp: encap = dict_search('linkinfo.info_kind', tmp) remote = dict_search('linkinfo.info_data.remote', tmp) diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py index e0dc4e7bf..ef2aeda7f 100755 --- a/src/conf_mode/protocols_ospf.py +++ b/src/conf_mode/protocols_ospf.py @@ -27,7 +27,7 @@ from vyos.configverify import verify_interface_exists from vyos.template import render_to_string from vyos.util import call from vyos.util import dict_search -from vyos.util import get_json_iface_options +from vyos.util import get_interface_config from vyos.xml import defaults from vyos import ConfigError from vyos import frr @@ -157,7 +157,7 @@ def verify(ospf): # priorities the interface is bound to the VRF after creation of # the VRF itself, and before any routing protocol is configured. vrf = ospf['vrf'] - tmp = get_json_iface_options(interface) + tmp = get_interface_config(interface) if 'master' not in tmp or tmp['master'] != vrf: raise ConfigError(f'Interface {interface} is not a member of VRF {vrf}!') |