bgpd: readjust fields in evpn vni json cmd

1) Keep consistant field name, such as
"inKernel".
2) Keep fields order same for both outputs.

Testing Done:

TORS1# show bgp l2vpn evpn vni json
{
  "advertiseGatewayMacip":"Disabled",
  "advertiseSviMacip":"Disabled",
  "advertiseAllVnis":"Enabled",
  "flooding":"Head-end replication",
  "numVnis":8,
  "numL2Vnis":5,
  "numL3Vnis":3,
  "1002":{
    "vni":1002,
    "type":"L2",
    "inKernel":"True",
    "rd":"27.0.0.15:8",
    "originatorIp":"27.0.0.15",
    "mcastGroup":"0.0.0.0",
    "advertiseGatewayMacip":"Disabled",
    "advertiseSviMacip":"Disabled",
    "importRTs":[
      "5550:1002"
    ],
    "exportRTs":[
      "5550:1002"
    ]
  },
}

TORS1# show bgp l2vpn evpn vni 1002 json
{
  "vni":1002,
  "type":"L2",
  "inKernel":"True",
  "rd":"27.0.0.15:8",
  "originatorIp":"27.0.0.15",
  "mcastGroup":"0.0.0.0",
  "advertiseGatewayMacip":"Disabled",
  "advertiseSviMacip":"Disabled",
  "importRts":[
    "5550:1002"
  ],
  "exportRts":[
    "5550:1002"
  ]
}

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index de9e8e9afd176cc4988568b0a6005bec8d273a58..ea1196d6cb7f66f29e621cd6bc3162f1efa6801e 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -373,7 +373,7 @@ static void display_l3vni(struct vty *vty, struct bgp *bgp_vrf,
                json_export_rtl = json_object_new_array();
                json_object_int_add(json, "vni", bgp_vrf->l3vni);
                json_object_string_add(json, "type", "L3");
-               json_object_string_add(json, "kernelFlag", "Yes");
+               json_object_string_add(json, "inKernel", "True");
                json_object_string_add(
                        json, "rd",
                        prefix_rd2str(&bgp_vrf->vrf_prd, buf1, RD_ADDRSTRLEN));
@@ -519,8 +519,8 @@ static void display_vni(struct vty *vty, struct bgpevpn *vpn, json_object *json)
                json_export_rtl = json_object_new_array();
                json_object_int_add(json, "vni", vpn->vni);
                json_object_string_add(json, "type", "L2");
-               json_object_string_add(json, "kernelFlag",
-                                      is_vni_live(vpn) ? "Yes" : "No");
+               json_object_string_add(json, "inKernel",
+                                      is_vni_live(vpn) ? "True" : "False");
                json_object_string_add(
                        json, "rd",
                        prefix_rd2str(&vpn->prd, buf1, sizeof(buf1)));
@@ -1049,13 +1049,11 @@ static void show_vni_entry(struct hash_bucket *bucket, void *args[])
                json_object_string_add(json_vni, "type", "L2");
                json_object_string_add(json_vni, "inKernel",
                                       is_vni_live(vpn) ? "True" : "False");
-               json_object_string_add(json_vni, "originatorIp",
-                                      inet_ntoa(vpn->originator_ip));
-               json_object_string_add(json_vni, "originatorIp",
-                                      inet_ntoa(vpn->originator_ip));
                json_object_string_add(
                        json_vni, "rd",
                        prefix_rd2str(&vpn->prd, buf2, sizeof(buf2)));
+               json_object_string_add(json_vni, "originatorIp",
+                                      inet_ntoa(vpn->originator_ip));
                json_object_string_add(json_vni, "mcastGroup",
                                       inet_ntoa(vpn->mcast_grp));
                /* per vni knob is enabled -- Enabled