bgpd: json support for show bgp l2vpn evpn vrf-import-rt

Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index c3f77aba27cbe69c78a40da4d87ccab7e0087832..03e3545b4eb65fc4a81ed8922fcf2cdadc48be9f 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -158,8 +158,8 @@ static void show_vrf_import_rt_entry(struct hash_backet *backet,
        struct vty *vty = NULL;
        struct vrf_irt_node *irt = (struct vrf_irt_node *)backet->data;
 
-       vty = args[0];
-       json = args[1];
+       vty = (struct vty *)args[0];
+       json = (struct json_object *)args[1];
 
        display_vrf_import_rt(vty, irt, json);
 }
@@ -2982,7 +2982,7 @@ DEFUN(show_bgp_l2vpn_evpn_vrf_import_rt,
       JSON_STR)
 {
        u_char uj = 0;
-       struct bgp *bgp_def;
+       struct bgp *bgp_def = NULL;
        json_object *json = NULL;
 
        bgp_def = bgp_get_default();

diff --git a/lib/vrf.c b/lib/vrf.c
index 6a0ab55b8155e007ab8cee7018d74ad5e34f9c79..3c34b952620d123c1dcdc9aec586062a0172b31d 100644 (file)
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -233,7 +233,7 @@ const char *vrf_id_to_name(vrf_id_t vrf_id)
        if (vrf)
                return vrf->name;
 
-       return NULL;
+       return "n/a";
 }
 
 vrf_id_t vrf_name_to_id(const char *name)