proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-11 20:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: change evpn vni json field format

Browse Source 
Change advertiseSviMacip to advertiseSviMacIp in
json output.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
This commit is contained in:
Chirag Shah 2020-02-11 11:35:53 -08:00
parent 37ae1adbfa
commit 0b509723a0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_evpn_vty.c
View File

@ -380,7 +380,7 @@ static void display_l3vni(struct vty *vty, struct bgp *bgp_vrf,
json_object_string_add(json, "originatorIp", json_object_string_add(json, "originatorIp",
inet_ntoa(bgp_vrf->originator_ip)); inet_ntoa(bgp_vrf->originator_ip));
json_object_string_add(json, "advertiseGatewayMacip", "n/a"); json_object_string_add(json, "advertiseGatewayMacip", "n/a");
json_object_string_add(json, "advertiseSviMacip", "n/a"); json_object_string_add(json, "advertiseSviMacIp", "n/a");
json_object_to_json_string_ext(json, json_object_to_json_string_ext(json,
JSON_C_TO_STRING_NOSLASHESCAPE); JSON_C_TO_STRING_NOSLASHESCAPE);
json_object_string_add(json, "advertisePip", json_object_string_add(json, "advertisePip",
@ -544,13 +544,13 @@ static void display_vni(struct vty *vty, struct bgpevpn *vpn, json_object *json)
"Disabled"); "Disabled");
if (!vpn->advertise_svi_macip && bgp_evpn && if (!vpn->advertise_svi_macip && bgp_evpn &&
bgp_evpn->evpn_info->advertise_svi_macip) bgp_evpn->evpn_info->advertise_svi_macip)
json_object_string_add(json, "advertiseSviMacip", json_object_string_add(json, "advertiseSviMacIp",
"Active"); "Active");
else if (vpn->advertise_svi_macip) else if (vpn->advertise_svi_macip)
json_object_string_add(json, "advertiseSviMacip", json_object_string_add(json, "advertiseSviMacIp",
"Enabled"); "Enabled");
else else
json_object_string_add(json, "advertiseSviMacip", json_object_string_add(json, "advertiseSviMacIp",
"Disabled"); "Disabled");
} else { } else {
vty_out(vty, "VNI: %d", vpn->vni); vty_out(vty, "VNI: %d", vpn->vni);
@ -889,7 +889,7 @@ static void show_l3vni_entry(struct vty *vty, struct bgp *bgp,
prefix_rd2str(&bgp->vrf_prd, buf2, RD_ADDRSTRLEN)); prefix_rd2str(&bgp->vrf_prd, buf2, RD_ADDRSTRLEN));
json_object_string_add(json_vni, "advertiseGatewayMacip", json_object_string_add(json_vni, "advertiseGatewayMacip",
"n/a"); "n/a");
json_object_string_add(json_vni, "advertiseSviMacip", "n/a"); json_object_string_add(json_vni, "advertiseSviMacIp", "n/a");
json_object_to_json_string_ext(json_vni, json_object_to_json_string_ext(json_vni,
JSON_C_TO_STRING_NOSLASHESCAPE); JSON_C_TO_STRING_NOSLASHESCAPE);
json_object_string_add( json_object_string_add(
@ -1072,13 +1072,13 @@ static void show_vni_entry(struct hash_bucket *bucket, void *args[])
json_vni, "advertiseGatewayMacip", "Disabled"); json_vni, "advertiseGatewayMacip", "Disabled");
if (!vpn->advertise_svi_macip && bgp_evpn if (!vpn->advertise_svi_macip && bgp_evpn
&& bgp_evpn->evpn_info->advertise_svi_macip) && bgp_evpn->evpn_info->advertise_svi_macip)
json_object_string_add(json_vni, "advertiseSviMacip", json_object_string_add(json_vni, "advertiseSviMacIp",
"Active"); "Active");
else if (vpn->advertise_svi_macip) else if (vpn->advertise_svi_macip)
json_object_string_add(json_vni, "advertiseSviMacip", json_object_string_add(json_vni, "advertiseSviMacIp",
"Enabled"); "Enabled");
else else
json_object_string_add(json_vni, "advertiseSviMacip", json_object_string_add(json_vni, "advertiseSviMacIp",
"Disabled"); "Disabled");
} else { } else {
vty_out(vty, "%-1s %-10u %-4s %-21s", buf1, vpn->vni, "L2", vty_out(vty, "%-1s %-10u %-4s %-21s", buf1, vpn->vni, "L2",
@ -3944,7 +3944,7 @@ DEFUN(show_bgp_l2vpn_evpn_vni,
bgp_evpn->advertise_gw_macip bgp_evpn->advertise_gw_macip
? "Enabled" ? "Enabled"
: "Disabled"); : "Disabled");
json_object_string_add(json, "advertiseSviMacip", json_object_string_add(json, "advertiseSviMacIp",
bgp_evpn->evpn_info->advertise_svi_macip bgp_evpn->evpn_info->advertise_svi_macip
? "Enabled" : "Disabled"); ? "Enabled" : "Disabled");
json_object_string_add(json, "advertiseAllVnis", json_object_string_add(json, "advertiseAllVnis",