diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-07 11:24:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 11:24:51 +0200 |
| commit | 8cc6bd529c76c2958999dcc379c418d748181731 (patch) | |
| tree | eba1fc570ee7bbf8f32c257c0289f6cc59d991be | |
| parent | 09ad28b28c9ebd9308cfe9048686b3b0ef9cfd9c (diff) | |
| parent | f52c3b345be8e5aa1af8bdebcc70c852bb320568 (diff) | |
| download | vyos-1x-8cc6bd529c76c2958999dcc379c418d748181731.tar.gz vyos-1x-8cc6bd529c76c2958999dcc379c418d748181731.zip | |
Merge pull request #308 from thomas-mangin/T2226-merge
util: T2226: fix merge conflict
| -rwxr-xr-x | src/conf_mode/protocols_bfd.py | 11 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_pim.py | 6 |
2 files changed, 2 insertions, 15 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) diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py index 0e22d3a6b..9b74fe992 100755 --- a/src/conf_mode/protocols_pim.py +++ b/src/conf_mode/protocols_pim.py @@ -132,11 +132,7 @@ def apply(pim): return None if os.path.exists(config_file): -<<<<<<< HEAD - os.system("vtysh -d pimd -f " + config_file) -======= - run("sudo vtysh -d pimd -f " + config_file) ->>>>>>> util: T2226: covert most calls from os.system to util + run("vtysh -d pimd -f " + config_file) os.remove(config_file) return None |