Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib: don't allow to recurse inside route-map node #5840

Merged
merged 1 commit into from
Feb 20, 2020

Conversation

rzalamena
Copy link
Member

Summary

This commit fixes the loading of configuration files with 8 or more route maps:

route-map rm-1 permit 5
route-map rm-1 deny 10
route-map rm-1 permit 15
 ! any config
!
route-map rm2 permit 5
route-map rm2 permit 10
route-map rm2 permit 15
route-map rm2 permit 20
route-map rm2 permit 25
route-map rm2 permit 30
!
! and so on

Failure message:

2020/02/19 20:13:24 BGP: [EC 100663331] nb_callback_configuration: error processing configuration change: error [validation error] event [validate] operation [modify] xpath [/frr-route-map:lib/route-map[name='rm-out-to-reflector']/entry[se
quence='10']/exit-policy]                                                                     
2020/02/19 20:13:24 BGP: [EC 100663337] nb_candidate_commit_prepare: failed to validate candidate configuration
% Reached maximum CLI depth (8)                                                                                                                                                                                                        
% Configuration failed: validation error.

Commit Message

vtysh should handle going back up one level to try the command, there is
no need to be able to recurse inside route-map.

This also fixes a problem with northbound hitting the XPath queue limit
of 8 nodes.

Signed-off-by: Rafael Zalamena rzalamena@opensourcerouting.org

vtysh should handle going back up one level to try the command, there is
no need to be able to recurse inside route-map.

This also fixes a problem with northbound hitting the XPath queue limit
of 8 nodes.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
@LabN-CI
Copy link
Collaborator

LabN-CI commented Feb 19, 2020

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/5840 2f95da3
Date 02/19/2020
Start 16:32:41
Finish 16:58:34
Run-Time 25:53
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2020-02-19-16:32:41.txt
Log autoscript-2020-02-19-16:33:38.log.bz2
Memory 489 494 419

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10792/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10792/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: pkg-js-tools-test-is-missing
W: frr-doc: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200219-13-g2f95da328-0 (missing) -> 7.4-dev-20200219-13-g2f95da328-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200219-13-g2f95da328-0 (missing) -> 7.4-dev-20200219-13-g2f95da328-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200219-13-g2f95da328-0 (missing) -> 7.4-dev-20200219-13-g2f95da328-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200219-13-g2f95da328-0 (missing) -> 7.4-dev-20200219-13-g2f95da328-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200219-13-g2f95da328-0 (missing) -> 7.4-dev-20200219-13-g2f95da328-0~deb10u1

CLANG Static Analyzer Summary

  • Github Pull Request 5840, comparing to Git base SHA 67c5e28
  • Base image data for Git 67c5e28 does not exist - compare skipped

2 Static Analyzer issues remaining.

See details at
https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10792/artifact/shared/static_analysis/index.html

@donaldsharp donaldsharp merged commit 4eb08d6 into FRRouting:master Feb 20, 2020
@rzalamena rzalamena deleted the route-map-recurse branch February 20, 2020 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants