proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 05:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: add json support for BGP L3NHG values

Browse Source 
Some json attributes are missing for L3NHG values.

> PE1# show bgp vrf all detail
> [..]
> Instance vrf-purple:
> BGP table version is 1, local router ID is 27.3.0.85, vrf id 7
> Default local pref 100, local AS 65000
> BGP routing table entry for fe80::4620:ff:feff:ff01/128, version 1
> Paths: (1 available, best #1, vrf vrf-purple)
>   Not advertised to any peer
>   Imported from 10.30.30.30:5:[2]:[0]:[48]:[44:20:00:ff:ff:01]:[128]:[fe80::4620:ff:feff:ff01], VNI 4000  Local
>     ::ffff:a1e:1e1e (metric 20) from 10.30.30.30 (10.30.30.30) announce-nh-self
>       Origin IGP, localpref 100, valid, internal, best (First path received)
>       Extended Community: RT:65000:4000 ET:8
>       Last update: Thu Aug 22 18:23:38 2024
>
> Displayed 1 routes and 1 total paths

> PE1# show bgp vrf all json detail
> {
> "vrf-purple":{
>  "vrfId": 7,
>  "vrfName": "vrf-purple",
>  "tableVersion": 1,
>  "routerId": "27.3.0.85",
>  "defaultLocPrf": 100,
>  "localAS": 65000,
>  "routes": { "fe80::4620:ff:feff:ff01/128": [{"importedFrom":"10.30.30.30:5","l3nhg":false,"l3nhgActive":false, "vni": "4000",
> "aspath":{"string":"Local","segments":[],"length":0},"announceNexthopSelf":true,"origin":"IGP","locPrf":100,
> "valid":true,"version":1,"bestpath":{"overall":true,"selectionReason":"First path received"},
> "extendedCommunity":{"string":"RT:65000:4000 ET:8"},"lastUpdate":{"epoch":1724343817,
> "string":"Thu Aug 22 18:23:37 2024\n"},
> "nexthops":[{"ip":"::ffff:a1e:1e1e","hostname":"PE2","afi":"ipv6",
> "scope":"global","metric":20,"accessible":true,"used":true}],
> "peer":{"peerId":"10.30.30.30","routerId":"10.30.30.30","hostname":"PE2","type":"internal"}}]
>  }  }
> }

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2024-08-22 16:53:55 +02:00
parent 0db604568c
commit 3c2273178d
1 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
bgpd/bgp_route.c
View File

@ -10568,8 +10568,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn,
vty_out(vty, "\n"); vty_out(vty, "\n");
if (path->extra && path->extra->vrfleak && if (path->extra && path->extra->vrfleak && path->extra->vrfleak->parent) {
path->extra->vrfleak->parent && !json_paths) {
struct bgp_path_info *parent_ri; struct bgp_path_info *parent_ri;
struct bgp_dest *dest, *pdest; struct bgp_dest *dest, *pdest;
@ -10579,31 +10578,68 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn,
if (dest && dest->pdest) { if (dest && dest->pdest) {
pdest = dest->pdest; pdest = dest->pdest;
if (is_pi_family_evpn(parent_ri)) { if (is_pi_family_evpn(parent_ri)) {
vty_out(vty, " Imported from "); if (json_paths) {
vty_out(vty, BGP_RD_AS_FORMAT(bgp->asnotation), json_object_string_addf(
(struct prefix_rd *)bgp_dest_get_prefix( json_path, "importedFrom",
pdest)); BGP_RD_AS_FORMAT(bgp->asnotation),
vty_out(vty, ":%pFX, VNI %s", (struct prefix_rd *)
(struct prefix_evpn *) bgp_dest_get_prefix(
bgp_dest_get_prefix(dest), pdest));
vni_buf); if (safi != SAFI_EVPN)
if (CHECK_FLAG(attr->es_flags, ATTR_ES_L3_NHG)) json_object_string_add(json_path,
"vni",
vni_buf);
} else {
vty_out(vty, " Imported from ");
vty_out(vty,
BGP_RD_AS_FORMAT(bgp->asnotation),
(struct prefix_rd *)
bgp_dest_get_prefix(
pdest));
vty_out(vty, ":%pFX, VNI %s",
(struct prefix_evpn *)
bgp_dest_get_prefix(dest),
vni_buf);
}
if (CHECK_FLAG(attr->es_flags, ATTR_ES_L3_NHG) &&
!json_paths) {
vty_out(vty, ", L3NHG %s", vty_out(vty, ", L3NHG %s",
CHECK_FLAG( CHECK_FLAG(
attr->es_flags, attr->es_flags,
ATTR_ES_L3_NHG_ACTIVE) ATTR_ES_L3_NHG_ACTIVE)
? "active" ? "active"
: "inactive"); : "inactive");
vty_out(vty, "\n"); vty_out(vty, "\n");
} else if (json_paths) {
json_object_boolean_add(
json_path, "l3nhg",
CHECK_FLAG(attr->es_flags,
ATTR_ES_L3_NHG));
json_object_boolean_add(
json_path, "l3nhgActive",
CHECK_FLAG(attr->es_flags,
ATTR_ES_L3_NHG_ACTIVE));
}
} else { } else {
vty_out(vty, " Imported from "); if (json_paths) {
vty_out(vty, BGP_RD_AS_FORMAT(bgp->asnotation), json_object_string_addf(
(struct prefix_rd *)bgp_dest_get_prefix( json_path, "importedFrom",
pdest)); BGP_RD_AS_FORMAT(bgp->asnotation),
vty_out(vty, ":%pFX\n", (struct prefix_rd *)
(struct prefix_evpn *) bgp_dest_get_prefix(
bgp_dest_get_prefix(dest)); pdest));
} else {
vty_out(vty, " Imported from ");
vty_out(vty,
BGP_RD_AS_FORMAT(bgp->asnotation),
(struct prefix_rd *)
bgp_dest_get_prefix(
pdest));
vty_out(vty, ":%pFX\n",
(struct prefix_evpn *)
bgp_dest_get_prefix(
dest));
}
} }
} }
} }