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>

diff --git a/tests/topotests/bgp_evpn_vxlan_svd_topo1/PE1/evpn.vni.json b/tests/topotests/bgp_evpn_vxlan_svd_topo1/PE1/evpn.vni.json
index 98ae92ce55bafb0c0391d00ec4e72c05b1d18803..45d00c6fa6abeeb1efc11b15cdfb9d62a70f4441 100644 (file)
--- a/tests/topotests/bgp_evpn_vxlan_svd_topo1/PE1/evpn.vni.json
+++ b/tests/topotests/bgp_evpn_vxlan_svd_topo1/PE1/evpn.vni.json
@@ -1,7 +1,7 @@
 {
   "vni":101,
   "type":"L2",
-  "vrf":"default",
+  "tenantVrf":"default",
   "vxlanInterface":"vxlan0",
   "vtepIp":"10.10.10.10",
   "mcastGroup":"0.0.0.0",

diff --git a/tests/topotests/bgp_evpn_vxlan_svd_topo1/PE2/evpn.vni.json b/tests/topotests/bgp_evpn_vxlan_svd_topo1/PE2/evpn.vni.json
index 5c059786b2dbd7e4a66901de71bd903a698eb32d..f480b567ae14dbb69975c7fcb8ef3b5282c61182 100644 (file)
--- a/tests/topotests/bgp_evpn_vxlan_svd_topo1/PE2/evpn.vni.json
+++ b/tests/topotests/bgp_evpn_vxlan_svd_topo1/PE2/evpn.vni.json
@@ -1,7 +1,7 @@
 {
   "vni":101,
   "type":"L2",
-  "vrf":"default",
+  "tenantVrf":"default",
   "vxlanInterface":"vxlan0",
   "vtepIp":"10.30.30.30",
   "mcastGroup":"0.0.0.0",

diff --git a/zebra/zebra_evpn.c b/zebra/zebra_evpn.c
index 147f5b93faae347fd5a837ce2e56b3509a07a1bf..296db45772e32d8c1f06416b2dfdef872369cb98 100644 (file)
--- 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
index f0401d02a52d46d547593b4f87c78da7608159a3..361a300491463a26420802bf4d12bfb78e02868b 100644 (file)
--- 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",