summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-07-22 08:37:49 +0200
committerGitHub <noreply@github.com>2023-07-22 08:37:49 +0200
commit7321fa364a8c8c0b1c2fe10aa6580171e5860e4d (patch)
tree324cb3520a7f67c05fc2efc36bfa5aacf16ae940 /src/conf_mode
parente9153730c76f96fb585df6276b6505a00b14b17b (diff)
parent9e5d0384a0b25949edfd0dfc065b6fe572f943e7 (diff)
downloadvyos-1x-7321fa364a8c8c0b1c2fe10aa6580171e5860e4d.tar.gz
vyos-1x-7321fa364a8c8c0b1c2fe10aa6580171e5860e4d.zip
Merge pull request #2104 from c-po/t5377-ospf-gr
ospf: T5377: add graceful restart FRR feature (RFC 3623)
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/protocols_ospf.py2
-rwxr-xr-xsrc/conf_mode/protocols_ospfv3.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py
index 509d4f501..f2075d25b 100755
--- a/src/conf_mode/protocols_ospf.py
+++ b/src/conf_mode/protocols_ospf.py
@@ -88,6 +88,8 @@ def get_config(config=None):
del default_values['area']['area_type']['nssa']
if 'mpls_te' not in ospf:
del default_values['mpls_te']
+ if 'graceful_restart' not in ospf:
+ del default_values['graceful_restart']
for protocol in ['babel', 'bgp', 'connected', 'isis', 'kernel', 'rip', 'static', 'table']:
# table is a tagNode thus we need to clean out all occurances for the
diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py
index 7f50d8624..fbea51f56 100755
--- a/src/conf_mode/protocols_ospfv3.py
+++ b/src/conf_mode/protocols_ospfv3.py
@@ -83,6 +83,8 @@ def get_config(config=None):
# need to check this first and probably drop that key.
if dict_search('default_information.originate', ospfv3) is None:
del default_values['default_information']
+ if 'graceful_restart' not in ospfv3:
+ del default_values['graceful_restart']
# XXX: T2665: we currently have no nice way for defaults under tag nodes,
# clean them out and add them manually :(