-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
staticd: forbid blackhole and non-blackhole nexthops in a single route #8158
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/c09c48fa471f3f21f4524f9f48ec34b0/raw/7f866fd1ab8bb77a3ea29e73ece256060223bff1/cr_8158_1614353672.diff | git apply
diff --git a/staticd/static_nb_config.c b/staticd/static_nb_config.c
index 5f61c7d40..db154992f 100644
--- a/staticd/static_nb_config.c
+++ b/staticd/static_nb_config.c
@@ -155,10 +155,12 @@ static bool static_nexthop_create(struct nb_cb_create_args *args,
iter.blackhole = false;
pn_dnode = yang_dnode_get_parent(args->dnode, "path-list");
- yang_dnode_iterate(nexthop_iter_cb, &iter, pn_dnode, "./frr-nexthops/nexthop");
+ yang_dnode_iterate(nexthop_iter_cb, &iter, pn_dnode,
+ "./frr-nexthops/nexthop");
if (iter.blackhole && iter.count > 1) {
- snprintf(args->errmsg, args->errmsg_len,
+ snprintf(
+ args->errmsg, args->errmsg_len,
"Route can not have blackhole and non-blackhole nexthops simultaneously");
return NB_ERR_VALIDATION;
}
If you are a new contributor to FRR, please see our contributing guidelines.
After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
23af0e3
to
0e7644a
Compare
LGTM |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests Ubuntu 16.04 i386 part 8: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO8U16I386-17337/test Topology Tests failed for Topotests Ubuntu 16.04 i386 part 8:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17337/artifact/TOPO8U16I386/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 arm8 part 8: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 8: No useful log foundTopotests Ubuntu 16.04 amd64 part 8: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO8U16AMD64-17337/test Topology Tests failed for Topotests Ubuntu 16.04 amd64 part 8:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17337/artifact/TOPO8U16AMD64/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 arm8 part 6: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 6: No useful log foundTopotests Ubuntu 18.04 amd64 part 8: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO8U18ARM64-17337/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 8:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17337/artifact/TOPO8U18ARM64/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 amd64 part 6: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO6U18AMD64-17337/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 6:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17337/artifact/TOPO6U18AMD64/ErrorLog/log_topotests.txt Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopotests Ubuntu 16.04 i386 part 8: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO8U16I386-17337/test Topology Tests failed for Topotests Ubuntu 16.04 i386 part 8:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17337/artifact/TOPO8U16I386/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 arm8 part 8: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 8: No useful log foundTopotests Ubuntu 16.04 amd64 part 8: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO8U16AMD64-17337/test Topology Tests failed for Topotests Ubuntu 16.04 amd64 part 8:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17337/artifact/TOPO8U16AMD64/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 arm8 part 6: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 6: No useful log foundTopotests Ubuntu 18.04 amd64 part 8: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO8U18ARM64-17337/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 8:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17337/artifact/TOPO8U18ARM64/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 amd64 part 6: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO6U18AMD64-17337/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 6:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17337/artifact/TOPO6U18AMD64/ErrorLog/log_topotests.txt
|
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests Ubuntu 18.04 arm8 part 6: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 6: No useful log foundTopotests Ubuntu 16.04 i386 part 8: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO8U16I386-17345/test Topology Tests failed for Topotests Ubuntu 16.04 i386 part 8:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17345/artifact/TOPO8U16I386/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 arm8 part 8: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 8: No useful log foundTopotests Ubuntu 16.04 amd64 part 8: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO8U16AMD64-17345/test Topology Tests failed for Topotests Ubuntu 16.04 amd64 part 8:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17345/artifact/TOPO8U16AMD64/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 amd64 part 8: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO8U18ARM64-17345/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 8:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17345/artifact/TOPO8U18ARM64/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 amd64 part 6: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO6U18AMD64-17345/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 6:
see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17345/artifact/TOPO6U18AMD64/ErrorLog/log_topotests.txt Successful on other platforms/tests
|
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
1. There were few tests where routes were configured with blackhole and non-blackhole nexthops simultaneously, enhanced tests accordingly and verified in master branch and with PR FRRouting#8158 changes. Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
1. There were few tests where routes were configured with blackhole and non-blackhole nexthops simultaneously, enhanced tests accordingly and verified in master branch and with PR FRRouting#8158 changes. Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
tests: Fix for test failure in PR #8158
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
0e7644a
to
cd07806
Compare
💚 Basic BGPD CI results: SUCCESS, 0 tests failedResults table
For details, please contact louberger |
Continuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-17449/ This is a comment from an automated CI system. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good
PIM test will probably fail, because it is using such nexthops.
This PR will be rebased on top of #8157 once it's merged.