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

1626 #1628

Closed
wants to merge 1 commit into from
Closed

1626 #1628

wants to merge 1 commit into from

Conversation

donaldsharp
Copy link
Member

Cleanup the bgp_rfapi_cfg_write function after Lou's commit.

@LabN-CI
Copy link
Collaborator

LabN-CI commented Jan 12, 2018

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/1628 6cd2253
Date 01/11/2018
Start 18:40:09
Finish 19:03:11
Run-Time 23:02
Total 1808
Pass 1808
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2018-01-11-18:40:09.txt
Log autoscript-2018-01-11-18:40:45.log.bz2

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2301/

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

Get source and apply patch from patchwork: Successful

Building Stage: Successful

Basic Tests: Failed

Static analyzer (clang): Successful
IPv6 protocols on Ubuntu 14.04: Successful
CentOS 6 rpm pkg check: Successful
Ubuntu 16.04 deb pkg check: Successful
Ubuntu 12.04 deb pkg check: Successful
Fedora 24 rpm pkg check: Successful
Addresssanitizer topotest: Successful
Debian 8 deb pkg check: Successful
CentOS 7 rpm pkg check: Successful
Debian 9 deb pkg check: Successful
IPv4 protocols on Ubuntu 14.04: Successful
IPv4 ldp protocol on Ubuntu 16.04: Successful
Ubuntu 14.04 deb pkg check: Successful

Topology tests on Ubuntu 16.04 amd64: Failed

Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPOU1604-2301/test

Topology Tests failed for Topology tests on Ubuntu 16.04 amd64:

2018-01-11 16:01:08,885 ERROR: ******************************************************************************
2018-01-11 16:01:08,889 ERROR: Test Target Summary                                                  Pass Fail
2018-01-11 16:01:08,890 ERROR: ******************************************************************************
2018-01-11 16:01:08,890 ERROR: 6    r3     See R1s address +10.19 secs                              0    1
2018-01-11 16:01:08,890 ERROR: 17   r1     Remote Registration +10.36 secs                          0    1
2018-01-11 16:01:08,890 ERROR: 19   r4     Remote Registration +10.41 secs                          0    1
2018-01-11 16:01:08,891 ERROR: 24   ce2    Local and remote routes +10.45 secs                      0    1
2018-01-11 16:01:08,891 ERROR: 30   r1     VPN SAFI                                                 0    1
2018-01-11 16:01:08,891 ERROR: 31   r2     VPN SAFI                                                 0    1
2018-01-11 16:01:08,892 ERROR: 32   r3     VPN SAFI                                                 0    1
2018-01-11 16:01:08,892 ERROR: 33   r4     VPN SAFI                                                 0    1
2018-01-11 16:01:08,892 ERROR: ******************************************************************************
2018-01-11 16:01:08,892 ERROR: Total 49                                                             32   8
2018-01-11 16:01:08,893 ERROR: ******************************************************************************
2018-01-11 16:01:08,893 ERROR: See /tmp/topotests/bgp_direct_to_bgp_vpn.test_bgp_direct_to_bgp_vpn/output.log for details of errors
2018-01-11 16:01:08,901 ERROR: assert failed at "bgp_direct_to_bgp_vpn.test_bgp_direct_to_bgp_vpn/test_run_lu_tests": 8 tests failed
assert '8 tests failed' == 'See summary output above'
  - 8 tests failed
  + See summary output above

see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2301/artifact/TOPOU1604/ErrorLog/log_topotests.txt

Topology Tests memory analysis: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2301/artifact/TOPOU1604/MemoryLeaks/

CLANG Static Analyzer Summary

  • Github Pull Request 1628, comparing to Git base SHA c124004

No Changes in Static Analysis warnings compared to base

21 Static Analyzer issues remaining.

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

@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-2301/

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


CLANG Static Analyzer Summary

  • Github Pull Request 1628, comparing to Git base SHA c124004

No Changes in Static Analysis warnings compared to base

21 Static Analyzer issues remaining.

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

@louberger
Copy link
Member

@donaldsharp let's do these as separate PRs. merge #1626 then we'll do this one.

(rfg->type == RFAPI_GROUP_CFG_VRF ? "" : "bgp "),
afistr,
rfg->plist_export_bgp_name
[afi]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're commenting on a removed hunk

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup, did the review off line and added the comment in wrong place. should have been on lines below (3974)

afistr,
rfg->plist_redist_name
[ZEBRA_ROUTE_BGP_DIRECT]
[afi]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment as above (won't repeat for other cases)

(rfg->type == RFAPI_GROUP_CFG_VRF ? "" : "bgp "),
afistr,
rfg->plist_export_bgp_name
[afi]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're commenting on a removed hunk

if (rfg->routemap_redist_name
[ZEBRA_ROUTE_BGP_DIRECT_EXT]) {
if (rfg->plist_redist_name
[ZEBRA_ROUTE_BGP_DIRECT_EXT][afi]) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of line breaks before indexes -- better to remove whitespace on the indent than to add white space that has semantic implications.

* protocols here
*/
if (rfg->plist_redist_name[ZEBRA_ROUTE_BGP_DIRECT]
[afi]) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above...

The bgp_rfapi-cfg_write function had some obvious reindentation
changes that could be made.  This should clean it up
to be a bit more readable.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com.
@donaldsharp
Copy link
Member Author

@louberger I have run clang-format over the changes as we talked about.

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2332/

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

Get source and apply patch from patchwork: Successful

Building Stage: Failed

Debian8 amd64 build: Successful
FreeBSD11 amd64 build: Successful
OpenBSD60 amd64 build: Successful
NetBSD6 amd64 build: Successful
CentOS7 amd64 build: Successful
Debian9 amd64 build: Successful
OmniOS amd64 build: Successful
CentOS6 amd64 build: Successful
NetBSD7 amd64 build: Successful
FreeBSD9 amd64 build: Successful
Ubuntu1604 amd64 build: Successful
Ubuntu1204 amd64 build: Successful
FreeBSD10 amd64 build: Successful
Ubuntu1404 amd64 build: Successful

Fedora24 amd64 build: Failed

Make failed for Fedora24 amd64 build:
(see full make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2332/artifact/CI015BUILD/ErrorLog/log_make.txt)

In file included from ./lib/zebra.h:138:0,
                 from pimd/pim_assert.c:20:
/usr/include/linux/in.h:28:3: error: redeclaration of enumerator IPPROTO_IP
   IPPROTO_IP = 0,  /* Dummy protocol for TCP  */
   ^
/usr/include/netinet/in.h:42:5: note: previous definition of IPPROTO_IP was here
     IPPROTO_IP = 0,    /* Dummy protocol for TCP.  */
     ^~~~~~~~~~
/usr/include/linux/in.h:30:3: error: redeclaration of enumerator IPPROTO_ICMP

Fedora24 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2332/artifact/CI015BUILD/config.status/config.status

@donaldsharp donaldsharp deleted the 1626 branch January 16, 2018 16:41
@FRRouting FRRouting deleted a comment from LabN-CI Jan 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants