summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzsdc <taras@vyos.io>2021-12-29 17:57:38 +0200
committerzsdc <taras@vyos.io>2022-02-07 09:52:37 +0200
commit373132a899cd53eaebedd23bd44702d245ce8165 (patch)
tree3e1b6386480d118df486f7bb8d1bdf104c4ed623 /src
parent1af618103f288d83c51dee3d20e49f06e02b1ac7 (diff)
downloadvyos-1x-373132a899cd53eaebedd23bd44702d245ce8165.tar.gz
vyos-1x-373132a899cd53eaebedd23bd44702d245ce8165.zip
FRR: T4020: Updated CLI options processing for FRR daemons
- Reverted changes from `python/vyos/util.py`. This may lead to unnecessary FRR restart during each boot, depending on a default file content and template, but makes this changeset cleaner. - Fixed typos in node names (extra `>` characters). - Added SNMP module for `isisd` and `ldpd`, since they have it compiled now.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/snmp.py8
-rwxr-xr-xsrc/conf_mode/system_frr.py2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py
index 25dcdf7c6..6c6367045 100755
--- a/src/conf_mode/snmp.py
+++ b/src/conf_mode/snmp.py
@@ -583,9 +583,13 @@ def apply(snmp):
# Enable AgentX in FRR
# This should be done for each daemon individually because common command
# works only if all the daemons started with SNMP support
- frr_daemons_list = ['bgpd', 'ospf6d', 'ospfd', 'ripd', 'zebra']
+ frr_daemons_list = [
+ 'bgpd', 'ospf6d', 'ospfd', 'ripd', 'ripngd', 'isisd', 'ldpd', 'zebra'
+ ]
for frr_daemon in frr_daemons_list:
- call(f'vtysh -c "configure terminal" -d {frr_daemon} -c "agentx" >/dev/null')
+ call(
+ f'vtysh -c "configure terminal" -d {frr_daemon} -c "agentx" >/dev/null'
+ )
return None
diff --git a/src/conf_mode/system_frr.py b/src/conf_mode/system_frr.py
index 0d0b37e00..1af0055f6 100755
--- a/src/conf_mode/system_frr.py
+++ b/src/conf_mode/system_frr.py
@@ -51,7 +51,7 @@ def verify(frr_config):
def generate(frr_config):
# read daemons config file
- daemons_config_current = read_file(config_file, strip_end=False)
+ daemons_config_current = read_file(config_file)
# generate new config file
daemons_config_new = render_to_string('frr/daemons.frr.tmpl', frr_config)
# update configuration file if this is necessary