diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-02-28 10:50:06 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2021-03-06 09:28:41 +0100 |
commit | bab4537ae4c64dd622e69b43c97b79e8e6e63863 (patch) | |
tree | 526d8dc0746e15b7e7facfb2991584cccde7fe37 /smoketest/scripts/cli/test_interfaces_macsec.py | |
parent | f2f60b1d72456d7bb416240a5095bb1bb32bdd0a (diff) | |
download | vyos-1x-bab4537ae4c64dd622e69b43c97b79e8e6e63863.tar.gz vyos-1x-bab4537ae4c64dd622e69b43c97b79e8e6e63863.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()
(cherry picked from commit f13cc56d665a91ff3fac47df260301afefb1a3a5)
Diffstat (limited to 'smoketest/scripts/cli/test_interfaces_macsec.py')
-rwxr-xr-x | smoketest/scripts/cli/test_interfaces_macsec.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/smoketest/scripts/cli/test_interfaces_macsec.py b/smoketest/scripts/cli/test_interfaces_macsec.py index d6bef993a..2f1898b6f 100755 --- a/smoketest/scripts/cli/test_interfaces_macsec.py +++ b/smoketest/scripts/cli/test_interfaces_macsec.py @@ -25,6 +25,7 @@ from vyos.configsession import ConfigSessionError from vyos.ifconfig import Section from vyos.util import cmd from vyos.util import read_file +from vyos.util import get_json_iface_options from vyos.util import process_named_running def get_config_value(interface, key): @@ -33,13 +34,7 @@ def get_config_value(interface, key): return tmp[0] def get_cipher(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] + tmp = get_json_iface_options(interface) return tmp['linkinfo']['info_data']['cipher_suite'].lower() class MACsecInterfaceTest(BasicInterfaceTest.BaseTest): |