diff options
| author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-07 10:07:35 +0100 |
|---|---|---|
| committer | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-04-07 10:14:47 +0100 |
| commit | f52c3b345be8e5aa1af8bdebcc70c852bb320568 (patch) | |
| tree | eba1fc570ee7bbf8f32c257c0289f6cc59d991be /src/conf_mode/protocols_bfd.py | |
| parent | 09ad28b28c9ebd9308cfe9048686b3b0ef9cfd9c (diff) | |
| download | vyos-1x-f52c3b345be8e5aa1af8bdebcc70c852bb320568.tar.gz vyos-1x-f52c3b345be8e5aa1af8bdebcc70c852bb320568.zip | |
util: T2226: fix merge conflict
Diffstat (limited to 'src/conf_mode/protocols_bfd.py')
| -rwxr-xr-x | src/conf_mode/protocols_bfd.py | 11 |
1 files changed, 1 insertions, 10 deletions
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) |