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 <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 2d37e6bd57391c92fce71b72bcdcc05a0fccfc31..af05a1f3b194b539fbe2414347b071272d355155 100644 (file)
--- 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,