*: Reintroduce JSON keywords for EVPN

Bring back "numVnis" and "originatorIp" for backwards compatibility.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Ticket: CM-19119
Reviewed By: Trivial
Testing Done: Manual, evpn_tests.py

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 9f35671968a1c44550f1ca1a1c5cb7a0c6d3082c..56c138ae8cd610da83780b84d829909685160a9a 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -679,6 +679,8 @@ static void show_l3vni_entry(struct vty *vty, struct bgp *bgp,
                json_object_int_add(json_vni, "vni", bgp->l3vni);
                json_object_string_add(json_vni, "type", "L3");
                json_object_string_add(json_vni, "inKernel", "True");
+               json_object_string_add(json_vni, "originatorIp",
+                                      inet_ntoa(bgp->originator_ip));
                json_object_string_add(
                        json_vni, "rd",
                        prefix_rd2str(&bgp->vrf_prd, buf2, RD_ADDRSTRLEN));
@@ -786,6 +788,8 @@ static void show_vni_entry(struct hash_backet *backet, void *args[])
                                       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)));
@@ -2846,6 +2850,7 @@ DEFUN(show_bgp_l2vpn_evpn_vni,
        json_object *json = NULL;
        u_int32_t num_l2vnis = 0;
        u_int32_t num_l3vnis = 0;
+       uint32_t num_vnis = 0;
        struct listnode *node = NULL;
        struct bgp *bgp_temp = NULL;
 
@@ -2869,6 +2874,7 @@ DEFUN(show_bgp_l2vpn_evpn_vni,
                        if (bgp_temp->l3vni)
                                num_l3vnis++;
                }
+               num_vnis = num_l2vnis + num_l3vnis;
                if (uj) {
                        json_object_string_add(json, "advertiseGatewayMacip",
                                               bgp_def->advertise_gw_macip
@@ -2878,6 +2884,7 @@ DEFUN(show_bgp_l2vpn_evpn_vni,
                                               is_evpn_enabled()
                                                       ? "Enabled"
                                                       : "Disabled");
+                       json_object_int_add(json, "numVnis", num_vnis);
                        json_object_int_add(json, "numL2Vnis", num_l2vnis);
                        json_object_int_add(json, "numL3Vnis", num_l3vnis);
                } else {

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 69ed93a084761ec529105ef3f167833daad752f2..c05abc3528c7cec17502e8960fdb6ee6442b6961 100644 (file)
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -4634,6 +4634,7 @@ void zebra_vxlan_print_evpn(struct vty *vty, u_char uj)
 {
        int num_l2vnis = 0;
        int num_l3vnis = 0;
+       int num_vnis = 0;
        json_object *json = NULL;
        struct zebra_ns *zns = NULL;
        struct zebra_vrf *zvrf = NULL;
@@ -4651,11 +4652,13 @@ void zebra_vxlan_print_evpn(struct vty *vty, u_char uj)
 
        num_l3vnis = hashcount(zns->l3vni_table);
        num_l2vnis = hashcount(zvrf->vni_table);
+       num_vnis = num_l2vnis + num_l3vnis;
 
        if (uj) {
                json = json_object_new_object();
                json_object_string_add(json, "advertiseGatewayMacip",
                                       zvrf->advertise_gw_macip ? "Yes" : "No");
+               json_object_int_add(json, "numVnis", num_vnis);
                json_object_int_add(json, "numL2Vnis", num_l2vnis);
                json_object_int_add(json, "numL3Vnis", num_l3vnis);
        } else {