diff options
author | Christian Breunig <christian@breunig.cc> | 2024-03-02 08:40:23 +0100 |
---|---|---|
committer | Christian Breunig <christian@breunig.cc> | 2024-03-02 08:43:57 +0100 |
commit | 298bcc5cb90c4c83981ec4baaaa0db785306867d (patch) | |
tree | 6093ed6486865ec8c325877a3d9e8afe38ddf50f /src/conf_mode/protocols_ospf.py | |
parent | ed2c288c8a9031f91acf76d20b84e2002696981c (diff) | |
download | vyos-1x-298bcc5cb90c4c83981ec4baaaa0db785306867d.tar.gz vyos-1x-298bcc5cb90c4c83981ec4baaaa0db785306867d.zip |
ospf: T5717: sync code with ospfv3 implementation
Diffstat (limited to 'src/conf_mode/protocols_ospf.py')
-rwxr-xr-x | src/conf_mode/protocols_ospf.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py index 34cf49286..695842795 100755 --- a/src/conf_mode/protocols_ospf.py +++ b/src/conf_mode/protocols_ospf.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2021-2023 VyOS maintainers and contributors +# Copyright (C) 2021-2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -91,6 +91,8 @@ def get_config(config=None): for protocol in ['babel', 'bgp', 'connected', 'isis', 'kernel', 'rip', 'static']: if dict_search(f'redistribute.{protocol}', ospf) is None: del default_values['redistribute'][protocol] + if not bool(default_values['redistribute']): + del default_values['redistribute'] for interface in ospf.get('interface', []): # We need to reload the defaults on every pass b/c of @@ -213,7 +215,7 @@ def verify(ospf): raise ConfigError(f'Segment routing prefix {prefix} cannot have both explicit-null '\ f'and no-php-flag configured at the same time.') - # Check for index ranges being larger than the segment routing global block + # Check for index ranges being larger than the segment routing global block if dict_search('segment_routing.global_block', ospf): g_high_label_value = dict_search('segment_routing.global_block.high_label_value', ospf) g_low_label_value = dict_search('segment_routing.global_block.low_label_value', ospf) |