ospfd: Convert vty_out to vty_json for JSON

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c
index 7471ba7ba2a2b0584ceb90d84e9c6c5f1d8b8e8f..90c482468c00cca9ceb747ae277411b01e7d9ddb 100644 (file)
--- a/ospfd/ospf_ldp_sync.c
+++ b/ospfd/ospf_ldp_sync.c
@@ -1032,9 +1032,7 @@ DEFPY (show_ip_ospf_mpls_ldp_interface,
        ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
        if (ospf == NULL || !ospf->oi_running) {
                if (uj) {
-                       vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                               json, JSON_C_TO_STRING_PRETTY));
-                       json_object_free(json);
+                       vty_json(vty, json);
                } else
                        vty_out(vty, "%% OSPF instance not found\n");
                return CMD_SUCCESS;
@@ -1042,9 +1040,7 @@ DEFPY (show_ip_ospf_mpls_ldp_interface,
 
        if (!CHECK_FLAG(ospf->ldp_sync_cmd.flags, LDP_SYNC_FLAG_ENABLE)) {
                if (uj) {
-                       vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                               json, JSON_C_TO_STRING_PRETTY));
-                       json_object_free(json);
+                       vty_json(vty, json);
                } else
                        vty_out(vty, "LDP-sync is disabled\n");
                return CMD_SUCCESS;
@@ -1053,9 +1049,7 @@ DEFPY (show_ip_ospf_mpls_ldp_interface,
        ret = show_ip_ospf_mpls_ldp_interface_common(vty, ospf, intf_name,
                                                     json, uj);
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                       json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return ret;

diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
index a83e83f6f41ac132ce4ef36829bea53985467bda..445288718f9787defdf6e4c13af0cdcb87b99cc1 100644 (file)
--- a/ospfd/ospf_sr.c
+++ b/ospfd/ospf_sr.c
@@ -3025,10 +3025,7 @@ DEFUN (show_ip_opsf_srdb,
                srn = OspfSR.self;
                show_sr_node(vty, json_node_array, srn);
                if (uj) {
-                       vty_out(vty, "%s\n",
-                               json_object_to_json_string_ext(
-                                       json, JSON_C_TO_STRING_PRETTY));
-                       json_object_free(json);
+                       vty_json(vty, json);
                }
                return CMD_SUCCESS;
        }
@@ -3044,10 +3041,7 @@ DEFUN (show_ip_opsf_srdb,
                                                    (void *)&rid);
                show_sr_node(vty, json_node_array, srn);
                if (uj) {
-                       vty_out(vty, "%s\n",
-                               json_object_to_json_string_ext(
-                                       json, JSON_C_TO_STRING_PRETTY));
-                       json_object_free(json);
+                       vty_json(vty, json);
                }
                return CMD_SUCCESS;
        }
@@ -3057,9 +3051,7 @@ DEFUN (show_ip_opsf_srdb,
                hash_iterate(OspfSR.neighbors, (void (*)(struct hash_bucket *,
                                                         void *))show_json_srdb,
                             (void *)json_node_array);
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        } else {
                hash_iterate(OspfSR.neighbors, (void (*)(struct hash_bucket *,
                                                         void *))show_vty_srdb,

diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c
index c5d1079e915bc333270805fbc6e21d4fe70631b0..f0d90e0e0d7ced345084036eb20d71ed0246e992 100644 (file)
--- a/ospfd/ospf_te.c
+++ b/ospfd/ospf_te.c
@@ -4433,10 +4433,7 @@ DEFUN (show_ip_ospf_mpls_te_db,
        }
 
        if (uj) {
-               vty_out(vty, "%s\n",
-                       json_object_to_json_string_ext(
-                               json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
        return CMD_SUCCESS;
 }

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 84469160d3aa7eba45d58e0cb34ea1f0216ad78f..a0d23074a2c353281676ff68d4e8a59aaa15f798 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3387,10 +3387,7 @@ DEFUN (show_ip_ospf,
                                                          use_vrf);
                        }
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else if (!ospf_output)
                                vty_out(vty, "%% OSPF instance not found\n");
                        return ret;
@@ -3398,10 +3395,7 @@ DEFUN (show_ip_ospf,
                ospf = ospf_lookup_by_inst_name(inst, vrf_name);
                if ((ospf == NULL) || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -3412,10 +3406,7 @@ DEFUN (show_ip_ospf,
                /* Display default ospf (instance 0) info */
                if (ospf == NULL || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -3467,9 +3458,7 @@ DEFUN (show_ip_ospf_instance,
        ret = show_ip_ospf_common(vty, ospf, json, 0);
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return ret;
@@ -4131,10 +4120,7 @@ DEFUN (show_ip_ospf_interface,
                        }
 
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else if (!ospf)
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -4143,10 +4129,7 @@ DEFUN (show_ip_ospf_interface,
                ospf = ospf_lookup_by_inst_name(inst, vrf_name);
                if (ospf == NULL || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -4160,10 +4143,7 @@ DEFUN (show_ip_ospf_interface,
                ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
                if (ospf == NULL || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -4174,9 +4154,7 @@ DEFUN (show_ip_ospf_interface,
        }
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return ret;
@@ -4219,9 +4197,7 @@ DEFUN (show_ip_ospf_instance_interface,
        ret = show_ip_ospf_interface_common(vty, ospf, intf_name, 0, json, uj);
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return ret;
@@ -4274,10 +4250,7 @@ DEFUN (show_ip_ospf_interface_traffic,
                        }
 
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        }
 
                        return ret;
@@ -4304,9 +4277,7 @@ DEFUN (show_ip_ospf_interface_traffic,
        }
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return ret;
@@ -4561,10 +4532,7 @@ DEFUN (show_ip_ospf_neighbor,
                        }
 
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else if (!ospf)
                                vty_out(vty, "OSPF instance not found\n");
 
@@ -4574,10 +4542,7 @@ DEFUN (show_ip_ospf_neighbor,
                ospf = ospf_lookup_by_inst_name(inst, vrf_name);
                if (ospf == NULL || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -4588,10 +4553,7 @@ DEFUN (show_ip_ospf_neighbor,
                ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
                if (ospf == NULL || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -4648,9 +4610,7 @@ DEFUN (show_ip_ospf_instance_neighbor,
        ret = show_ip_ospf_neighbor_common(vty, ospf, json, uj, 0);
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return ret;
@@ -4786,10 +4746,7 @@ DEFUN (show_ip_ospf_neighbor_all,
                        }
 
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        }
 
                        return ret;
@@ -4858,9 +4815,7 @@ DEFUN (show_ip_ospf_instance_neighbor_all,
        ret = show_ip_ospf_neighbor_all_common(vty, ospf, json, uj, 0);
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return ret;
@@ -4907,9 +4862,7 @@ static int show_ip_ospf_neighbor_int_common(struct vty *vty, struct ospf *ospf,
        }
 
        if (use_json) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        } else
                vty_out(vty, "\n");
 
@@ -5411,9 +5364,7 @@ static int show_ip_ospf_neighbor_id_common(struct vty *vty, struct ospf *ospf,
        }
 
        if (use_json) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        } else
                vty_out(vty, "\n");
 
@@ -5566,10 +5517,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
                                        vty, ospf, json, uj, use_vrf);
                        }
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        }
 
                        return ret;
@@ -5638,9 +5586,7 @@ DEFUN (show_ip_ospf_instance_neighbor_detail,
        ret = show_ip_ospf_neighbor_detail_common(vty, ospf, json, uj, 0);
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return ret;
@@ -5755,10 +5701,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
                        }
 
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        }
 
                        return ret;
@@ -5828,9 +5771,7 @@ DEFUN (show_ip_ospf_instance_neighbor_detail_all,
        ret = show_ip_ospf_neighbor_detail_all_common(vty, ospf, json, uj, 0);
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return ret;
@@ -5888,9 +5829,7 @@ static int show_ip_ospf_neighbor_int_detail_common(struct vty *vty,
        }
 
        if (use_json) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        } else
                vty_out(vty, "\n");
 
@@ -7201,10 +7140,7 @@ DEFUN (show_ip_ospf_instance_database_max,
        show_ip_ospf_database_common(vty, ospf, 1, argc, argv, 0, json, uj);
 
        if (uj) {
-               vty_out(vty, "%s\n",
-                       json_object_to_json_string_ext(
-                               json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return CMD_SUCCESS;
@@ -7418,10 +7354,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
                                                     0, json, uj);
 
        if (uj) {
-               vty_out(vty, "%s\n",
-                       json_object_to_json_string_ext(
-                               json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
 
        return CMD_SUCCESS;
@@ -10632,11 +10565,7 @@ DEFUN (show_ip_ospf_route,
 
                        if (uj) {
                                /* Keep Non-pretty format */
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json,
-                                               JSON_C_TO_STRING_NOSLASHESCAPE));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else if (!ospf_output)
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -10645,12 +10574,7 @@ DEFUN (show_ip_ospf_route,
                ospf = ospf_lookup_by_inst_name(inst, vrf_name);
                if (ospf == NULL || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json,
-                                               JSON_C_TO_STRING_PRETTY
-                                                       | JSON_C_TO_STRING_NOSLASHESCAPE));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -10661,12 +10585,7 @@ DEFUN (show_ip_ospf_route,
                ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
                if (ospf == NULL || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json,
-                                               JSON_C_TO_STRING_PRETTY
-                                                       | JSON_C_TO_STRING_NOSLASHESCAPE));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -10771,9 +10690,7 @@ DEFUN (show_ip_ospf_vrfs,
                json_object_object_add(json, "vrfs", json_vrfs);
                json_object_int_add(json, "totalVrfs", count);
 
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        } else {
                if (count)
                        vty_out(vty, "\nTotal number of OSPF VRFs: %d\n",
@@ -11061,10 +10978,7 @@ DEFUN (show_ip_ospf_external_aggregator,
                        }
 
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        }
 
                        return ret;
@@ -11074,10 +10988,7 @@ DEFUN (show_ip_ospf_external_aggregator,
 
                if (ospf == NULL || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -11090,10 +11001,7 @@ DEFUN (show_ip_ospf_external_aggregator,
                ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
                if (ospf == NULL || !ospf->oi_running) {
                        if (uj) {
-                               vty_out(vty, "%s\n",
-                                       json_object_to_json_string_ext(
-                                               json, JSON_C_TO_STRING_PRETTY));
-                               json_object_free(json);
+                               vty_json(vty, json);
                        } else
                                vty_out(vty, "%% OSPF instance not found\n");
 
@@ -11104,9 +11012,7 @@ DEFUN (show_ip_ospf_external_aggregator,
        }
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
-               json_object_free(json);
+               vty_json(vty, json);
        }
        return CMD_SUCCESS;
 }