From: Igor Ryzhov <iryzhov@nfware.com>
Date: Thu, 13 May 2021 22:38:26 +0000 (+0300)
Subject: Revert "bgpd: fix pending commit check"
X-Git-Tag: frr-8.0~24^2~47
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=57c8ca208eed1da866792364f078307db98d2f63;p=mirror%2Ffrr.git

Revert "bgpd: fix pending commit check"

This reverts commit ea1a5c00df70d7204ccf8716222dc355e2501723.
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 8ed4c1c88c..91cc9ee380 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1385,6 +1385,7 @@ DEFUN_YANG_NOSH(router_bgp,
 					      NB_OP_MODIFY, "true");
 		}
 
+		nb_cli_pending_commit_check(vty);
 		ret = nb_cli_apply_changes(vty, base_xpath);
 		if (ret == CMD_SUCCESS) {
 			VTY_PUSH_XPATH(BGP_NODE, base_xpath);
@@ -1393,7 +1394,6 @@ DEFUN_YANG_NOSH(router_bgp,
 			 * For backward compatibility with old commands we still
 			 * need to use the qobj infrastructure.
 			 */
-			nb_cli_pending_commit_check(vty);
 			bgp = bgp_lookup(as, name);
 			if (bgp)
 				VTY_PUSH_CONTEXT(BGP_NODE, bgp);