bgpd: Evpn json cli output missing

Issue1: The following json cli commands are broken (they dont display
anything):
1. show [ip] bgp l2vpn evpn json
2. show [ip] bgp l2vpn evpn all neighbors <IP> routes json
3. show [ip] bgp l2vpn evpn rd <RD> json
4. show [ip] bgp l2vpn evpn rd <RD> neighbors <IP> routes json

RCA1: The existing json_object was partially filled.
Some fields like "prefix", "prefixLen", etc were not
filled in the json_object.
RCA2: Code missing to display the constructed json_object.

Issue2: Column header not shown on bgp evpn commands.
Fix: turned on the flag to display header

Output after fix:
The above commands have been made to follow the existing output style of
"show bgp l2vpn evpn routes json"
leaf-1# sh bgp l2vpn evpn json
{
  "bgpTableVersion":1,
  "bgpLocalRouterId":"10.100.0.1",
  "defaultLocPrf":100,
  "localAS":65000,
  "10.100.0.1:3":{
    "rd":"10.100.0.1:3",
    "[3]:[0]:[32]:[10.100.0.1]":{
      "prefix":"[3]:[0]:[32]:[10.100.0.1]",
      "prefixLen":288,
      "paths":[
        {
          "valid":true,
          "bestpath":true,
          "pathFrom":"external",
          "routeType":3,
          "ethTag":0,
          "ipLen":32,
          "ip":"10.100.0.1",
          "weight":32768,
          "peerId":"(unspec)",
          "aspath":"",
          "path":"",
          "origin":"IGP",
          "nexthops":[
            {
              "ip":"10.100.0.1",
              "afi":"ipv4",
              "used":true
            }
          ]
        }
      ]
    }
  },
..........
..........
  "10.100.0.2:2":{
    "rd":"10.100.0.2:2",
    "[3]:[0]:[32]:[10.100.0.2]":{
      "prefix":"[3]:[0]:[32]:[10.100.0.2]",
      "prefixLen":288,
      "paths":[
        {
          "valid":true,
          "bestpath":true,
          "pathFrom":"external",
          "routeType":3,
          "ethTag":0,
          "ipLen":32,
          "ip":"10.100.0.2",
          "weight":0,
          "peerId":"205.0.113.2",
          "aspath":"65002",
          "path":"65002",
          "origin":"IGP",
          "nexthops":[
            {
              "ip":"10.100.0.2",
              "afi":"ipv4",
              "used":true
            }
          ]
        },
        {
          "valid":true,
          "pathFrom":"external",
          "routeType":3,
          "ethTag":0,
          "ipLen":32,
          "ip":"10.100.0.2",
          "weight":0,
          "peerId":"203.0.113.4",
          "aspath":"65001 65002",
          "path":"65001 65002",
          "origin":"IGP",
          "nexthops":[
            {
              "ip":"10.100.0.2",
              "afi":"ipv4",
              "used":true
            }
          ]
        }
      ]
    }
  },
....
....
  "numPrefix":10,
  "totalPrefix":10
}
leaf-1# sh bgp l2vpn evpn
BGP table version is 1, local router ID is 10.100.0.1
Status codes:s suppressed, d damped, h history, * valid, > best, i - int
Origin codes: i - IGP, e - EGP, ? - incomplete

   Network          Next Hop            Metric LocPrf Weight Path
Route Distinguisher: ip 10.100.0.1:3

*> [3]:[0]:[32]:[10.100.0.1]
                    10.100.0.1                         32768 i
Route Distinguisher: ip 10.100.0.1:4

*> [3]:[0]:[32]:[10.100.0.1]
                    10.100.0.1                         32768 i
Route Distinguisher: ip 10.100.0.1:5

*> [3]:[0]:[32]:[10.100.0.1]
                    10.100.0.1                         32768 i
Route Distinguisher: ip 10.100.0.1:6

*> [3]:[0]:[32]:[10.100.0.1]
                    10.100.0.1                         32768 i
Route Distinguisher: ip 10.100.0.2:2

*> [3]:[0]:[32]:[10.100.0.2]
                    10.100.0.2                             0 65002 i
*  [3]:[0]:[32]:[10.100.0.2]
                    10.100.0.2                             0 65001 65002
Route Distinguisher: ip 10.100.0.2:3

*> [3]:[0]:[32]:[10.100.0.2]
                    10.100.0.2                             0 65002 i
*  [3]:[0]:[32]:[10.100.0.2]
                    10.100.0.2                             0 65001 65002
Route Distinguisher: ip 10.100.0.2:4

*> [3]:[0]:[32]:[10.100.0.2]
                    10.100.0.2                             0 65002 i
*  [3]:[0]:[32]:[10.100.0.2]
                    10.100.0.2                             0 65001 65002

Displayed 10 out of 10 total prefixes

Signed-off-by: Lakshman Krishnamoorthy <lkrishnamoor@vmware.com>

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 63b3145b53cb1e421c9d5fc4a67004c2686da42c..1bd153639bf1d03dac82b6a2315d0aeb0c6fc47b 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -1010,14 +1010,17 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
        struct bgp_path_info *pi;
        int rd_header;
        int header = 1;
+       char rd_str[BUFSIZ];
+       char buf[BUFSIZ];
 
        unsigned long output_count = 0;
        unsigned long total_count = 0;
        json_object *json = NULL;
        json_object *json_nroute = NULL;
        json_object *json_array = NULL;
-       json_object *json_scode = NULL;
-       json_object *json_ocode = NULL;
+       json_object *json_prefix_info = NULL;
+
+       memset(rd_str, 0, BUFSIZ);
 
        bgp = bgp_get_evpn();
        if (bgp == NULL) {
@@ -1028,31 +1031,13 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
                return CMD_WARNING;
        }
 
-       if (use_json) {
-               json_scode = json_object_new_object();
-               json_ocode = json_object_new_object();
+       if (use_json)
                json = json_object_new_object();
-               json_nroute = json_object_new_object();
-
-               json_object_string_add(json_scode, "suppressed", "s");
-               json_object_string_add(json_scode, "damped", "d");
-               json_object_string_add(json_scode, "history", "h");
-               json_object_string_add(json_scode, "valid", "*");
-               json_object_string_add(json_scode, "best", ">");
-               json_object_string_add(json_scode, "internal", "i");
-
-               json_object_string_add(json_ocode, "igp", "i");
-               json_object_string_add(json_ocode, "egp", "e");
-               json_object_string_add(json_ocode, "incomplete", "?");
-       }
 
        for (rn = bgp_table_top(bgp->rib[afi][SAFI_EVPN]); rn;
             rn = bgp_route_next(rn)) {
                uint64_t tbl_ver;
 
-               if (use_json)
-                       continue; /* XXX json TODO */
-
                if (prd && memcmp(rn->p.u.val, prd->val, 8) != 0)
                        continue;
 
@@ -1075,28 +1060,23 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
                                                       pi->peer->su_remote, su))
                                                continue;
                                }
-                               if (header == 0) {
+                               if (header) {
                                        if (use_json) {
-                                               if (option
-                                                   == SHOW_DISPLAY_TAGS) {
-                                                       json_object_int_add(
-                                                               json,
-                                                               "bgpTableVersion",
-                                                               tbl_ver);
-                                                       json_object_string_add(
-                                                               json,
-                                                               "bgpLocalRouterId",
-                                                               inet_ntoa(
-                                                                       bgp->router_id));
-                                                       json_object_object_add(
-                                                               json,
-                                                               "bgpStatusCodes",
-                                                               json_scode);
-                                                       json_object_object_add(
-                                                               json,
-                                                               "bgpOriginCodes",
-                                                               json_ocode);
-                                               }
+                                               json_object_int_add(
+                                                       json, "bgpTableVersion",
+                                                       tbl_ver);
+                                               json_object_string_add(
+                                                       json,
+                                                       "bgpLocalRouterId",
+                                                       inet_ntoa(
+                                                       bgp->router_id));
+                                               json_object_int_add(
+                                                       json,
+                                                       "defaultLocPrf",
+                                                       bgp->default_local_pref);
+                                               json_object_int_add(
+                                                       json, "localAS",
+                                                       bgp->as);
                                        } else {
                                                if (option == SHOW_DISPLAY_TAGS)
                                                        vty_out(vty,
@@ -1139,21 +1119,39 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
                                        else if (type == RD_TYPE_IP)
                                                decode_rd_ip(pnt + 2, &rd_ip);
                                        if (use_json) {
-                                               char buffer[BUFSIZ];
+                                               json_nroute =
+                                                     json_object_new_object();
+                                               json_prefix_info =
+                                                      json_object_new_object();
+                                               json_array =
+                                                       json_object_new_array();
                                                if (type == RD_TYPE_AS
                                                    || type == RD_TYPE_AS4)
-                                                       sprintf(buffer, "%u:%d",
+                                                       sprintf(rd_str, "%u:%d",
                                                                rd_as.as,
                                                                rd_as.val);
                                                else if (type == RD_TYPE_IP)
-                                                       sprintf(buffer, "%s:%d",
+                                                       sprintf(rd_str, "%s:%d",
                                                                inet_ntoa(
                                                                        rd_ip.ip),
                                                                rd_ip.val);
                                                json_object_string_add(
                                                        json_nroute,
-                                                       "routeDistinguisher",
-                                                       buffer);
+                                                       "rd",
+                                                       rd_str);
+
+                                               json_object_string_add(
+                                                       json_prefix_info,
+                                                       "prefix",
+                                                       bgp_evpn_route2str(
+                                                       (struct prefix_evpn *)
+                                                       &rm->p, buf, BUFSIZ));
+
+                                               json_object_int_add(
+                                                       json_prefix_info,
+                                                       "prefixLen",
+                                                       rm->p.prefixlen);
+
                                        } else {
                                                vty_out(vty,
                                                        "Route Distinguisher: ");
@@ -1176,10 +1174,6 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
                                        }
                                        rd_header = 0;
                                }
-                               if (use_json)
-                                       json_array = json_object_new_array();
-                               else
-                                       json_array = NULL;
                                if (option == SHOW_DISPLAY_TAGS)
                                        route_vty_out_tag(vty, &rm->p, pi, 0,
                                                          SAFI_EVPN,
@@ -1192,13 +1186,31 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
                                                      SAFI_EVPN, json_array);
                                output_count++;
                        }
-               /* XXX json */
+
+               if (use_json) {
+                       json_object_object_add(json_prefix_info, "paths",
+                               json_array);
+                       json_object_object_add(json_nroute, buf,
+                               json_prefix_info);
+                       json_object_object_add(json, rd_str, json_nroute);
+               }
+       }
+
+       if (use_json) {
+               json_object_int_add(json, "numPrefix", output_count);
+               json_object_int_add(json, "totalPrefix", total_count);
+               vty_out(vty, "%s\n", json_object_to_json_string_ext(
+                       json, JSON_C_TO_STRING_PRETTY));
+               json_object_free(json);
+       } else {
+               if (output_count == 0)
+                       vty_out(vty, "No prefixes displayed, %ld exist\n",
+                               total_count);
+               else
+                       vty_out(vty,
+                               "\nDisplayed %ld out of %ld total prefixes\n",
+                               output_count, total_count);
        }
-       if (output_count == 0)
-               vty_out(vty, "No prefixes displayed, %ld exist\n", total_count);
-       else
-               vty_out(vty, "\nDisplayed %ld out of %ld total prefixes\n",
-                       output_count, total_count);
        return CMD_SUCCESS;
 }