Master: bgp show vpn/encap and RFAPI fixes #113
Conversation
…iguated
by RD
Signed-off-by: Lou Berger <lberger@labn.net>
bgp_update/bgp_withdraw (Issue FRRouting#91) Signed-off-by: G. Paul Ziemba <paulz@labn.net>
show bgp ipv4 vpn
address-family ipv4&6 vpn
Signed-off-by: Lou Berger <lberger@labn.net>
Issued ID'ed by regression Signed-off-by: Lou Berger <lberger@labn.net>
Continous 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-120/ This is a comment from an EXPERIMENTAL automated CI system. |
| @@ -963,17 +963,17 @@ DEFUN (show_bgp_ip_vpn_rd, | |||
| "VPN Route Distinguisher\n" | |||
| JSON_STR) | |||
| { | |||
| int idx_ext_community = 5; | |||
| int idx_rd = 5; | |||
There was a problem hiding this comment.
idx_rd is not going to be 5.
If I enter:
'show ip bgp ipv4 vpn all rd ASN:nn_or_IP-address:nn"
shouldn't we be at 6?
There was a problem hiding this comment.
Additionally, removing the '[ip]' serves only to fragment the command space. I went through and merged the entire show bgp CLI tree so that 'ip' may be optionally prepended some time ago.
| @@ -9478,7 +9478,7 @@ peer_adj_routes (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi, | |||
|
|
|||
| DEFUN (show_ip_bgp_instance_neighbor_advertised_route, | |||
| show_ip_bgp_instance_neighbor_advertised_route_cmd, | |||
| "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 [unicast]>] neighbors <A.B.C.D|X:X::X:X|WORD> [<received-routes|advertised-routes> [route-map WORD]] [json]", | |||
| "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 [unicast]>] neighbors <A.B.C.D|X:X::X:X|WORD> <received-routes|advertised-routes> [route-map WORD] [json]", | |||
There was a problem hiding this comment.
It was my understanding that we are converting to a 'afi safi' format. Shouldn't we loose encap and vpnv4 as afi's then?
| @@ -324,23 +324,7 @@ show_adj_route_encap (struct vty *vty, struct peer *peer, struct prefix_rd *prd) | |||
| return CMD_SUCCESS; | |||
| } | |||
|
|
|||
| enum bgp_show_type | |||
There was a problem hiding this comment.
Doesn't @pguibert6WIND have a commit that modifies this too?
There was a problem hiding this comment.
hello, I think the bgp_show_type should be moved to a single place.
I proposed it in #111
If 113 does it, it is perfect, i wil adapt.
| "show [ip] bgp "BGP_AFI_CMD_STR" vpn [rd ASN:nn_or_IP-address:nn] [json]", | ||
| DEFUN (show_bgp_ip_vpn_all_rd, | ||
| show_bgp_ip_vpn_all_rd_cmd, | ||
| "show bgp "BGP_AFI_CMD_STR" vpn all [rd ASN:nn_or_IP-address:nn] [json]", |
Merged pull request with master Conflicts: bgpd/bgp_mplsvpn.c bgpd/bgp_route.c bgpd/rfapi/rfapi_vty.c
Continous 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-135/ This is a comment from an EXPERIMENTAL automated CI system. |
|
As a note, I am working on this PR as well as #111 on donaldsharp/frr/pr/111 and resolving conflicts over there. |
Restore some missing/broken safi/afi show commands
Bring over fixes to rfapi previous submitted
Include non-vrf changes included in #101