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/policy.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/policy.py')
| -rwxr-xr-x | src/conf_mode/policy.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/conf_mode/policy.py b/src/conf_mode/policy.py index a5963e72c..aef9b96c4 100755 --- a/src/conf_mode/policy.py +++ b/src/conf_mode/policy.py @@ -279,14 +279,11 @@ def generate(policy): def apply(policy): - bgp_daemon = 'bgpd' - 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(bgp_daemon) + frr_cfg.load_configuration(frr.bgp_daemon) frr_cfg.modify_section(r'^bgp as-path access-list .*') frr_cfg.modify_section(r'^bgp community-list .*') frr_cfg.modify_section(r'^bgp extcommunity-list .*') @@ -295,10 +292,10 @@ def apply(policy): remove_stop_mark=True) if 'new_frr_config' in policy: frr_cfg.add_before(frr.default_add_before, policy['new_frr_config']) - frr_cfg.commit_configuration(bgp_daemon) + frr_cfg.commit_configuration(frr.bgp_daemon) # The route-map used for the FIB (zebra) is part of the zebra daemon - frr_cfg.load_configuration(zebra_daemon) + frr_cfg.load_configuration(frr.zebra_daemon) frr_cfg.modify_section(r'^access-list .*') frr_cfg.modify_section(r'^ipv6 access-list .*') frr_cfg.modify_section(r'^ip prefix-list .*') @@ -307,7 +304,7 @@ def apply(policy): remove_stop_mark=True) if 'new_frr_config' in policy: frr_cfg.add_before(frr.default_add_before, policy['new_frr_config']) - frr_cfg.commit_configuration(zebra_daemon) + frr_cfg.commit_configuration(frr.zebra_daemon) return None |