From d3c7efede79f88c978efadd850034d472e02cfdb Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 2 Jan 2018 10:12:05 -0500 Subject: [PATCH] bgpd: Allow for deprecation of json bgpTimerUp The bgpTimerUp value was incorrectly named, add a correct name bgpTimerUpMsec and add some code to allow for deprecation. Signed-off-by: Donald Sharp --- bgpd/bgp_vty.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 2d37e6bd57..af05a1f3b1 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -8293,8 +8293,24 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, u_char use_json, uptime -= p->uptime; epoch_tbuf = time(NULL) - uptime; +#if CONFDATE > 20200101 + CPP_NOTICE("bgpTimerUp should be deprecated and can be removed now"); +#endif + /* + * bgpTimerUp was miliseconds that was accurate + * up to 1 day, then the value returned + * became garbage. So in order to provide + * some level of backwards compatability, + * we still provde the data, but now + * we are returning the correct value + * and also adding a new bgpTimerUpMsec + * which will allow us to deprecate + * this eventually + */ json_object_int_add(json_neigh, "bgpTimerUp", uptime * 1000); + json_object_int_add(json_neigh, "bgpTimerUpMsec", + uptime * 1000); json_object_string_add(json_neigh, "bgpTimerUpString", peer_uptime(p->uptime, timebuf, BGP_UPTIME_LEN, 0, -- 2.39.5