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.

Sign up for GitHub

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

Jump to bottom

Vrf stuff #537

Merged
merged 10 commits into from
May 17, 2017
Merged

Vrf stuff #537

merged 10 commits into from
May 17, 2017

Conversation

donaldsharp
Copy link
Member

  1. Cleanup some SA issues found in coverity

  2. Cleanup the vrf.h api some

    1. Make vrf_enable/vrf_disable only called through special vrf_int.h header
    2. Consolidate the vrf hooks into vrf_init
    3. Delete some unneeded functions.

@donaldsharp
bgpd: Cleanup some SA
46c3ce8 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
@donaldsharp
eigrpd: Cleanup a bunch SA warnings.
057fad8 
1) Cleanup SA warnings, more to come
2) Cleanup some non debug guarded zlog_info code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
@donaldsharp
lib, zebra: Cleanup vrf api some
7922fc6 
Segregate the vrf enable/disable functionality from other vrf
code.  This is to ensure that people are not actually using
the functions when they should not be.  Also document the
why of it properly in the new vrf_int.h header.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
@donaldsharp
*: Remove some unneeded functions
759927a 
vrf_iflist_create -> By the time this is called in enable, the vrf's iflist
is already created.  Additionally this code should be a properly of the vrf
to init/destroy not someone else.

vrf_iflist_terminate -> This function should be a property of vrf deletion
and does not need to be exposed.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
@donaldsharp
*: Consolidate vrf_hooks into vrf_init
6df8536 
We only needed to add/change the vrf callbacks when we initialize
the vrf subsystem.  As such it is not necessary to handle the callbacks
in any other way than through the init function.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
@donaldsharp
lib: Add some more documentation to vrf.h
97b1a80 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
@donaldsharp
Copy link
Member Author

Changing vrf api subtly so wanted some people to look at it, that is why I have asked for your review if you are wondering :)

@NetDEF-CI
Copy link
Collaborator

Continous Integration Result: FAILED

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

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

FreeBSD10 amd64 build: Successful
OmniOS amd64 build: Successful

FreeBSD9 amd64 build: Failed

FreeBSD9 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI004BUILD/ErrorLog/log_pytests.txt
FreeBSD9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI004BUILD/config.status/config.status
FreeBSD9 amd64 build: No useful log found

Ubuntu1204 amd64 build: Failed

Ubuntu1204 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI002BUILD/ErrorLog/log_pytests.txt
Ubuntu1204 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI002BUILD/config.status/config.status
Ubuntu1204 amd64 build: No useful log found

Ubuntu1404 amd64 build: Failed

Ubuntu1404 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI001BUILD/ErrorLog/log_pytests.txt
Ubuntu1404 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI001BUILD/config.status/config.status
Ubuntu1404 amd64 build: No useful log found

Debian8 amd64 build: Failed

Debian8 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI008BLD/ErrorLog/log_pytests.txt
Debian8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI008BLD/config.status/config.status
Debian8 amd64 build: No useful log found

FreeBSD11 amd64 build: Failed

FreeBSD11 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI009BUILD/ErrorLog/log_pytests.txt
FreeBSD11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI009BUILD/config.status/config.status
FreeBSD11 amd64 build: No useful log found

OpenBSD60 amd64 build: Failed

OpenBSD60 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI011BUILD/ErrorLog/log_pytests.txt
OpenBSD60 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI011BUILD/config.status/config.status
OpenBSD60 amd64 build: No useful log found

NetBSD6 amd64 build: Failed

NetBSD6 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI007BUILD/ErrorLog/log_pytests.txt
NetBSD6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI007BUILD/config.status/config.status
NetBSD6 amd64 build: No useful log found

NetBSD7 amd64 build: Failed

NetBSD7 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI012BUILD/ErrorLog/log_pytests.txt
NetBSD7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI012BUILD/config.status/config.status
NetBSD7 amd64 build: No useful log found

Fedora24 amd64 build: Failed

Fedora24 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI015BUILD/ErrorLog/log_pytests.txt
Fedora24 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI015BUILD/config.status/config.status
Fedora24 amd64 build: No useful log found

Ubuntu1604 amd64 build: Failed

Ubuntu1604 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI014BUILD/ErrorLog/log_pytests.txt
Ubuntu1604 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI014BUILD/config.status/config.status
Ubuntu1604 amd64 build: No useful log found

CentOS7 amd64 build: Failed

CentOS7 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI005BUILD/ErrorLog/log_pytests.txt
CentOS7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI005BUILD/config.status/config.status
CentOS7 amd64 build: No useful log found

CentOS6 amd64 build: Failed

CentOS6 amd64 build: Unknown Log <log_pytests.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI006BUILD/ErrorLog/log_pytests.txt
CentOS6 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-691/artifact/CI006BUILD/config.status/config.status
CentOS6 amd64 build: No useful log found

@donaldsharp
Copy link
Member Author

@mwinter-osr Looks like something has gone completely wrong with the CI system here. Can you take a look?

@mwinter-osr
Copy link
Member

It is a real failure, but my parsing of the log_pytest failed. Commit breaks the 'make check'.
Will fix the comment system to parse log correctly tomorrow.

@donaldsharp
tests: Fix vrf_init to have correct call
cc629ae 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
@donaldsharp
bgpd: Revert incorrect handling of data
b84ccd4 
data is actually allowed to be NULL.  So allow
pass in.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
@NetDEF-CI
Copy link
Collaborator

Continous Integration Result: FAILED

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

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

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

Ubuntu1604 amd64 build: Failed

Ubuntu1604 amd64 build: Unknown Log <log_snapcraft.txt>
URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-698/artifact/CI014BUILD/ErrorLog/log_snapcraft.txt
Ubuntu1604 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-698/artifact/CI014BUILD/config.status/config.status
Ubuntu1604 amd64 build: No useful log found

@NetDEF-CI
Copy link
Collaborator

Continous 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-700/

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.

@NetDEF-CI
Copy link
Collaborator

Continous 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-701/

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.

@eqvinox
Copy link
Contributor

eqvinox commented May 17, 2017

Looks good to me, tough maybe it should've been 2 PRs, one with the SA fixes and one with the VRF stuff :)

Either way if no one else comments I'll merge this in the evening [EU].

@eqvinox eqvinox merged commit bac7b7b into FRRouting:master May 17, 2017
@donaldsharp donaldsharp deleted the vrf_stuff branch May 18, 2017 00:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eqvinox eqvinox eqvinox approved these changes

@rwestphal rwestphal rwestphal approved these changes

@vivek-cumulus vivek-cumulus Awaiting requested review from vivek-cumulus

@louberger louberger Awaiting requested review from louberger

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@donaldsharp @NetDEF-CI @mwinter-osr @eqvinox @rwestphal