diff options
author | Nitin Soni <nsoni@cumulusnetworks.com> | 2018-11-15 18:33:43 +0100 |
---|---|---|
committer | Nitin Soni <nsoni@cumulusnetworks.com> | 2018-11-21 17:13:01 +0100 |
commit | 09af6961d4b736096eb479322f99a284f6115366 (patch) | |
tree | d6cabffd9116059795274232447880729b0dec54 /zebra/zebra_vxlan.c | |
parent | Merge pull request #3326 from qlyoung/fix-lla-reinstallation (diff) | |
download | frr-09af6961d4b736096eb479322f99a284f6115366.tar.xz frr-09af6961d4b736096eb479322f99a284f6115366.zip |
zebra: Add "show evpn vni detail" command
Change helps display detailed output for all possible VNIs without
specifying VNI. It helps in troubleshooting - a single command can
be fired to capture detailed info on all VNIs.
Ticket: CM-22831
Signed-off-by: Nitin Soni <nsoni@cumulusnetworks.com>
Reviewed-by: CCR-8013
Diffstat (limited to 'zebra/zebra_vxlan.c')
-rw-r--r-- | zebra/zebra_vxlan.c | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index d372d3e83..ee6091a18 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -1195,6 +1195,35 @@ static void zl3vni_print_hash(struct hash_backet *backet, void *ctx[]) } } +/* Private Structure to pass callback data for hash iterator */ +struct zvni_evpn_show { + struct vty *vty; + json_object *json; + struct zebra_vrf *zvrf; +}; + +/* print a L3 VNI hash entry in detail*/ +static void zl3vni_print_hash_detail(struct hash_backet *backet, void *data) +{ + struct vty *vty = NULL; + zebra_l3vni_t *zl3vni = NULL; + json_object *json = NULL; + bool use_json = false; + struct zvni_evpn_show *zes = data; + + vty = zes->vty; + json = zes->json; + + if (json) + use_json = true; + + zl3vni = (zebra_l3vni_t *)backet->data; + + zebra_vxlan_print_vni(vty, zes->zvrf, zl3vni->vni, use_json); + vty_out(vty, "\n"); +} + + /* * Print a VNI hash entry - called for display of all VNIs. */ @@ -1260,6 +1289,29 @@ static void zvni_print_hash(struct hash_backet *backet, void *ctxt[]) } /* + * Print a VNI hash entry in detail - called for display of all VNIs. + */ +static void zvni_print_hash_detail(struct hash_backet *backet, void *data) +{ + struct vty *vty; + zebra_vni_t *zvni; + json_object *json = NULL; + bool use_json = false; + struct zvni_evpn_show *zes = data; + + vty = zes->vty; + json = zes->json; + + if (json) + use_json = true; + + zvni = (zebra_vni_t *)backet->data; + + zebra_vxlan_print_vni(vty, zes->zvrf, zvni->vni, use_json); + vty_out(vty, "\n"); +} + +/* * Inform BGP about local MACIP. */ static int zvni_macip_send_msg_to_client(vni_t vni, struct ethaddr *macaddr, @@ -5427,6 +5479,49 @@ void zebra_vxlan_print_vnis(struct vty *vty, struct zebra_vrf *zvrf, } /* + * Display VNI hash table in detail(VTY command handler). + */ +void zebra_vxlan_print_vnis_detail(struct vty *vty, struct zebra_vrf *zvrf, + bool use_json) +{ + json_object *json = NULL; + struct zebra_ns *zns = NULL; + struct zvni_evpn_show zes; + + if (!is_evpn_enabled()) + return; + + zns = zebra_ns_lookup(NS_DEFAULT); + if (!zns) + return; + + + if (use_json) + json = json_object_new_object(); + + zes.vty = vty; + zes.json = json; + zes.zvrf = zvrf; + + /* Display all L2-VNIs */ + hash_iterate(zvrf->vni_table, (void (*)(struct hash_backet *, + void *))zvni_print_hash_detail, + &zes); + + /* Display all L3-VNIs */ + hash_iterate(zrouter.l3vni_table, + (void (*)(struct hash_backet *, + void *))zl3vni_print_hash_detail, + &zes); + + if (use_json) { + vty_out(vty, "%s\n", json_object_to_json_string_ext( + json, JSON_C_TO_STRING_PRETTY)); + json_object_free(json); + } +} + +/* * Handle neighbor delete notification from the kernel (on a VLAN device * / L3 interface). This may result in either the neighbor getting deleted * from our database or being re-added to the kernel (if it is a valid |