proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 06:03:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Add advertsie-all-vni in show bgp neighbor

Browse Source 
Ticket: CM-17249
Review: CCR-6558
Testing: Manual

Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
This commit is contained in:
Mitesh Kanjariya 2017-08-07 13:57:44 -07:00
parent d77114b704
commit dff8f48da3
3 changed files with 71 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
bgpd/bgp_evpn.c
View File

@ -2200,43 +2200,54 @@ bgp_evpn_route2json (struct prefix_evpn *p, json_object *json)
if (!json) if (!json)
return; return;
if (p->prefix.route_type == BGP_EVPN_IMET_ROUTE) if (p->prefix.route_type == BGP_EVPN_IMET_ROUTE) {
{ json_object_int_add (json, "routeType", p->prefix.route_type);
json_object_int_add (json, "routeType", p->prefix.route_type); json_object_int_add (json, "ethTag", 0);
json_object_int_add (json, "ethTag", 0); json_object_int_add (json,
json_object_int_add (json, "ipLen", IS_EVPN_PREFIX_IPADDR_V4 (p) ? IPV4_MAX_BITLEN : IPV6_MAX_BITLEN); "ipLen",
json_object_string_add (json, "ip", inet_ntoa (p->prefix.ip.ipaddr_v4)); IS_EVPN_PREFIX_IPADDR_V4 (p) ?
} IPV4_MAX_BITLEN : IPV6_MAX_BITLEN);
else if (p->prefix.route_type == BGP_EVPN_MAC_IP_ROUTE) json_object_string_add (json, "ip",
{ inet_ntoa (p->prefix.ip.ipaddr_v4));
if (IS_EVPN_PREFIX_IPADDR_NONE(p)) }
{ else if (p->prefix.route_type == BGP_EVPN_MAC_IP_ROUTE) {
json_object_int_add (json, "routeType", p->prefix.route_type); if (IS_EVPN_PREFIX_IPADDR_NONE(p)) {
json_object_int_add (json, "esi", 0); /* TODO: we don't support esi yet */ json_object_int_add (json, "routeType", p->prefix.route_type);
json_object_int_add (json, "ethTag", 0); json_object_int_add (json, "esi", 0); /* TODO: we don't support esi yet */
json_object_int_add (json, "macLen", 8 * ETHER_ADDR_LEN); json_object_int_add (json, "ethTag", 0);
json_object_string_add (json, "mac", prefix_mac2str (&p->prefix.mac, buf1, sizeof (buf1))); json_object_int_add (json, "macLen", 8 * ETH_ALEN);
} json_object_string_add (json, "mac",
else prefix_mac2str (&p->prefix.mac,
{ buf1, sizeof (buf1)));
u_char family; } else {
u_char family;
family = IS_EVPN_PREFIX_IPADDR_V4(p) ? \ family = IS_EVPN_PREFIX_IPADDR_V4(p) ? \
AF_INET : AF_INET6; AF_INET : AF_INET6;
json_object_int_add (json, "routeType", p->prefix.route_type); json_object_int_add (json, "routeType",
json_object_int_add (json, "esi", 0); /* TODO: we don't support esi yet */ p->prefix.route_type);
json_object_int_add (json, "ethTag", 0); json_object_int_add (json, "esi", 0); /* TODO: we don't support esi yet */
json_object_int_add (json, "macLen", 8 * ETHER_ADDR_LEN); json_object_int_add (json, "ethTag", 0);
json_object_string_add (json, "mac", prefix_mac2str (&p->prefix.mac, buf1, sizeof (buf1))); json_object_int_add (json, "macLen",
json_object_int_add (json, "ipLen", IS_EVPN_PREFIX_IPADDR_V4 (p) ? IPV4_MAX_BITLEN : IPV6_MAX_BITLEN); 8 * ETH_ALEN);
json_object_string_add (json, "ip", inet_ntop (family, &p->prefix.ip.ip.addr, buf2, PREFIX2STR_BUFFER)); json_object_string_add (json, "mac",
} prefix_mac2str (&p->prefix.mac,
} buf1,
else sizeof (buf1)));
{ json_object_int_add (json, "ipLen",
/* Currently, this is to cater to other AF_ETHERNET code. */ IS_EVPN_PREFIX_IPADDR_V4 (p) ?
} IPV4_MAX_BITLEN :
IPV6_MAX_BITLEN);
json_object_string_add (json, "ip",
inet_ntop (family,
&p->prefix.ip.ip.addr,
buf2,
PREFIX2STR_BUFFER));
}
} else {
/* Currently, this is to cater to other AF_ETHERNET code. */
}
return; return;
} }

2
bgpd/bgp_evpn_vty.c
View File

@ -174,7 +174,7 @@ static void show_import_rt_entry(struct hash_backet *backet, void *args[])
vty = args[0]; vty = args[0];
json = args[1]; json = args[1];
display_import_rt(vty, irt); display_import_rt(vty, irt, json);
return; return;
} }

36
bgpd/bgp_vty.c
View File

@ -7396,14 +7396,14 @@ static void bgp_show_peer_afi(struct vty *vty, struct peer *p, afi_t afi,
safi_t safi, u_char use_json, safi_t safi, u_char use_json,
json_object *json_neigh) json_object *json_neigh)
{ {
struct bgp_filter *filter; struct bgp_filter *filter;
struct peer_af *paf; struct peer_af *paf;
char orf_pfx_name[BUFSIZ]; char orf_pfx_name[BUFSIZ];
int orf_pfx_count; int orf_pfx_count;
json_object *json_af = NULL; json_object *json_af = NULL;
json_object *json_prefA = NULL; json_object *json_prefA = NULL;
json_object *json_prefB = NULL; json_object *json_prefB = NULL;
json_object *json_addr = NULL; json_object *json_addr = NULL;
if (use_json) { if (use_json) {
json_addr = json_object_new_object(); json_addr = json_object_new_object();
@ -7602,6 +7602,12 @@ static void bgp_show_peer_afi(struct vty *vty, struct peer *p, afi_t afi,
"defaultNotSent"); "defaultNotSent");
} }
if (afi == AFI_L2VPN && safi == SAFI_EVPN) {
if (p->bgp->advertise_all_vni)
json_object_boolean_true_add(json_addr,
"advertiseAllVnis");
}
if (filter->plist[FILTER_IN].name if (filter->plist[FILTER_IN].name
|| filter->dlist[FILTER_IN].name || filter->dlist[FILTER_IN].name
|| filter->aslist[FILTER_IN].name || filter->aslist[FILTER_IN].name
@ -7867,6 +7873,12 @@ static void bgp_show_peer_afi(struct vty *vty, struct peer *p, afi_t afi,
vty_out(vty, " default not sent\n"); vty_out(vty, " default not sent\n");
} }
/* advertise-vni-all */
if (afi == AFI_L2VPN && safi == SAFI_EVPN) {
if (p->bgp->advertise_all_vni)
vty_out(vty, " advertise-all-vni\n");
}
if (filter->plist[FILTER_IN].name if (filter->plist[FILTER_IN].name
|| filter->dlist[FILTER_IN].name || filter->dlist[FILTER_IN].name
|| filter->aslist[FILTER_IN].name || filter->aslist[FILTER_IN].name
@ -9768,10 +9780,10 @@ static int bgp_show_neighbor(struct vty *vty, struct bgp *bgp,
static void bgp_show_all_instances_neighbors_vty(struct vty *vty, static void bgp_show_all_instances_neighbors_vty(struct vty *vty,
u_char use_json) u_char use_json)
{ {
struct listnode *node, *nnode; struct listnode *node, *nnode;
struct bgp *bgp; struct bgp *bgp;
json_object *json = NULL; json_object *json = NULL;
int is_first = 1; int is_first = 1;
if (use_json) if (use_json)
vty_out(vty, "{\n"); vty_out(vty, "{\n");