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

zebra: Remove deprecated items

Browse Source 
Both zebra_evpn.c and zebra_vxlan.c have items that
were deprecated a year ago.  Let's remove them.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-02-15 23:42:46 -05:00
parent b02d946db1
commit c38ef653f3
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/topotests/bgp_evpn_vxlan_svd_topo1/PE1/evpn.vni.json
View File

@ -1,7 +1,7 @@
{ {
"vni":101, "vni":101,
"type":"L2", "type":"L2",
"vrf":"default", "tenantVrf":"default",
"vxlanInterface":"vxlan0", "vxlanInterface":"vxlan0",
"vtepIp":"10.10.10.10", "vtepIp":"10.10.10.10",
"mcastGroup":"0.0.0.0", "mcastGroup":"0.0.0.0",

2
tests/topotests/bgp_evpn_vxlan_svd_topo1/PE2/evpn.vni.json
View File

@ -1,7 +1,7 @@
{ {
"vni":101, "vni":101,
"type":"L2", "type":"L2",
"vrf":"default", "tenantVrf":"default",
"vxlanInterface":"vxlan0", "vxlanInterface":"vxlan0",
"vtepIp":"10.30.30.30", "vtepIp":"10.30.30.30",
"mcastGroup":"0.0.0.0", "mcastGroup":"0.0.0.0",

9
zebra/zebra_evpn.c
View File

@ -109,11 +109,6 @@ void zebra_evpn_print(struct zebra_evpn *zevpn, void **ctxt)
} else { } else {
json_object_int_add(json, "vni", zevpn->vni); json_object_int_add(json, "vni", zevpn->vni);
json_object_string_add(json, "type", "L2"); json_object_string_add(json, "type", "L2");
#if CONFDATE > 20240210
CPP_NOTICE("Drop `vrf` from JSON output")
#endif
json_object_string_add(json, "vrf",
vrf_id_to_name(zevpn->vrf_id));
json_object_string_add(json, "tenantVrf", json_object_string_add(json, "tenantVrf",
vrf_id_to_name(zevpn->vrf_id)); vrf_id_to_name(zevpn->vrf_id));
} }
@ -142,10 +137,6 @@ CPP_NOTICE("Drop `vrf` from JSON output")
} else { } else {
json_object_string_add(json, "vxlanInterface", json_object_string_add(json, "vxlanInterface",
zevpn->vxlan_if->name); zevpn->vxlan_if->name);
#if CONFDATE > 20240210
CPP_NOTICE("Drop `ifindex` from JSON output")
#endif
json_object_int_add(json, "ifindex", zevpn->vxlan_if->ifindex);
json_object_int_add(json, "vxlanIfindex", json_object_int_add(json, "vxlanIfindex",
zevpn->vxlan_if->ifindex); zevpn->vxlan_if->ifindex);
if (zevpn->svi_if) { if (zevpn->svi_if) {

4
zebra/zebra_vxlan.c
View File

@ -769,10 +769,6 @@ static void zl3vni_print(struct zebra_l3vni *zl3vni, void **ctx)
json_evpn_list = json_object_new_array(); json_evpn_list = json_object_new_array();
json_object_int_add(json, "vni", zl3vni->vni); json_object_int_add(json, "vni", zl3vni->vni);
json_object_string_add(json, "type", "L3"); json_object_string_add(json, "type", "L3");
#if CONFDATE > 20240210
CPP_NOTICE("Drop `vrf` from JSON outputs")
#endif
json_object_string_add(json, "vrf", zl3vni_vrf_name(zl3vni));
json_object_string_add(json, "tenantVrf", json_object_string_add(json, "tenantVrf",
zl3vni_vrf_name(zl3vni)); zl3vni_vrf_name(zl3vni));
json_object_string_addf(json, "localVtepIp", "%pI4", json_object_string_addf(json, "localVtepIp", "%pI4",