bgpd: unblock l2vpn evpn for non default vrf

Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index c98cf9c327d7723e2c1ce22368588b364253b96d..3ef5e993fca341df870d21ee3bcf9ed381c52286 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -6104,7 +6104,8 @@ DEFUN_NOSH (address_family_ipv4_safi,
                safi_t safi = bgp_vty_safi_from_str(argv[2]->text);
                if (bgp->inst_type != BGP_INSTANCE_TYPE_DEFAULT &&
                    safi != SAFI_UNICAST && safi != SAFI_MULTICAST) {
-                       vty_out(vty, "Only Unicast and Multicast SAFIs supported in non-core instances.\n");
+                       vty_out(vty,
+                               "Only Unicast/Multicast/EVPN SAFIs supported in non-core instances.\n");
                        return CMD_WARNING_CONFIG_FAILED;
                }
                vty->node = bgp_node_type(AFI_IP, safi);
@@ -6126,7 +6127,8 @@ DEFUN_NOSH (address_family_ipv6_safi,
                safi_t safi = bgp_vty_safi_from_str(argv[2]->text);
                if (bgp->inst_type != BGP_INSTANCE_TYPE_DEFAULT &&
                    safi != SAFI_UNICAST && safi != SAFI_MULTICAST) {
-                       vty_out(vty, "Only Unicast and Multicast SAFIs supported in non-core instances.\n");
+                       vty_out(vty,
+                               "Only Unicast/Multicast/EVPN SAFIs supported in non-core instances.\n");
                        return CMD_WARNING_CONFIG_FAILED;
                }
                vty->node = bgp_node_type(AFI_IP6, safi);
@@ -6168,10 +6170,6 @@ DEFUN_NOSH (address_family_evpn,
        "Address Family modifier\n")
 {
        VTY_DECLVAR_CONTEXT(bgp, bgp);
-       if (bgp->inst_type != BGP_INSTANCE_TYPE_DEFAULT) {
-               vty_out(vty, "Only Unicast and Multicast SAFIs supported in non-core instances.\n");
-               return CMD_WARNING_CONFIG_FAILED;
-       }
        vty->node = BGP_EVPN_NODE;
        return CMD_SUCCESS;
 }