Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / lib_vty.c

diff --git a/lib/lib_vty.c b/lib/lib_vty.c
index 2c8f2e90473d3ac83039a91aa74d21a75dfdae78..c13d88a1e8216f877ba072eace5b499aef9a91ae 100644 (file)
--- a/lib/lib_vty.c
+++ b/lib/lib_vty.c
@@ -242,6 +242,17 @@ DEFUN_NOSH(end_config, end_config_cmd, "XFRR_end_configuration",
        ret = nb_cli_pending_commit_check(vty);
 
        zlog_info("Configuration Read in Took: %s", readin_time_str);
+       zlog_debug("%s: VTY:%p, pending SET-CFG: %u", __func__, vty,
+                  (uint32_t)vty->mgmt_num_pending_setcfg);
+
+       /*
+        * If (and only if) we have sent any CLI config commands to MGMTd
+        * FE interface using vty_mgmt_send_config_data() without implicit
+        * commit before, should we need to send an explicit COMMIT-REQ now
+        * to apply all those commands at once.
+        */
+       if (vty->mgmt_num_pending_setcfg && vty_mgmt_fe_enabled())
+               vty_mgmt_send_commit_config(vty, false, false);
 
        if (callback.end_config)
                (*callback.end_config)();