Merge pull request #13250 from chiragshah6/fdev1

bgpd:add local_es_df_preference into l2vpn-evpn es json output

diff --combined bgpd/bgp_evpn_mh.c
index 200bcea70b32cee8f58e7d5a44282c2e0bfef04c,c43d79d71a3ecdab6582945fe23933de57a9e6b9..4aff93514fbeaaefdd4502bdfc63ffb25e659ec3
--- 1/bgpd/bgp_evpn_mh.c
--- 2/bgpd/bgp_evpn_mh.c
+++ b/bgpd/bgp_evpn_mh.c
@@@ -1071,8 -1071,7 +1071,8 @@@ void update_type1_routes_for_evi(struc
                        continue;
  
                /* Update EAD-ES */
 -              bgp_evpn_ead_es_route_update(bgp, es);
 +              if (bgp_evpn_local_es_is_active(es))
 +                      bgp_evpn_ead_es_route_update(bgp, es);
  
                /* Update EAD-EVI */
                if (CHECK_FLAG(es->flags, BGP_EVPNES_ADV_EVI)) {
@@@ -2609,6 -2608,9 +2609,9 @@@ static void bgp_evpn_es_show_entry_deta
                                    listcount(es->macip_global_path_list));
                json_object_int_add(json, "inconsistentVniVtepCount",
                                es->incons_evi_vtep_cnt);
+               if (es->flags & BGP_EVPNES_LOCAL)
+                       json_object_int_add(json, "localEsDfPreference",
+                                           es->df_pref);
                if (listcount(es->es_vtep_list)) {
                        json_vteps = json_object_new_array();
                        for (ALL_LIST_ELEMENTS_RO(es->es_vtep_list, node,