diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-10-06 15:17:17 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-12-16 22:21:36 +0100 |
| commit | 81923562a8a164f7ff9761e976c20420a585907a (patch) | |
| tree | 8fe525e8ab4bb0d07f9eb52b52816e50bcb956cf /src/conf_mode/protocols_rip.py | |
| parent | 7538fd4c518271a517b6753dd664fd07cd86bddd (diff) | |
| download | vyos-1x-81923562a8a164f7ff9761e976c20420a585907a.tar.gz vyos-1x-81923562a8a164f7ff9761e976c20420a585907a.zip | |
frr: T6747: make daemon definitions re-usable for both conf-mode and smoketests
Diffstat (limited to 'src/conf_mode/protocols_rip.py')
| -rwxr-xr-x | src/conf_mode/protocols_rip.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/conf_mode/protocols_rip.py b/src/conf_mode/protocols_rip.py index 9afac544d..994007137 100755 --- a/src/conf_mode/protocols_rip.py +++ b/src/conf_mode/protocols_rip.py @@ -101,18 +101,12 @@ def generate(rip): return None def apply(rip): - rip_daemon = 'ripd' - zebra_daemon = 'zebra' - # Save original configuration prior to starting any commit actions frr_cfg = frr.FRRConfig() - # The route-map used for the FIB (zebra) is part of the zebra daemon - frr_cfg.load_configuration(zebra_daemon) + # The route-map used for the FIB (zebra) is part of the mgmt daemon as of FRR 10.1 + frr_cfg.load_configuration(frr.mgmt_daemon) frr_cfg.modify_section('^ip protocol rip route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)') - frr_cfg.commit_configuration(zebra_daemon) - - frr_cfg.load_configuration(rip_daemon) frr_cfg.modify_section('^key chain \S+', stop_pattern='^exit', remove_stop_mark=True) frr_cfg.modify_section('^router rip', stop_pattern='^exit', remove_stop_mark=True) @@ -124,7 +118,7 @@ def apply(rip): if 'new_frr_config' in rip: frr_cfg.add_before(frr.default_add_before, rip['new_frr_config']) - frr_cfg.commit_configuration(rip_daemon) + frr_cfg.commit_configuration() return None |