From 6f086a7f35eda9f77aaa812e2905f8d7bd674cb5 Mon Sep 17 00:00:00 2001 From: Pooja Date: Tue, 2 Aug 2022 15:16:14 -0700 Subject: [PATCH 1/2] bgpd: BUM flooding display change Changed BUM flooding output in 'show bgp l2vpn evpn vni' command from 'Head-end replication' to 'Enabled' Signed-off-by: Pooja Doijode --- bgpd/bgp_evpn_vty.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index a94ff5ef64..2806f941ce 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -4344,9 +4344,9 @@ DEFUN(show_bgp_l2vpn_evpn_vni, : "Disabled"); json_object_string_add( json, "flooding", - bgp_evpn->vxlan_flood_ctrl - == VXLAN_FLOOD_HEAD_END_REPL - ? "Head-end replication" + bgp_evpn->vxlan_flood_ctrl == + VXLAN_FLOOD_HEAD_END_REPL + ? "Enabled" : "Disabled"); json_object_int_add(json, "numVnis", num_vnis); json_object_int_add(json, "numL2Vnis", num_l2vnis); @@ -4361,9 +4361,9 @@ DEFUN(show_bgp_l2vpn_evpn_vni, vty_out(vty, "Advertise All VNI flag: %s\n", is_evpn_enabled() ? "Enabled" : "Disabled"); vty_out(vty, "BUM flooding: %s\n", - bgp_evpn->vxlan_flood_ctrl - == VXLAN_FLOOD_HEAD_END_REPL - ? "Head-end replication" + bgp_evpn->vxlan_flood_ctrl == + VXLAN_FLOOD_HEAD_END_REPL + ? "Enabled" : "Disabled"); vty_out(vty, "Number of L2 VNIs: %u\n", num_l2vnis); vty_out(vty, "Number of L3 VNIs: %u\n", num_l3vnis); From 02dd2dd6c34dca755f9ad63a49b8115f79f7e429 Mon Sep 17 00:00:00 2001 From: Pdoijode Date: Thu, 4 Aug 2022 11:28:33 -0700 Subject: [PATCH 2/2] bgpd: addition of vxlanFlooding field to show output Instead of changing the value of 'BUM flooding' field in 'show bgp l2vpn evpn vni' vty and JSON command from 'Head-end replication' to 'enabled', adding a new field named 'vxlanFlooding' to 'show bgp l2vpn evpn vni' vty and JSON output. This is done to maintain backward compatibility.'BUM flooding' field in vty and JSON output will be deprecated later. Signed-off-by: Pooja Doijode --- bgpd/bgp_evpn_vty.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index 2806f941ce..3f8b20253f 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -4344,6 +4344,12 @@ DEFUN(show_bgp_l2vpn_evpn_vni, : "Disabled"); json_object_string_add( json, "flooding", + bgp_evpn->vxlan_flood_ctrl == + VXLAN_FLOOD_HEAD_END_REPL + ? "Head-end replication" + : "Disabled"); + json_object_string_add( + json, "vxlanFlooding", bgp_evpn->vxlan_flood_ctrl == VXLAN_FLOOD_HEAD_END_REPL ? "Enabled" @@ -4361,6 +4367,11 @@ DEFUN(show_bgp_l2vpn_evpn_vni, vty_out(vty, "Advertise All VNI flag: %s\n", is_evpn_enabled() ? "Enabled" : "Disabled"); vty_out(vty, "BUM flooding: %s\n", + bgp_evpn->vxlan_flood_ctrl == + VXLAN_FLOOD_HEAD_END_REPL + ? "Head-end replication" + : "Disabled"); + vty_out(vty, "VXLAN flooding: %s\n", bgp_evpn->vxlan_flood_ctrl == VXLAN_FLOOD_HEAD_END_REPL ? "Enabled"