From: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
Date: Tue, 27 Feb 2018 20:52:24 +0000 (-0800)
Subject: Merge branch 'master' into type5-default-originate
X-Git-Tag: frr-5.0-dev~171^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=58f9e4d3f227c7cdef45204e6f3a1f7673a5201b;p=mirror%2Ffrr.git

Merge branch 'master' into type5-default-originate
---

58f9e4d3f227c7cdef45204e6f3a1f7673a5201b
diff --cc bgpd/bgp_evpn_vty.c
index 0acc7cd6d3,f519bb463b..ad250a142f
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@@ -4462,21 -4324,47 +4397,57 @@@ void bgp_config_write_evpn_info(struct 
  	if (bgp->advertise_gw_macip)
  		vty_out(vty, "  advertise-default-gw\n");
  
 -	if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_ADVERTISE_IPV4_IN_EVPN))
 +	if (CHECK_FLAG(bgp->af_flags[AFI_L2VPN][SAFI_EVPN],
 +		       BGP_L2VPN_EVPN_ADVERTISE_IPV4_UNICAST))
  		vty_out(vty, "  advertise ipv4 unicast\n");
  
 -	if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_ADVERTISE_IPV6_IN_EVPN))
 +	if (CHECK_FLAG(bgp->af_flags[AFI_L2VPN][SAFI_EVPN],
 +		       BGP_L2VPN_EVPN_ADVERTISE_IPV6_UNICAST))
  		vty_out(vty, "  advertise ipv6 unicast\n");
  
 +	if (CHECK_FLAG(bgp->af_flags[AFI_L2VPN][SAFI_EVPN],
 +		       BGP_L2VPN_EVPN_DEFAULT_ORIGINATE_IPV4))
 +		vty_out(vty, "  default-originate ipv4\n");
 +
 +	if (CHECK_FLAG(bgp->af_flags[AFI_L2VPN][SAFI_EVPN],
 +		       BGP_L2VPN_EVPN_DEFAULT_ORIGINATE_IPV6))
 +		vty_out(vty, "  default-originate ipv6\n");
++
+ 	if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_RD_CFGD))
+ 		vty_out(vty, "   rd %s\n",
+ 			prefix_rd2str(&bgp->vrf_prd, buf1, sizeof(buf1)));
+ 
+ 	/* import route-target */
+ 	if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_IMPORT_RT_CFGD)) {
+ 		char *ecom_str;
+ 		struct listnode *node, *nnode;
+ 		struct ecommunity *ecom;
+ 
+ 		for (ALL_LIST_ELEMENTS(bgp->vrf_import_rtl, node, nnode,
+ 				       ecom)) {
+ 			ecom_str = ecommunity_ecom2str(
+ 				ecom, ECOMMUNITY_FORMAT_ROUTE_MAP, 0);
+ 			vty_out(vty, "   route-target import %s\n",
+ 				ecom_str);
+ 			XFREE(MTYPE_ECOMMUNITY_STR, ecom_str);
+ 		}
+ 	}
+ 
+ 	/* export route-target */
+ 	if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_EXPORT_RT_CFGD)) {
+ 		char *ecom_str;
+ 		struct listnode *node, *nnode;
+ 		struct ecommunity *ecom;
+ 
+ 		for (ALL_LIST_ELEMENTS(bgp->vrf_export_rtl, node, nnode,
+ 				       ecom)) {
+ 			ecom_str = ecommunity_ecom2str(
+ 				ecom, ECOMMUNITY_FORMAT_ROUTE_MAP, 0);
+ 			vty_out(vty, "   route-target export %s\n",
+ 				ecom_str);
+ 			XFREE(MTYPE_ECOMMUNITY_STR, ecom_str);
+ 		}
+ 	}
  }
  
  void bgp_ethernetvpn_init(void)