diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-11-27 10:32:01 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-11-27 10:32:01 +0100 |
| commit | 72472b84b065005b05d134456e442073f07badf5 (patch) | |
| tree | 0bd02429c50a580d0d8f756496afefd2e60e5881 | |
| parent | 9d79e9dae21819a5f92c2394e9e8360344d50c94 (diff) | |
| download | vyos-1x-72472b84b065005b05d134456e442073f07badf5.tar.gz vyos-1x-72472b84b065005b05d134456e442073f07badf5.zip | |
bfd: T3753: FRR 8 added support for bfdd when using frr-reload.py
| -rw-r--r-- | python/vyos/frr.py | 3 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_bfd.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/python/vyos/frr.py b/python/vyos/frr.py index df6849472..616e4b3c9 100644 --- a/python/vyos/frr.py +++ b/python/vyos/frr.py @@ -84,7 +84,8 @@ if DEBUG: LOG.addHandler(ch2) _frr_daemons = ['zebra', 'bgpd', 'fabricd', 'isisd', 'ospf6d', 'ospfd', 'pbrd', - 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd'] + 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd', + 'bfdd'] path_vtysh = '/usr/bin/vtysh' path_frr_reload = '/usr/lib/frr/frr-reload.py' diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py index 539fd7b8e..59083efb8 100755 --- a/src/conf_mode/protocols_bfd.py +++ b/src/conf_mode/protocols_bfd.py @@ -95,12 +95,14 @@ def generate(bfd): bfd['new_frr_config'] = render_to_string('frr/bfdd.frr.tmpl', bfd) def apply(bfd): + bfd_daemon = 'bfdd' + # Save original configuration prior to starting any commit actions frr_cfg = frr.FRRConfig() - frr_cfg.load_configuration() + frr_cfg.load_configuration(bfd_daemon) frr_cfg.modify_section('^bfd', '') frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', bfd['new_frr_config']) - frr_cfg.commit_configuration() + frr_cfg.commit_configuration(bfd_daemon) return None |