summaryrefslogtreecommitdiff
path: root/src/conf_mode/protocols_isis.py
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-08-06 15:30:30 -0500
committerJohn Estabrook <jestabro@vyos.io>2023-08-07 02:17:32 -0500
commit53169630c4d5a46a3876979fbf35cb7cdfc2d632 (patch)
treeb349fdc274d88c396741726956ed4e7133b9e08a /src/conf_mode/protocols_isis.py
parentca76921fb2b90e82221d7280ffd8d0765319ffaa (diff)
downloadvyos-1x-53169630c4d5a46a3876979fbf35cb7cdfc2d632.tar.gz
vyos-1x-53169630c4d5a46a3876979fbf35cb7cdfc2d632.zip
T5319: remove workarounds for defaults in protocols_isis.py
Diffstat (limited to 'src/conf_mode/protocols_isis.py')
-rwxr-xr-xsrc/conf_mode/protocols_isis.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 4c637a99f..197f8131d 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -28,7 +28,6 @@ from vyos.ifconfig import Interface
from vyos.utils.dict import dict_search
from vyos.utils.network import get_interface_config
from vyos.template import render_to_string
-from vyos.xml import defaults
from vyos import ConfigError
from vyos import frr
from vyos import airbag
@@ -69,14 +68,8 @@ def get_config(config=None):
isis.update({'deleted' : ''})
return isis
- # We have gathered the dict representation of the CLI, but there are default
- # options which we need to update into the dictionary retrived.
- # XXX: Note that we can not call defaults(base), as defaults does not work
- # on an instance of a tag node. As we use the exact same CLI definition for
- # both the non-vrf and vrf version this is absolutely safe!
- default_values = defaults(base_path)
# merge in default values
- isis = dict_merge(default_values, isis)
+ isis = conf.merge_defaults(isis, recursive=True)
# We also need some additional information from the config, prefix-lists
# and route-maps for instance. They will be used in verify().