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

Fix a number of VPN/Encap SAFI related issues (no VRF CLI changes) #83

Merged
merged 7 commits into from
Jan 19, 2017
Merged

Fix a number of VPN/Encap SAFI related issues (no VRF CLI changes) #83

merged 7 commits into from
Jan 19, 2017

Conversation

louberger
Copy link
Member

Partial replacement for #75 (doesn't include VRF commands):
bgpd: use address-family in show running for vpn&encap (Issue #80)

bgpd rfapi: fix issue where advertised prefixes were not being disambiguated
               by RD

bgpd rfapi: use VN as nexthop for MPLS tunnels too
     Also minor show format cleanup

bgpd: allow VPN next hop to be different AFI than NLRI next hop (Issue #71)

bgpd: fix RD stomping by update group code (Issue #71)

bgpd: partial revert of vpn/encap safi show changes (Issue #14)
      To remove commands duplicated in bgp_mplsvpn/_encap
      Also until vpn/encap specific show pieces are merged into
      generic afi/safi show.

@louberger
bgpd: partial revert of vpn/encap safi show changes (Issue FRRouting#14)
4575cfc 
      To remove commands duplicated in bgp_mplsvpn/_encap
      Also until vpn/encap specific show pieces are merged into
      generic afi/safi show.

Signed-off-by: Lou Berger <lberger@labn.net>
@louberger
bgpd: fix RD stomping by update group code (Issue FRRouting#71)
9857daf 
Signed-off-by: Lou Berger <lberger@labn.net>
@louberger
bgpd: allow VPN next hop to be different AFI than NLRI next hop (Issue …
4c6f219 
…FRRouting#71)

Signed-off-by: Lou Berger <lberger@labn.net>
@louberger
bgpd rfapi: use VN as nexthop for MPLS tunnels too
764581d 
     Also minor show format cleanup

Signed-off-by: Lou Berger <lberger@labn.net>
@louberger
bgpd rfapi: fix issue where advertised prefixes were not being disamb…
d1dc07b 
…iguated

    	   by RD

Signed-off-by: Lou Berger <lberger@labn.net>
@louberger
bgpd: use address-family <afi> <safi> in show running for vpn&encap (…
24d3752 
…Issue FRRouting#80)

Signed-off-by: Lou Berger <lberger@labn.net>
@louberger louberger mentioned this pull request Jan 17, 2017
Closed
@NetDEF-CI
Copy link
Collaborator

Continous Integration Result: FAILED

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

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

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

OmniOS amd64 build: Failed

OmniOS 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-64/

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-81/

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
eqvinox reviewed Jan 18, 2017
View reviewed changes
bgpd/bgp_route.c
(p->family == AF_INET6 || peer_cap_enhe(peer))) || \
(safi == SAFI_ENCAP && attr->extra->mp_nexthop_len == 16))
((safi == SAFI_ENCAP || safi != SAFI_MPLS_VPN) &&\
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't look correct...
(safi == SAFI_ENCAP || safi != SAFI_MPLS_VPN)

The != is supposed to be a ==?

@louberger
bgpd: fix typo in VPN next hop V6 test (Issue FRRouting#71)
7a4732c 
      On top of:
      bgpd: allow VPN next hop to be different AFI than NLRI next
      	    hop (Issue FRRouting#71)

Signed-off-by: Lou Berger <lberger@labn.net>
@NetDEF-CI
Copy link
Collaborator

Continous Integration Result: FAILED

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

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: Failed

Checkout code: Failed

Checkout code: 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-84/

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.

This was referenced Jan 18, 2017
Merged
Closed
Closed
Closed
@eqvinox eqvinox merged commit 190a5df into FRRouting:stable/2.0 Jan 19, 2017
donaldsharp added a commit that referenced this pull request Jan 20, 2017
@donaldsharp
Merge pull request #90 from LabNConsulting/remotes/origin/working/mas…
e5fe6d5 
…ter/patch-set/2a-no-vrf

Master version of #83 Fix a number of VPN/Encap SAFI related issues (no VRF CLI changes)
@louberger louberger deleted the working/2.0/patch-set/2-no-vrf branch February 2, 2017 03:04
cfra referenced this pull request in opensourcerouting/frr Nov 29, 2018
@riw777
Merge pull request #83 from LabNConsulting/working/nh-vrf-in-bgp-show
2ebfe53 
bgp: tolerate route-table-show header changes of FRR PR 2045
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Jan 21, 2021
@vivek-cumulus
bgpd: Fix and enhance 'show neighbors graceful-restart'
a8eb2df 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Mar 9, 2023
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
40ff54c 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Mar 10, 2023
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
2b8f03d 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Mar 14, 2023
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
63d160b 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Mar 20, 2023
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
22fb82f 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Mar 21, 2023
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
a2c62d0 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Mar 27, 2023
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
26a553b 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Mar 31, 2023
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
af9a7ab 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Dec 19, 2024
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
95beda3 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Jan 3, 2025
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
f8e65f6 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Jan 6, 2025
@vivek-cumulus @donaldsharp
bgpd: Fix and enhance 'show neighbors graceful-restart'
a3ed894 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Jan 13, 2025
@vivek-cumulus @chiragshah6
bgpd: Fix and enhance 'show neighbors graceful-restart'
637bafc 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
donaldsharp pushed a commit to donaldsharp/frr that referenced this pull request Feb 5, 2025
@vivek-cumulus @chiragshah6
bgpd: Fix and enhance 'show neighbors graceful-restart'
38d6ad4 
Ensure that the 'show bgp neighbors graceful-restart' command works for
peers in a VRF (BGP instance) as well as doesn't require the incorrect
AFI parameter.

Also, refine the code and the command output such that this is a subset
of the 'show bgp neighbors' output for the neighbor, both in the CLI
output and in JSON.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Testing Done:
1. Manual test with global and VRF peerings
2. precommit - job FRRouting#82 -- 2 failures are existing failures
3. bgp-min - job FRRouting#83 -- 2 failures are existing failures
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eqvinox eqvinox eqvinox left review comments

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

Successfully merging this pull request may close these issues.
3 participants
@louberger @NetDEF-CI @eqvinox