zebra: Remove deprecated items

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>
donaldsharp · Feb 16, 2024 · 8367c8b · 8367c8b
1 parent fa67c0b
commit 8367c8b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/zebra/zebra_evpn.c b/zebra/zebra_evpn.c
@@ -109,11 +109,6 @@ void zebra_evpn_print(struct zebra_evpn *zevpn, void **ctxt)
 	} else {
 		json_object_int_add(json, "vni", zevpn->vni);
 		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",
 				       vrf_id_to_name(zevpn->vrf_id));
 	}
@@ -142,10 +137,6 @@ CPP_NOTICE("Drop `vrf` from JSON output")
 	} else {
 		json_object_string_add(json, "vxlanInterface",
 				       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",
 				    zevpn->vxlan_if->ifindex);
 		if (zevpn->svi_if) {

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
@@ -769,10 +769,6 @@ static void zl3vni_print(struct zebra_l3vni *zl3vni, void **ctx)
 		json_evpn_list = json_object_new_array();
 		json_object_int_add(json, "vni", zl3vni->vni);
 		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",
 				       zl3vni_vrf_name(zl3vni));
 		json_object_string_addf(json, "localVtepIp", "%pI4",