summaryrefslogtreecommitdiff
path: root/ospf6d/ospf6_top.c
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2023-01-31 10:18:28 +0200
committerDonatas Abraitis <donatas@opensourcerouting.org>2023-01-31 10:18:28 +0200
commit1ce23106ebf0bf088dde69958228076faf5ac1b8 (patch)
tree5df60fefa3a267e080a5882db0c5a8ef7c14ace5 /ospf6d/ospf6_top.c
parent9eca0bdc02686e18a3face13a5a28a1645a9619f (diff)
*: Drop deprecated incorrect JSON fields with wrong naming
Deprecation cycle already passed. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Diffstat (limited to 'ospf6d/ospf6_top.c')
-rw-r--r--ospf6d/ospf6_top.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index db45fa5f5c..785a48a0a1 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -2015,9 +2015,6 @@ ospf6_show_vrf_name(struct vty *vty, struct ospf6 *ospf6,
}
}
-#if CONFDATE > 20230131
-CPP_NOTICE("Remove JSON object commands with keys containing whitespaces")
-#endif
static int
ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6,
json_object *json,
@@ -2037,8 +2034,6 @@ ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6,
ospf6_show_vrf_name(vty, ospf6, json_vrf);
- json_object_int_add(json_vrf, "aggregation delay interval",
- ospf6->aggr_delay_interval);
json_object_int_add(json_vrf, "aggregationDelayInterval",
ospf6->aggr_delay_interval);
}
@@ -2062,18 +2057,10 @@ ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6,
buf,
json_aggr);
- json_object_string_add(json_aggr,
- "Summary address",
- buf);
json_object_string_add(json_aggr, "summaryAddress",
buf);
json_object_string_add(
- json_aggr, "Metric-type",
- (aggr->mtype == DEFAULT_METRIC_TYPE)
- ? "E2"
- : "E1");
- json_object_string_add(
json_aggr, "metricType",
(aggr->mtype == DEFAULT_METRIC_TYPE) ? "E2"
: "E1");
@@ -2086,9 +2073,6 @@ ospf6_show_summary_address(struct vty *vty, struct ospf6 *ospf6,
json_object_int_add(json_aggr, "Tag",
aggr->tag);
- json_object_int_add(json_aggr,
- "External route count",
- OSPF6_EXTERNAL_RT_COUNT(aggr));
json_object_int_add(json_aggr, "externalRouteCount",
OSPF6_EXTERNAL_RT_COUNT(aggr));