Merge pull request #10086 from donaldsharp/cpp_removal

tools, vtysh: Remove final vestige of `address-family evpn`
This commit is contained in:
Igor Ryzhov 2021-11-17 19:07:19 +03:00 committed by GitHub
commit 503661c62f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 27 deletions

View File

@ -487,17 +487,6 @@ class Config(object):
neighbor 2001:10::3 peer-group IBGPv6
exit-address-family
!
end
address-family evpn
neighbor LEAF activate
advertise-all-vni
vni 10100
rd 65000:10100
route-target import 10.1.1.1:10100
route-target export 10.1.1.1:10100
exit-vni
exit-address-family
!
end
router ospf
ospf router-id 10.0.0.1

View File

@ -1799,22 +1799,6 @@ DEFUNSH(VTYSH_BGPD, address_family_evpn, address_family_evpn_cmd,
return CMD_SUCCESS;
}
#if defined(HAVE_CUMULUS)
#if CONFDATE > 20211115
CPP_NOTICE("Use of `address-family evpn` is deprecated please remove don't forget frr-reload.py")
#endif
DEFUNSH_HIDDEN(VTYSH_BGPD, address_family_evpn2, address_family_evpn2_cmd,
"address-family evpn",
"Enter Address Family command mode\n"
"EVPN Address family\n")
{
vty_out(vty,
"This command is deprecated please convert to `address-family l2vpn evpn`\n");
vty->node = BGP_EVPN_NODE;
return CMD_SUCCESS;
}
#endif
DEFUNSH(VTYSH_BGPD, bgp_evpn_vni, bgp_evpn_vni_cmd, "vni " CMD_VNI_RANGE,
"VXLAN Network Identifier\n"
"VNI number\n")