proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 15:07:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: json support for show evpn rmac command

Browse Source 
Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
This commit is contained in:
Mitesh Kanjariya 2017-10-17 04:59:42 -07:00
parent c0e519d32d
commit c0b4eaa4c2
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
zebra/zebra_vxlan.c
View File

@ -114,7 +114,6 @@ static int zl3vni_nh_uninstall(zebra_l3vni_t *zl3vni, zebra_neigh_t *n);
/* l3-vni rmac related APIs */ /* l3-vni rmac related APIs */
static void zl3vni_print_rmac_hash(struct hash_backet *, void *); static void zl3vni_print_rmac_hash(struct hash_backet *, void *);
static void zl3vni_print_rmac_hash_all_vni(struct hash_backet *, void *);
static zebra_mac_t *zl3vni_rmac_lookup(zebra_l3vni_t *zl3vni, static zebra_mac_t *zl3vni_rmac_lookup(zebra_l3vni_t *zl3vni,
struct ethaddr *rmac); struct ethaddr *rmac);
static void *zl3vni_rmac_alloc(void *p); static void *zl3vni_rmac_alloc(void *p);
@ -787,20 +786,18 @@ static void zl3vni_print_nh_hash_all_vni(struct hash_backet *backet,
} }
static void zl3vni_print_rmac_hash_all_vni(struct hash_backet *backet, static void zl3vni_print_rmac_hash_all_vni(struct hash_backet *backet,
void *ctx) void **args)
{ {
struct vty *vty = NULL; struct vty *vty = NULL;
json_object *json = NULL; json_object *json = NULL;
json_object *json_vni = NULL; json_object *json_vni = NULL;
json_object *json_mac = NULL;
zebra_l3vni_t *zl3vni = NULL; zebra_l3vni_t *zl3vni = NULL;
u_int32_t num_rmacs; u_int32_t num_rmacs;
struct rmac_walk_ctx *wctx = NULL; struct rmac_walk_ctx wctx;
char vni_str[VNI_STR_LEN]; char vni_str[VNI_STR_LEN];
wctx = (struct rmac_walk_ctx *)ctx; vty = (struct vty *)args[0];
vty = (struct vty *)wctx->vty; json = (struct json_object *)args[1];
json = (struct json_object *)wctx->json;
zl3vni = (zebra_l3vni_t *)backet->data; zl3vni = (zebra_l3vni_t *)backet->data;
if (!zl3vni) { if (!zl3vni) {
@ -815,7 +812,6 @@ static void zl3vni_print_rmac_hash_all_vni(struct hash_backet *backet,
if (json) { if (json) {
json_vni = json_object_new_object(); json_vni = json_object_new_object();
json_mac = json_object_new_array();
snprintf(vni_str, VNI_STR_LEN, "%u", zl3vni->vni); snprintf(vni_str, VNI_STR_LEN, "%u", zl3vni->vni);
} }
@ -831,13 +827,12 @@ static void zl3vni_print_rmac_hash_all_vni(struct hash_backet *backet,
* under the vni. Re-assign primary json object to fill * under the vni. Re-assign primary json object to fill
* next vni information. * next vni information.
*/ */
wctx->json = json_mac; memset(&wctx, 0, sizeof(struct rmac_walk_ctx));
hash_iterate(zl3vni->rmac_table, zl3vni_print_rmac_hash, wctx); wctx.vty = vty;
wctx->json = json; wctx.json = json_vni;
if (json) { hash_iterate(zl3vni->rmac_table, zl3vni_print_rmac_hash, &wctx);
json_object_object_add(json_vni, "rmacs", json_mac); if (json)
json_object_object_add(json, vni_str, json_vni); json_object_object_add(json, vni_str, json_vni);
}
} }
static void zl3vni_print_rmac_hash(struct hash_backet *backet, static void zl3vni_print_rmac_hash(struct hash_backet *backet,
@ -872,7 +867,10 @@ static void zl3vni_print_rmac_hash(struct hash_backet *backet,
inet_ntoa(zrmac->fwd_info.r_vtep_ip)); inet_ntoa(zrmac->fwd_info.r_vtep_ip));
json_object_int_add(json_rmac, "refcnt", json_object_int_add(json_rmac, "refcnt",
listcount(zrmac->host_list)); listcount(zrmac->host_list));
json_object_array_add(json, json_rmac); json_object_object_add(json,
prefix_mac2str(&zrmac->macaddr, buf,
sizeof(buf)),
json_rmac);
} }
} }
@ -3775,8 +3773,8 @@ void zebra_vxlan_print_rmacs_all_l3vni(struct vty *vty,
u_char use_json) u_char use_json)
{ {
struct zebra_ns *zns = NULL; struct zebra_ns *zns = NULL;
struct rmac_walk_ctx wctx;
json_object *json = NULL; json_object *json = NULL;
void *args[2];
if (!is_evpn_enabled()) { if (!is_evpn_enabled()) {
if (use_json) if (use_json)
@ -3785,17 +3783,21 @@ void zebra_vxlan_print_rmacs_all_l3vni(struct vty *vty,
} }
zns = zebra_ns_lookup(NS_DEFAULT); zns = zebra_ns_lookup(NS_DEFAULT);
if (!zns) if (!zns) {
if (use_json)
vty_out(vty, "{}\n");
return; return;
}
if (use_json) if (use_json)
json = json_object_new_object(); json = json_object_new_object();
memset(&wctx, 0, sizeof(struct rmac_walk_ctx)); args[0] = vty;
wctx.vty = vty; args[1] = json;
wctx.json = json; hash_iterate(zns->l3vni_table,
(void (*)(struct hash_backet *,
hash_iterate(zns->l3vni_table, zl3vni_print_rmac_hash_all_vni, &wctx); void *))zl3vni_print_rmac_hash_all_vni,
args);
if (use_json) { if (use_json) {
vty_out(vty, "%s\n", json_object_to_json_string_ext( vty_out(vty, "%s\n", json_object_to_json_string_ext(