diff options
| author | Emanuele Di Pascale <emanuele@voltanet.io> | 2020-12-22 17:00:39 +0100 |
|---|---|---|
| committer | Emanuele Di Pascale <emanuele@voltanet.io> | 2021-01-09 15:50:17 +0100 |
| commit | 2f1406fc863bace0870681483d0096ba12eef492 (patch) | |
| tree | 6c1856c3292be247bb265fb054dd4d28f230bd43 /tools | |
| parent | tools: add bfdd to frr-reload.py daemons list (diff) | |
| download | frr-2f1406fc863bace0870681483d0096ba12eef492.tar.xz frr-2f1406fc863bace0870681483d0096ba12eef492.zip | |
pathd, tools: fix peer preference config
on one hand, the default value for a peer preference was always being
displayed, and on the other there was some code in frr-reload.py which
was attempting to add a default value to match this behavior, and which
was incorrectly overriding a specified preference. Fix this by removing
this code and making pathd behave like other daemons in this respect,
i.e. not displaying the default value.
Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/frr-reload.py | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py index 5ffa2430b..e95f0529c 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -684,26 +684,6 @@ end log.debug("LINE %-50s: entering new context, %-50s", line, ctx_keys) elif ( - line.startswith("peer ") - and len(ctx_keys) == 4 - and ctx_keys[0].startswith("segment-routing") - and ctx_keys[1].startswith("traffic-eng") - and ctx_keys[2].startswith("pcep") - and ctx_keys[3].startswith("pcc") - ): - # If there is no precedence, we add the default one (255) so - # the line is not removed and added back - m = re.search('peer ([^ ]*)', line) - if (m != None): - (name,) = m.groups() - line = "peer %s precedence 255" % (name,) - - current_context_lines.append(line) - log.debug( - "LINE %-50s: append to current_context_lines, %-50s", line, ctx_keys - ) - - elif ( line.startswith("address-family ") or line.startswith("vnc defaults") or line.startswith("vnc l2-group") @@ -1508,7 +1488,7 @@ def compare_context_objects(newconf, running): elif ( len(running_ctx_keys) == 3 and running_ctx_keys[0].startswith('segment-routing') - and running_ctx_keys[2].startswith('pcep4') + and running_ctx_keys[2].startswith('pcep') ): continue |