diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-05-29 10:35:37 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-05-29 10:35:37 +0200 |
| commit | 687462972361af3d91047721f1d7bd02da7f9dd5 (patch) | |
| tree | 602e813967208822acef8b3be087a60acab4c7fc /src/conf_mode | |
| parent | 939794f297728aacfbc9422b66941614f7f3cf45 (diff) | |
| download | vyos-1x-687462972361af3d91047721f1d7bd02da7f9dd5.tar.gz vyos-1x-687462972361af3d91047721f1d7bd02da7f9dd5.zip | |
rip: T4448: remove default version for RIP
Commit f9e38622 ("rip: T4448: add support to set protocol version on an
interface level") also added the versionspecified on a per interface level.
the RIp version carried a default value of 2 which makes RIPv1 and RIPv2 no
longer working which is dthe default for FRR. Remove the default "2" from the
RIP version specifier to make this behavior work again.
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/protocols_rip.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/conf_mode/protocols_rip.py b/src/conf_mode/protocols_rip.py index e29b23765..c78d90396 100755 --- a/src/conf_mode/protocols_rip.py +++ b/src/conf_mode/protocols_rip.py @@ -56,24 +56,9 @@ def get_config(config=None): # We have gathered the dict representation of the CLI, but there are default # options which we need to update into the dictionary retrived. default_values = defaults(base) - - # T2665: we can not blend in default values of tagNodes - delete and add - # individual values later on ... - if 'interface' in default_values: - del default_values['interface'] # merge in remaining default values rip = dict_merge(default_values, rip) - # T2665: add individual per interface defaults - - # T2665: blend in per interface defaults - if 'interface' in rip: - default_values = defaults(base + ['interface']) - for interface in rip['interface']: - # merge in default values - rip['interface'][interface] = dict_merge(default_values, - rip['interface'][interface]) - # We also need some additional information from the config, prefix-lists # and route-maps for instance. They will be used in verify(). # |