Skip to content

Commit

Permalink
zebra: json support
Browse files Browse the repository at this point in the history 
Added json support for 'show evpn local-mac intf vlan.'

Signed-off-by: Ashwini Reddy <[email protected]>
  • Loading branch information
@ashred-lnx @sougata-github-nvidia
ashred-lnx authored and sougata-github-nvidia committed Dec 3, 2024
1 parent 489a332 commit 88f19f9
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 47 deletions.
1 change: 1 addition & 0 deletions zebra/zebra_l2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ struct zebra_l2_brvlan_mac_ctx {

/* input-output */
void *arg;
struct json_object *json; /* Used for JSON Output */
};

struct zebra_l2_bridge_if {
Expand Down
126 changes: 79 additions & 47 deletions zebra/zebra_l2_bridge_if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,32 @@
static void zebra_l2_brvlan_print_mac_hash(struct hash_bucket *bucket,
void *ctxt)
{
struct zebra_l2_brvlan_mac_ctx *ctx;
struct vty *vty;
struct zebra_l2_brvlan_mac *bmac;
char buf[ETHER_ADDR_STRLEN];
struct interface *ifp;

ctx = (struct zebra_l2_brvlan_mac_ctx *)ctxt;
vty = (struct vty *)(ctx->arg);
bmac = (struct zebra_l2_brvlan_mac *)bucket->data;

prefix_mac2str(&bmac->macaddr, buf, sizeof(buf));
ifp = if_lookup_by_index_per_ns(zebra_ns_lookup(NS_DEFAULT),
bmac->ifindex);

vty_out(vty, "%-17s %-7u %s\n", buf, bmac->ifindex,
ifp ? ifp->name : "-");
struct zebra_l2_brvlan_mac_ctx *ctx;
struct vty *vty;
struct zebra_l2_brvlan_mac *bmac;
json_object *json_obj = NULL, *json_mac = NULL;
char mac[ETHER_ADDR_STRLEN];
struct interface *ifp;

ctx = (struct zebra_l2_brvlan_mac_ctx *)ctxt;
vty = (struct vty *)(ctx->arg);
bmac = (struct zebra_l2_brvlan_mac *)bucket->data;
json_obj = ctx->json;

prefix_mac2str(&bmac->macaddr, mac, sizeof(mac));
ifp = if_lookup_by_index_per_ns(zebra_ns_lookup(NS_DEFAULT),
bmac->ifindex);

if (json_obj) {
json_mac = json_object_new_object();
json_object_int_add(json_mac, "IfIndex", bmac->ifindex);
json_object_string_add(json_mac, "Interface",
ifp ? ifp->name : "-");
json_object_object_add(json_obj, mac, json_mac);
} else {
vty_out(vty, "%-17s %-7u %s\n", mac, bmac->ifindex,
ifp ? ifp->name : "-");
}
}

static unsigned int zebra_l2_bridge_vlan_hash_keymake(const void *p)
Expand All @@ -87,37 +97,59 @@ static unsigned int zebra_l2_bridge_vlan_hash_keymake(const void *p)
void zebra_l2_brvlan_print_macs(struct vty *vty, struct interface *br_if,
vlanid_t vid, bool uj)
{
struct zebra_if *zif;
struct zebra_l2_bridge_if *br;
uint32_t num_macs;
struct zebra_l2_brvlan_mac_ctx ctx;

zif = (struct zebra_if *)br_if->info;
br = BRIDGE_FROM_ZEBRA_IF(zif);
if (!br) {
return;
}
if (!br->mac_table[vid]) {
vty_out(vty,
"%% bridge %s VID %u does not have a MAC hash table\n",
br_if->name, vid);
return;
}
num_macs = hashcount(br->mac_table[vid]);
if (!num_macs) {
vty_out(vty, "bridge %s VID %u - No local MACs\n", br_if->name,
vid);
return;
}

vty_out(vty, "bridge %s VID %u - Number of local MACs: %u\n",
br_if->name, vid, num_macs);
vty_out(vty, "%-17s %-7s %-30s\n", "MAC", "IfIndex", "Interface");
memset(&ctx, 0, sizeof(ctx));
ctx.br_if = br_if;
ctx.vid = vid;
ctx.arg = vty;
hash_iterate(br->mac_table[vid], zebra_l2_brvlan_print_mac_hash, &ctx);
struct zebra_if *zif;
struct zebra_l2_bridge_if *br;
uint32_t num_macs;
struct zebra_l2_brvlan_mac_ctx ctx;

zif = (struct zebra_if *)br_if->info;
br = BRIDGE_FROM_ZEBRA_IF(zif);
if (!br) {
return;
}
json_object *json_obj = NULL, *json_mac_obj = NULL;
if (uj) { /* json format */
json_obj = json_object_new_object();
json_mac_obj = json_object_new_object();
}

if (!br->mac_table[vid]) {
vty_out(vty,
"%% bridge %s VID %u does not have a MAC hash table\n",
br_if->name, vid);
return;
}
num_macs = hashcount(br->mac_table[vid]);
if (!num_macs) {
vty_out(vty, "bridge %s VID %u - No local MACs\n", br_if->name,
vid);
return;
}

if (uj) {
json_object_string_add(json_obj, "bridge", br_if->name);
json_object_int_add(json_obj, "VID", vid);
json_object_int_add(json_obj, "number of local MACS", num_macs);
} else {
vty_out(vty, "bridge %s VID %u - Number of local MACs: %u\n",
br_if->name, vid, num_macs);
vty_out(vty, "%-17s %-7s %-30s\n", "MAC", "IfIndex",
"Interface");
}
memset(&ctx, 0, sizeof(ctx));
ctx.br_if = br_if;
ctx.vid = vid;
ctx.arg = vty;
ctx.json = json_mac_obj;
hash_iterate(br->mac_table[vid], zebra_l2_brvlan_print_mac_hash, &ctx);
if (uj) {
json_object_object_add(json_obj, "MAC", json_mac_obj);
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json_obj, JSON_C_TO_STRING_PRETTY));
json_object_free(json_obj);
}

}

static bool zebra_l2_bridge_vlan_hash_cmp(const void *p1, const void *p2)
Expand Down

0 comments on commit 88f19f9

Please sign in to comment.