From 152b399a759b8a0577fa79a57a48488cd96a680f Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Fri, 14 May 2021 01:37:27 +0300 Subject: [PATCH] Revert "bgpd: forbid modification of bgp instance type" This reverts commit d3e3677096e5cf30116ca63879caf44e25b080ad. --- bgpd/bgp_nb_config.c | 17 +---------------- bgpd/bgp_vty.c | 4 ---- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c index a430124b51..b15e9e2241 100644 --- a/bgpd/bgp_nb_config.c +++ b/bgpd/bgp_nb_config.c @@ -1480,27 +1480,12 @@ int bgp_global_global_config_timers_keepalive_modify( */ int bgp_global_instance_type_view_modify(struct nb_cb_modify_args *args) { - struct bgp *bgp; - switch (args->event) { case NB_EV_VALIDATE: - /* - * Changing instance type is not allowed, but we must allow it - * once, when the BGP instance is created the first time. - * If the instance already exists - return the validation - * error. - */ - bgp = nb_running_get_entry_non_rec( - lyd_parent(lyd_parent(args->dnode)), NULL, false); - if (bgp) { - snprintf(args->errmsg, args->errmsg_len, - "Changing instance type is not allowed"); - return NB_ERR_VALIDATION; - } - break; case NB_EV_PREPARE: case NB_EV_ABORT: case NB_EV_APPLY: + /* TODO: implement me. */ break; } diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index f3aa404820..8ed4c1c88c 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -1383,10 +1383,6 @@ DEFUN_YANG_NOSH(router_bgp, nb_cli_enqueue_change(vty, "./global/instance-type-view", NB_OP_MODIFY, "true"); - } else { - nb_cli_enqueue_change(vty, - "./global/instance-type-view", - NB_OP_MODIFY, "false"); } ret = nb_cli_apply_changes(vty, base_xpath); -- 2.39.5