From: Igor Ryzhov <iryzhov@nfware.com>
Date: Thu, 13 May 2021 22:37:27 +0000 (+0300)
Subject: Revert "bgpd: forbid modification of bgp instance type"
X-Git-Tag: base_8.1~235^2~49
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cfb37710bc3b1ee3fee5f0d13496546080c5e70b;p=mirror%2Ffrr.git

Revert "bgpd: forbid modification of bgp instance type"

This reverts commit d3e3677096e5cf30116ca63879caf44e25b080ad.
---

diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c
index ab22aee1ca..7573c40cfa 100644
--- a/bgpd/bgp_nb_config.c
+++ b/bgpd/bgp_nb_config.c
@@ -1508,27 +1508,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 909815a133..fb01d16b97 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1452,10 +1452,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_clear_pending(vty, base_xpath);