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

ospf6d: Json support added for command "show ipv6 ospf6 zebra [json]"

Browse Source 
Modify code to add JSON format output in show command
"show ipv6 ospf6 zebra" with proper formating

Signed-off-by: Yash Ranjan <ranjany@vmware.com>
This commit is contained in:
github login name 2020-09-30 05:05:36 -07:00 committed by Yash Ranjan
parent 0b75cd0bf3
commit 9ebb75c56b
2 changed files with 55 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/user/ospf6d.rst
View File

@ -195,10 +195,11 @@ Showing OSPF6 information
This command shows internal routing table. This command shows internal routing table.
.. index:: show ipv6 ospf6 zebra .. index:: show ipv6 ospf6 zebra [json]
.. clicmd:: show ipv6 ospf6 zebra .. clicmd:: show ipv6 ospf6 zebra [json]
Shows state about what is being redistributed between zebra and OSPF6 Shows state about what is being redistributed between zebra and OSPF6.
JSON output can be obtained by appending "json" at the end.
OSPF6 Configuration Examples OSPF6 Configuration Examples
============================ ============================

68
ospf6d/ospf6_zebra.c
View File

@ -40,6 +40,7 @@
#include "ospf6_zebra.h" #include "ospf6_zebra.h"
#include "ospf6d.h" #include "ospf6d.h"
#include "ospf6_area.h" #include "ospf6_area.h"
#include "lib/json.h"
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_DISTANCE, "OSPF6 distance") DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_DISTANCE, "OSPF6 distance")
@ -219,31 +220,64 @@ static int ospf6_zebra_read_route(ZAPI_CALLBACK_ARGS)
return 0; return 0;
} }
DEFUN (show_zebra, DEFUN(show_zebra,
show_ospf6_zebra_cmd, show_ospf6_zebra_cmd,
"show ipv6 ospf6 zebra", "show ipv6 ospf6 zebra [json]",
SHOW_STR SHOW_STR
IPV6_STR IPV6_STR
OSPF6_STR OSPF6_STR
ZEBRA_STR) ZEBRA_STR
JSON_STR)
{ {
int i; int i;
bool uj = use_json(argc, argv);
json_object *json;
json_object *json_zebra;
json_object *json_array;
if (zclient == NULL) { if (zclient == NULL) {
vty_out(vty, "Not connected to zebra\n"); vty_out(vty, "Not connected to zebra\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
vty_out(vty, "Zebra Information\n"); if (uj) {
vty_out(vty, " fail: %d\n", zclient->fail); json = json_object_new_object();
vty_out(vty, " redistribute default: %d\n", json_zebra = json_object_new_object();
vrf_bitmap_check(zclient->default_information[AFI_IP6], json_array = json_object_new_array();
VRF_DEFAULT));
vty_out(vty, " redistribute:"); json_object_int_add(json_zebra, "fail", zclient->fail);
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) { json_object_int_add(
if (vrf_bitmap_check(zclient->redist[AFI_IP6][i], VRF_DEFAULT)) json_zebra, "redistributeDefault",
vty_out(vty, " %s", zebra_route_string(i)); vrf_bitmap_check(zclient->default_information[AFI_IP6],
VRF_DEFAULT));
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
if (vrf_bitmap_check(zclient->redist[AFI_IP6][i],
VRF_DEFAULT))
json_object_array_add(
json_array,
json_object_new_string(
zebra_route_string(i)));
}
json_object_object_add(json_zebra, "redistribute", json_array);
json_object_object_add(json, "zebraInformation", json_zebra);
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
} else {
vty_out(vty, "Zebra Infomation\n");
vty_out(vty, " fail: %d\n", zclient->fail);
vty_out(vty, " redistribute default: %d\n",
vrf_bitmap_check(zclient->default_information[AFI_IP6],
VRF_DEFAULT));
vty_out(vty, " redistribute:");
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
if (vrf_bitmap_check(zclient->redist[AFI_IP6][i],
VRF_DEFAULT))
vty_out(vty, " %s", zebra_route_string(i));
}
vty_out(vty, "\n");
} }
vty_out(vty, "\n");
return CMD_SUCCESS; return CMD_SUCCESS;
} }