lib: add 'show error all json'

* Add 'all' option
* Add 'json' option

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/lib/ferr.c b/lib/ferr.c
index 6625749c3f44cb4d74becede455834933b1a45d4..d09c41fae02c5fbee125ec688ebceada6b51bfe9 100644 (file)
--- a/lib/ferr.c
+++ b/lib/ferr.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <pthread.h>
 #include <signal.h>
+#include <inttypes.h>
 
 #include "ferr.h"
 #include "vty.h"
@@ -26,6 +27,8 @@
 #include "memory.h"
 #include "hash.h"
 #include "command.h"
+#include "json.h"
+#include "linklist.h"
 
 DEFINE_MTYPE_STATIC(LIB, ERRINFO, "error information")
 
@@ -101,31 +104,81 @@ struct ferr_ref *ferr_ref_get(uint32_t code)
        return ref;
 }
 
-void ferr_ref_display(struct vty *vty, uint32_t code)
+void ferr_ref_display(struct vty *vty, uint32_t code, bool json)
 {
-       struct ferr_ref *ref = ferr_ref_get(code);
+       struct ferr_ref *ref;
+       struct json_object *top, *obj;
+       struct list *errlist;
+       struct listnode *ln;
+
+       if (json)
+               top = json_object_new_object();
+
+       pthread_mutex_lock(&refs_mtx);
+       {
+               errlist = code ? list_new() : hash_to_list(refs);
+       }
+       pthread_mutex_unlock(&refs_mtx);
+
+       if (code) {
+               ref = ferr_ref_get(code);
+               if (!ref) {
+                       vty_out(vty, "Code %"PRIu32" - Unknown\n", code);
+                       return;
+               }
+               listnode_add(errlist, ref);
+       }
+
+       for (ALL_LIST_ELEMENTS_RO(errlist, ln, ref)) {
+               if (json) {
+                       char key[11];
+                       snprintf(key, sizeof(key), "%"PRIu32, ref->code);
+                       obj = json_object_new_object();
+                       json_object_string_add(obj, "title", ref->title);
+                       json_object_string_add(obj, "description",
+                                              ref->description);
+                       json_object_string_add(obj, "suggestion",
+                                              ref->suggestion);
+                       json_object_object_add(top, key, obj);
+               } else {
+                       char pbuf[256];
+                       char ubuf[256];
+                       snprintf(pbuf, sizeof(pbuf), "\nError %"PRIu32" - %s",
+                                code, ref->title);
+                       memset(ubuf, '=', strlen(pbuf));
+                       ubuf[sizeof(ubuf) - 1] = '\0';
+
+                       vty_out(vty, "%s\n%s\n", pbuf, ubuf);
+                       vty_out(vty, "Description:\n%s\n\nRecommendation:\n%s\n",
+                               ref->description, ref->suggestion);
+               }
+       }
 
-       if (!ref) {
-               vty_out(vty, "Code %d - Unknown\n", code);
-               return;
+       if (json) {
+               const char *str = json_object_to_json_string_ext(
+                       top, JSON_C_TO_STRING_PRETTY);
+               vty_out(vty, "%s\n", str);
+               json_object_free(top);
        }
 
-       vty_out(vty, "Error Code %d - %s\n", code, ref->title);
-       vty_out(vty, "--------------------------------------\n");
-       vty_out(vty, "\nDescription:\n%s\n\nRecommendation:\n%s\n\n",
-               ref->description, ref->suggestion);
+       list_delete_and_null(&errlist);
 }
 
 DEFUN_NOSH(show_error_code,
           show_error_code_cmd,
-          "show error (0-4294967296)",
+          "show error <(1-4294967296)|all> [json]",
           SHOW_STR
           "Information on errors\n"
-          "Error code to get info about\n")
+          "Error code to get info about\n"
+          "Information on all errors\n"
+          JSON_STR)
 {
-       uint32_t arg = strtoul(argv[2]->arg, NULL, 10);
+       bool json = strmatch(argv[argc-1]->text, "json");
+       uint32_t arg = 0;
+       if (!strmatch(argv[2]->text, "all"))
+               arg = strtoul(argv[2]->arg, NULL, 10);
 
-       ferr_ref_display(vty, arg);
+       ferr_ref_display(vty, arg, json);
        return CMD_SUCCESS;
 }
 

diff --git a/lib/ferr.h b/lib/ferr.h
index 79f1fc996f2a12d9357127162ff3c976a8b9a4dc..51fd9e3be5dd0719479fb93997c27154b4f62bcb 100644 (file)
--- a/lib/ferr.h
+++ b/lib/ferr.h
@@ -146,7 +146,7 @@ struct ferr_ref {
 
 void ferr_ref_add(struct ferr_ref *ref);
 struct ferr_ref *ferr_ref_get(uint32_t code);
-void ferr_ref_display(struct vty *, uint32_t code);
+void ferr_ref_display(struct vty *, uint32_t code, bool json);
 
 /*
  * This function should be called by the

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 540e30e447796082c9679c3dfea71db00c7f4257..63195806e92afcd81f3f57f9d5b3786cf01f4467 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -45,6 +45,7 @@
 #include "libfrr.h"
 #include "command_graph.h"
 #include "frrstr.h"
+#include "json.h"
 
 DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CMD, "Vtysh cmd copy")
 
@@ -2346,17 +2347,23 @@ DEFUN (vtysh_show_debugging_hashtable,
 
 DEFUN (vtysh_show_error_code,
        vtysh_show_error_code_cmd,
-       "show error (0-4294967296)",
+       "show error <(1-4294967296)|all> [json]",
        SHOW_STR
        "Information on errors\n"
-       "Error code to get info about\n")
+       "Error code to get info about\n"
+       "Information on all errors\n"
+       JSON_STR)
 {
        char cmd[256];
-
-       snprintf(cmd, sizeof(cmd), "do show error %s", argv[2]->arg);
+       int rv;
+       char *fcmd = argv_concat(argv, argc, 0);
+       snprintf(cmd, sizeof(cmd), "do %s", fcmd);
 
        /* FIXME: Needs to determine which daemon to send to via code ranges */
-       return show_per_daemon(cmd, "");
+       rv = show_per_daemon(cmd, "");
+
+       XFREE(MTYPE_TMP, fcmd);
+       return rv;
 }
 
 /* Memory */