]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: fix show bgp l2vpn evpn route json 4670/head
authorChirag Shah <chirag@cumulusnetworks.com>
Tue, 9 Jul 2019 18:51:46 +0000 (11:51 -0700)
committerChirag Shah <chirag@cumulusnetworks.com>
Tue, 9 Jul 2019 19:17:45 +0000 (12:17 -0700)
PR-4544 has introduced a new filed extended community
in show bgp l2vpn evpn route command.
The header has missed checking json is enabled.

Ticket:CM-25581
Reviewed By:
Testing Done:

TORS1# show bgp l2vpn evpn route json
{
  "27.0.0.15:8":{
    "rd":"27.0.0.15:8",
    "[2]:[0]:[48]:[00:02:00:00:00:0a]":{
      "prefix":"[2]:[0]:[48]:[00:02:00:00:00:0a]",
      "prefixLen":288,
      "paths":[
        [
          {
            "valid":true,
            "bestpath":true,
            "pathFrom":"external",
            "routeType":2,
            "ethTag":0,
            "macLen":48,
            "mac":"00:02:00:00:00:0a",
            "weight":32768,
            "peerId":"(unspec)",
            "aspath":"",
            "path":"",
            "origin":"IGP",
            "extendedCommunity":{
              "string":"ET:8 RT:5550:1002"
            },
            "nexthops":[
              {
                "ip":"27.0.0.15",
                "afi":"ipv4",
                "used":true
              }
            ]
          }
        ]
      ]
    },
   ...
  },
  "numPrefix":187,
  "numPaths":343
}

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
bgpd/bgp_evpn_vty.c

index 44e9375dc99c6c04819c8f104d7dd0c57e2121a9..a22082c0723b9eade40a442258673b55a01831e8 100644 (file)
@@ -2480,7 +2480,9 @@ static void evpn_show_all_routes(struct vty *vty, struct bgp *bgp, int type,
                                        bgp_evpn_show_route_header(vty, bgp,
                                                                   tbl_ver,
                                                                   json);
-                                       vty_out(vty, "%19s Extended Community\n"
+                                       if (!json)
+                                               vty_out(vty,
+                                                       "%19s Extended Community\n"
                                                        , " ");
                                        header = 0;
                                }