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_pim.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_pim.py')
| -rwxr-xr-x | src/conf_mode/protocols_pim.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py index 79294a1f0..9ef734eff 100755 --- a/src/conf_mode/protocols_pim.py +++ b/src/conf_mode/protocols_pim.py @@ -131,8 +131,7 @@ def generate(pim): return None def apply(pim): - pim_daemon = 'pimd' - pim_pid = process_named_running(pim_daemon) + pim_pid = process_named_running(frr.pim_daemon) if not pim or 'deleted' in pim: if 'deleted' in pim: @@ -146,7 +145,7 @@ def apply(pim): # Save original configuration prior to starting any commit actions frr_cfg = frr.FRRConfig() - frr_cfg.load_configuration(pim_daemon) + frr_cfg.load_configuration(frr.pim_daemon) frr_cfg.modify_section(f'^ip pim') frr_cfg.modify_section(f'^ip igmp') @@ -158,7 +157,7 @@ def apply(pim): if 'frr_pimd_config' in pim: frr_cfg.add_before(frr.default_add_before, pim['frr_pimd_config']) - frr_cfg.commit_configuration(pim_daemon) + frr_cfg.commit_configuration(frr.pim_daemon) return None if __name__ == '__main__': |