Skip to content

Commit

Permalink
zebra: Remove deprecated items
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
donaldsharp committed Feb 20, 2024
1 parent b02d946 commit c38ef65
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 15 deletions.
2 changes: 1 addition & 1 deletion tests/topotests/bgp_evpn_vxlan_svd_topo1/PE1/evpn.vni.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"vni":101,
"type":"L2",
"vrf":"default",
"tenantVrf":"default",
"vxlanInterface":"vxlan0",
"vtepIp":"10.10.10.10",
"mcastGroup":"0.0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/topotests/bgp_evpn_vxlan_svd_topo1/PE2/evpn.vni.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"vni":101,
"type":"L2",
"vrf":"default",
"tenantVrf":"default",
"vxlanInterface":"vxlan0",
"vtepIp":"10.30.30.30",
"mcastGroup":"0.0.0.0",
Expand Down
9 changes: 0 additions & 9 deletions zebra/zebra_evpn.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 0 additions & 4 deletions zebra/zebra_vxlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit c38ef65

Please sign in to comment.