summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-28 10:50:06 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-28 18:10:08 +0100
commitf13cc56d665a91ff3fac47df260301afefb1a3a5 (patch)
treefbf18680d85364b2b6e2964604aa37e85299c767 /src
parent458e71dd7b1af3354a7643a0d26e651a9e7ccfcf (diff)
downloadvyos-1x-f13cc56d665a91ff3fac47df260301afefb1a3a5.tar.gz
vyos-1x-f13cc56d665a91ff3fac47df260301afefb1a3a5.zip
vyos.util: provide single implementation for get_json_iface_options()
There had been four implementations of "ip -d -j link show interface" scattered accross the codebase. Those implementations have now been combined into a new helper: vyos.util.get_json_iface_options()
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/interfaces-tunnel.py16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py
index 2d2f29f94..0ffff06a1 100755
--- a/src/conf_mode/interfaces-tunnel.py
+++ b/src/conf_mode/interfaces-tunnel.py
@@ -34,22 +34,12 @@ 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 cmd
+from vyos.util import get_json_iface_options
from vyos.util import dict_search
from vyos import ConfigError
from vyos import airbag
airbag.enable()
-def get_tunnel_encapsulation(interface):
- """ Returns the used encapsulation protocol for given interface.
- If interface does not exist, None is returned.
- """
- if not os.path.exists(f'/sys/class/net/{interface}'):
- return None
- from json import loads
- tmp = loads(cmd(f'ip -d -j link show {interface}'))[0]
- return tmp['linkinfo']['info_kind']
-
def get_config(config=None):
"""
Retrive CLI config as dictionary. Dictionary can never be empty, as at least
@@ -111,7 +101,9 @@ def apply(tunnel):
# If a gretap tunnel is already existing we can not "simply" change local or
# remote addresses. This returns "Operation not supported" by the Kernel.
# There is no other solution to destroy and recreate the tunnel.
- encap = get_tunnel_encapsulation(interface)
+ encap = ''
+ tmp = get_json_iface_options(interface)
+ if tmp: encap = dict_search('linkinfo.info_kind', tmp)
if 'deleted' in tunnel or 'encapsulation_changed' in tunnel or encap == 'gretap':
if interface in interfaces():