]> git.puffer.fish Git - mirror/frr.git/commitdiff
Revert "bgpd: fix pending commit check"
authorIgor Ryzhov <iryzhov@nfware.com>
Thu, 13 May 2021 22:38:26 +0000 (01:38 +0300)
committerIgor Ryzhov <iryzhov@nfware.com>
Wed, 19 May 2021 08:04:21 +0000 (11:04 +0300)
This reverts commit ea1a5c00df70d7204ccf8716222dc355e2501723.

bgpd/bgp_vty.c

index 8ed4c1c88c7828c33acada321297affd73c8fc80..91cc9ee38069f640df495c861f2db03033f91677 100644 (file)
@@ -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);