ospfd: Use consistent JSON keys for `show ip ospf neighbor` and detail version

At the moment it's inconsistent, and very annoying. Let's just fix this, and
add a deprecation period to remove them after that.

```
vr_ib# show ip ospf neighbor json
{
  "neighbors":{
    "192.10.120.2":[
      {
        "priority":1,
        "state":"Full\/DROther",
        "deadTimeMsecs":36543,
        "address":"192.10.120.2",
        "ifaceName":"VLINK0",
        "retransmitCounter":0,
        "requestCounter":0,
        "dbSummaryCounter":0
      },
```

```
vr_ib# show ip ospf neighbor detail json
{
  "neighbors":{
    "192.10.120.2":[
      {
        "ifaceAddress":"192.10.120.2",
        "areaId":"0.0.0.0",
        "ifaceName":"VLINK0",
        "nbrPriority":1,
        "nbrState":"Full",
        "stateChangeCounter":5,
        "lastPrgrsvChangeMsec":53367612,
        "routerDesignatedId":"0.0.0.0",
        "routerDesignatedBackupId":"0.0.0.0",
        "optionsCounter":66,
        "optionsList":"*|O|-|-|-|-|E|-",
        "routerDeadIntervalTimerDueMsec":33126,
        "databaseSummaryListCounter":0,
        "linkStateRequestListCounter":0,
        "linkStateRetransmissionListCounter":0,
        "threadInactivityTimer":"on",
        "threadLinkStateRequestRetransmission":"on",
        "threadLinkStateUpdateRetransmission":"on",
        "grHelperStatus":"None"
      },
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index d4245bde7f02e7c7842c137ba2928406d3980978..a753340476575c317ca0bf60f96fc4b6e3bd392f 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -4395,11 +4395,18 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty,
                                json_neighbor = json_object_new_object();
 
                                ospf_nbr_ism_state_message(nbr, msgbuf, 16);
-
+#if CONFDATE > 20230321
+CPP_NOTICE("Remove show_ip_ospf_neighbor_sub() JSON keys: priority, state, deadTimeMsecs, address, retransmitCounter, requestCounter, dbSummaryCounter")
+#endif
                                json_object_int_add(json_neighbor, "priority",
                                                    nbr->priority);
                                json_object_string_add(json_neighbor, "state",
                                                       msgbuf);
+                               json_object_int_add(json_neighbor,
+                                                   "nbrPriority",
+                                                   nbr->priority);
+                               json_object_string_add(json_neighbor,
+                                                      "nbrState", msgbuf);
 
                                json_object_string_add(
                                        json_neighbor, "converged",
@@ -4425,6 +4432,10 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty,
                                        json_object_int_add(json_neighbor,
                                                            "deadTimeMsecs",
                                                            time_store);
+                                       json_object_int_add(
+                                               json_neighbor,
+                                               "routerDeadIntervalTimerDueMsec",
+                                               time_store);
                                        json_object_string_add(
                                                json_neighbor, "upTime",
                                                ospf_timeval_dump(
@@ -4440,22 +4451,41 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty,
                                        json_object_string_add(json_neighbor,
                                                               "deadTimeMsecs",
                                                               "inactive");
+                                       json_object_string_add(
+                                               json_neighbor,
+                                               "routerDeadIntervalTimerDueMsec",
+                                               "inactive");
                                }
                                json_object_string_addf(json_neighbor,
                                                        "address", "%pI4",
                                                        &nbr->src);
+                               json_object_string_addf(json_neighbor,
+                                                       "ifaceAddress", "%pI4",
+                                                       &nbr->src);
                                json_object_string_add(json_neighbor,
                                                       "ifaceName",
                                                       IF_NAME(oi));
                                json_object_int_add(
                                        json_neighbor, "retransmitCounter",
                                        ospf_ls_retransmit_count(nbr));
+                               json_object_int_add(
+                                       json_neighbor,
+                                       "linkStateRetransmissionListCounter",
+                                       ospf_ls_retransmit_count(nbr));
                                json_object_int_add(json_neighbor,
                                                    "requestCounter",
                                                    ospf_ls_request_count(nbr));
+                               json_object_int_add(
+                                       json_neighbor,
+                                       "linkStateRequestListCounter",
+                                       ospf_ls_request_count(nbr));
                                json_object_int_add(json_neighbor,
                                                    "dbSummaryCounter",
                                                    ospf_db_summary_count(nbr));
+                               json_object_int_add(
+                                       json_neighbor,
+                                       "databaseSummaryListCounter",
+                                       ospf_db_summary_count(nbr));
 
                                json_object_array_add(json_neigh_array,
                                                      json_neighbor);