proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 03:10:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Add json support for 'show version' command

Browse Source 
Fixes: #1167
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-09-12 16:27:39 -04:00
parent b9843e63c0
commit 6a232d1a17
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/command.c
View File

@ -42,6 +42,7 @@
#include "command_match.h" #include "command_match.h"
#include "qobj.h" #include "qobj.h"
#include "defaults.h" #include "defaults.h"
#include "json.h"
DEFINE_MTYPE(LIB, HOST, "Host config") DEFINE_MTYPE(LIB, HOST, "Host config")
DEFINE_MTYPE(LIB, STRVEC, "String vector") DEFINE_MTYPE(LIB, STRVEC, "String vector")
@ -1455,15 +1456,42 @@ DEFUN (config_end,
/* Show version. */ /* Show version. */
DEFUN (show_version, DEFUN (show_version,
show_version_cmd, show_version_cmd,
"show version", "show version [json]",
SHOW_STR SHOW_STR
"Displays zebra version\n") "Displays zebra version\n"
JSON_STR)
{ {
int uj = use_json(argc, argv);
json_object *json = NULL;
if (uj) {
json = json_object_new_object();
json_object_string_add(json,
"hostName",
host.name ? host.name : "");
json_object_string_add(json,
"version", FRR_VERSION);
json_object_string_add(json,
"name", FRR_FULL_NAME);
json_object_string_add(json,
"copyright", FRR_COPYRIGHT);
json_object_string_add(json,
"gitInformation", GIT_INFO);
json_object_string_add(json,
"configureLine", FRR_CONFIG_ARGS);
vty_out(vty, "%s%s",
json_object_to_json_string_ext(json,
JSON_C_TO_STRING_PRETTY),
VTY_NEWLINE);
json_object_free(json);
} else {
vty_out(vty, "%s %s (%s).%s", FRR_FULL_NAME, FRR_VERSION, vty_out(vty, "%s %s (%s).%s", FRR_FULL_NAME, FRR_VERSION,
host.name ? host.name : "", VTY_NEWLINE); host.name ? host.name : "", VTY_NEWLINE);
vty_out(vty, "%s%s%s", FRR_COPYRIGHT, GIT_INFO, VTY_NEWLINE); vty_out(vty, "%s%s%s", FRR_COPYRIGHT, GIT_INFO, VTY_NEWLINE);
vty_out(vty, "configured with:%s %s%s", VTY_NEWLINE, FRR_CONFIG_ARGS, vty_out(vty, "configured with:%s %s%s", VTY_NEWLINE, FRR_CONFIG_ARGS,
VTY_NEWLINE); VTY_NEWLINE);
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }