diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2024-02-15 23:42:46 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2024-02-20 07:21:08 -0500 |
| commit | c38ef653f332d0da3591d5c1397268210797e4dd (patch) | |
| tree | 0109eca8cf23de6f127e2a5bf0699d5cbe8712db | |
| parent | b02d946db1e2241fc18bdf0a062672324609f2db (diff) | |
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>
| -rw-r--r-- | tests/topotests/bgp_evpn_vxlan_svd_topo1/PE1/evpn.vni.json | 2 | ||||
| -rw-r--r-- | tests/topotests/bgp_evpn_vxlan_svd_topo1/PE2/evpn.vni.json | 2 | ||||
| -rw-r--r-- | zebra/zebra_evpn.c | 9 | ||||
| -rw-r--r-- | zebra/zebra_vxlan.c | 4 |
4 files changed, 2 insertions, 15 deletions
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 98ae92ce55..45d00c6fa6 100644 --- 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 5c059786b2..f480b567ae 100644 --- 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 147f5b93fa..296db45772 100644 --- 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 f0401d02a5..361a300491 100644 --- 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", |