proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: don't use operational state in "router bgp" command

Browse Source 
Instead of using bgp_get_default which refers to operational state, we
can check existence of the default node using only candidate config.
The same thing is done in "no router bgp" command.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-03-14 20:04:42 +03:00
parent 45d1d7c9a2
commit 4062b455a6
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bgpd/bgp_vty.c
View File

@ -1324,16 +1324,19 @@ DEFUN_YANG_NOSH(router_bgp,
as_t as; as_t as;
struct bgp *bgp; struct bgp *bgp;
const char *name = NULL; const char *name = NULL;
char as_str[12] = {'\0'};
enum bgp_instance_type inst_type; enum bgp_instance_type inst_type;
char base_xpath[XPATH_MAXLEN]; char base_xpath[XPATH_MAXLEN];
const struct lyd_node *bgp_glb_dnode;
// "router bgp" without an ASN // "router bgp" without an ASN
if (argc == 2) { if (argc == 2) {
// Pending: Make VRF option available for ASN less config // Pending: Make VRF option available for ASN less config
bgp = bgp_get_default(); snprintf(base_xpath, sizeof(base_xpath), FRR_BGP_GLOBAL_XPATH,
"frr-bgp:bgp", "bgp", VRF_DEFAULT_NAME);
if (bgp == NULL) { bgp_glb_dnode = yang_dnode_get(vty->candidate_config->dnode,
base_xpath);
if (!bgp_glb_dnode) {
vty_out(vty, "%% No BGP process is configured\n"); vty_out(vty, "%% No BGP process is configured\n");
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
@ -1343,31 +1346,19 @@ DEFUN_YANG_NOSH(router_bgp,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
snprintf(base_xpath, sizeof(base_xpath), FRR_BGP_GLOBAL_XPATH, as = yang_dnode_get_uint32(bgp_glb_dnode, "./global/local-as");
"frr-bgp:bgp", "bgp", VRF_DEFAULT_NAME);
nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL); VTY_PUSH_XPATH(BGP_NODE, base_xpath);
snprintf(as_str, 12, "%d", bgp->as);
nb_cli_enqueue_change(vty, "./global/local-as", NB_OP_MODIFY,
as_str);
if (bgp->inst_type == BGP_INSTANCE_TYPE_VIEW) {
nb_cli_enqueue_change(vty,
"./global/instance-type-view",
NB_OP_MODIFY, "true");
}
nb_cli_pending_commit_check(vty); /*
ret = nb_cli_apply_changes(vty, base_xpath); * For backward compatibility with old commands we still
if (ret == CMD_SUCCESS) { * need to use the qobj infrastructure.
VTY_PUSH_XPATH(BGP_NODE, base_xpath); */
bgp = bgp_lookup(as, NULL);
/* if (bgp)
* For backward compatibility with old commands we still
* need to use the qobj infrastructure.
*/
VTY_PUSH_CONTEXT(BGP_NODE, bgp); VTY_PUSH_CONTEXT(BGP_NODE, bgp);
}
return ret; return CMD_SUCCESS;
} }
// "router bgp X" // "router bgp X"