From 23c7421d4d8ef0a85194103e1cf931de4950c2b0 Mon Sep 17 00:00:00 2001 From: Chirag Shah Date: Tue, 10 Sep 2019 18:36:05 -0700 Subject: [PATCH] bgpd: evpn pip display pip values Display pip system mac and ip values in per vni detail output. Ticket:CM-26190 Reviewed By: Testing Done: Following new values add to the below output for L3vni: System-IP: 27.0.0.11 System-MAC: 00:02:00:00:00:2e Router-MAC: 44:38:39:ff:ff:01 TORC11# show bgp l2vpn evpn vni 4002 VNI: 4002 (known to the kernel) Type: L3 Tenant VRF: vrf2 RD: 141.2.1.2:2 Originator IP: 36.0.0.11 Advertise-gw-macip : n/a Advertise-pip: Yes System-IP: 27.0.0.11 System-MAC: 00:02:00:00:00:2e Router-MAC: 44:38:39:ff:ff:01 Import Route Target: 5546:4002 Export Route Target: 5546:4002 Signed-off-by: Chirag Shah --- bgpd/bgp_evpn_vty.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index 5508ab99b4..d74504fc10 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -364,6 +364,7 @@ static void display_l3vni(struct vty *vty, struct bgp *bgp_vrf, struct ecommunity *ecom; json_object *json_import_rtl = NULL; json_object *json_export_rtl = NULL; + char buf2[ETHER_ADDR_STRLEN]; json_import_rtl = json_export_rtl = 0; @@ -382,6 +383,17 @@ static void display_l3vni(struct vty *vty, struct bgp *bgp_vrf, json_object_string_add(json, "advertiseSviMacip", "n/a"); json_object_to_json_string_ext(json, JSON_C_TO_STRING_NOSLASHESCAPE); + json_object_string_add(json, "advertisePip", + bgp_vrf->evpn_info->advertise_pip ? + "Enabled" : "Disabled"); + json_object_string_add(json, "sysIP", + inet_ntoa(bgp_vrf->evpn_info->pip_ip)); + json_object_string_add(json, "sysMac", + prefix_mac2str(&bgp_vrf->evpn_info->pip_rmac, + buf2, sizeof(buf2))); + json_object_string_add(json, "rmac", + prefix_mac2str(&bgp_vrf->rmac, + buf2, sizeof(buf2))); } else { vty_out(vty, "VNI: %d", bgp_vrf->l3vni); vty_out(vty, " (known to the kernel)"); @@ -396,6 +408,16 @@ static void display_l3vni(struct vty *vty, struct bgp *bgp_vrf, inet_ntoa(bgp_vrf->originator_ip)); vty_out(vty, " Advertise-gw-macip : %s\n", "n/a"); vty_out(vty, " Advertise-svi-macip : %s\n", "n/a"); + vty_out(vty, " Advertise-pip: %s\n", + bgp_vrf->evpn_info->advertise_pip ? "Yes" : "No"); + vty_out(vty, " System-IP: %s\n", + inet_ntoa(bgp_vrf->evpn_info->pip_ip)); + vty_out(vty, " System-MAC: %s\n", + prefix_mac2str(&bgp_vrf->evpn_info->pip_rmac, + buf2, sizeof(buf2))); + vty_out(vty, " Router-MAC: %s\n", + prefix_mac2str(&bgp_vrf->rmac, + buf2, sizeof(buf2))); } if (!json) -- 2.39.5