From f52c3b345be8e5aa1af8bdebcc70c852bb320568 Mon Sep 17 00:00:00 2001 From: Thomas Mangin Date: Tue, 7 Apr 2020 10:07:35 +0100 Subject: util: T2226: fix merge conflict --- src/conf_mode/protocols_bfd.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/conf_mode/protocols_bfd.py') diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py index 52a9e54c2..a62d2158e 100755 --- a/src/conf_mode/protocols_bfd.py +++ b/src/conf_mode/protocols_bfd.py @@ -207,16 +207,7 @@ def apply(bfd): if bfd is None: return None -<<<<<<< HEAD - os.system(f'vtysh -d bfdd -f {config_file}') -======= - tmpl = jinja2.Template(config_tmpl) - config_text = tmpl.render(bfd) - with open(config_file, 'w') as f: - f.write(config_text) - - run("sudo vtysh -d bfdd -f " + config_file) ->>>>>>> util: T2226: covert most calls from os.system to util + run("vtysh -d bfdd -f " + config_file) if os.path.exists(config_file): os.remove(config_file) -- cgit v1.2.3