summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-06-27 15:12:28 +0200
committerChristian Poessinger <christian@poessinger.com>2020-06-27 15:12:28 +0200
commitb7358c84b98041f38a5479db654c47cd1beec5ca (patch)
tree5ab0a55ec9f7397076c824dcf1a9d85902d3bb07 /src
parent9d2e6cfec3722f421e21fe971534995757e72701 (diff)
downloadvyos-1x-b7358c84b98041f38a5479db654c47cd1beec5ca.tar.gz
vyos-1x-b7358c84b98041f38a5479db654c47cd1beec5ca.zip
ifconfig: T2653: macsec switch to default dictionary
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/interfaces-macsec.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/conf_mode/interfaces-macsec.py b/src/conf_mode/interfaces-macsec.py
index ca5c32eeb..bd3a15914 100755
--- a/src/conf_mode/interfaces-macsec.py
+++ b/src/conf_mode/interfaces-macsec.py
@@ -34,9 +34,6 @@ from vyos import ConfigError
from vyos import airbag
airbag.enable()
-# XXX: workaround for https://phabricator.vyos.net/T2656
-default = {'security' : {'mka' : {'priority' : '255'}}}
-
# XXX: wpa_supplicant works on the source interface
wpa_suppl_conf = '/run/wpa_supplicant/{source_interface}.conf'
@@ -51,7 +48,7 @@ def get_config():
# retrieve interface default values
base = ['interfaces', 'macsec']
- #default_values = defaults(base)
+ default_values = defaults(base, flat=False)
ifname = os.environ['VYOS_TAGNODE_VALUE']
base = base + [ifname]
@@ -69,7 +66,7 @@ def get_config():
# We have gathered the dict representation of the CLI, but there are
# default options which we need to update into the dictionary
# retrived.
- macsec = dict_merge(default, macsec)
+ macsec = dict_merge(default_values, macsec)
# Add interface instance name into dictionary
macsec.update({'ifname': ifname})