From 500c150bf049421b74dd6bc6a3e55c3e2600cc62 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 23 Jun 2025 14:46:33 -0500 Subject: T7499: load from internal representation to avoid re-parsing --- src/helpers/vyos-merge-config.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/helpers/vyos-merge-config.py') diff --git a/src/helpers/vyos-merge-config.py b/src/helpers/vyos-merge-config.py index 197b35bfa..9ac4a1aed 100755 --- a/src/helpers/vyos-merge-config.py +++ b/src/helpers/vyos-merge-config.py @@ -84,11 +84,10 @@ session_ct = config.get_config_tree() merge_res = merge(session_ct, merge_ct, destructive=args.destructive) if config.vyconf_session is not None: - with tempfile.NamedTemporaryFile() as merged_file: - with open(merged_file, 'w') as f: - f.write(merge_res.to_string()) + with tempfile.NamedTemporaryFile() as merged_cache: + merge_res.write_cache(merged_cache.name) - out, err = config.vyconf_session.load_config(merged_file) + out, err = config.vyconf_session.load_config(merged_cache.name, cached=True) if err: sys.exit(out) print(out) -- cgit v1.2.3