Revert "bgpd: no router bgp check candidate config"

This reverts commit 4b63e358bc.
This commit is contained in:
Igor Ryzhov 2021-05-14 02:13:15 +03:00
parent cd6012bb22
commit 8382083a8f

View File

@ -1406,17 +1406,13 @@ DEFUN_YANG(no_router_bgp,
struct bgp *bgp;
const char *name = NULL;
char base_xpath[XPATH_MAXLEN];
const struct lyd_node *bgp_glb_dnode;
// "no router bgp" without an ASN
if (argc == 3) {
// Pending: Make VRF option available for ASN less config
snprintf(base_xpath, sizeof(base_xpath), FRR_BGP_GLOBAL_XPATH,
"frr-bgp:bgp", "bgp", VRF_DEFAULT_NAME);
bgp = bgp_get_default();
bgp_glb_dnode = yang_dnode_get(vty->candidate_config->dnode,
base_xpath);
if (!bgp_glb_dnode) {
if (bgp == NULL) {
vty_out(vty, "%% No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED;
}
@ -1426,11 +1422,6 @@ DEFUN_YANG(no_router_bgp,
return CMD_WARNING_CONFIG_FAILED;
}
/* tcli mode bgp would not be set until apply stage. */
bgp = nb_running_get_entry(bgp_glb_dnode, NULL, false);
if (!bgp)
return CMD_SUCCESS;
if (bgp->l3vni) {
vty_out(vty, "%% Please unconfigure l3vni %u",
bgp->l3vni);