summaryrefslogtreecommitdiff
path: root/src/conf_mode/protocols_bfd.py
diff options
context:
space:
mode:
authorThomas Mangin <thomas.mangin@exa.net.uk>2020-04-05 14:36:29 +0100
committerThomas Mangin <thomas.mangin@exa.net.uk>2020-04-06 20:22:35 +0100
commitaceb0817a65bf01669cada3ceb60d65b81607bc3 (patch)
tree5418d4537cfc14115536315909fbb7a83277fe7a /src/conf_mode/protocols_bfd.py
parent356950579c2b155f9d41c04ed63c7efde561b43a (diff)
downloadvyos-1x-aceb0817a65bf01669cada3ceb60d65b81607bc3.tar.gz
vyos-1x-aceb0817a65bf01669cada3ceb60d65b81607bc3.zip
util: T2226: covert most calls from os.system to util
As little change a possible but the function call The behaviour should be totally unchanged.
Diffstat (limited to 'src/conf_mode/protocols_bfd.py')
-rwxr-xr-xsrc/conf_mode/protocols_bfd.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py
index 9940c80c5..52a9e54c2 100755
--- a/src/conf_mode/protocols_bfd.py
+++ b/src/conf_mode/protocols_bfd.py
@@ -24,6 +24,8 @@ from vyos.config import Config
from vyos.defaults import directories as vyos_data_dir
from vyos.validate import is_ipv6_link_local, is_ipv6
from vyos import ConfigError
+from vyos.util import run
+
config_file = r'/tmp/bfd.frr'
@@ -205,7 +207,16 @@ 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
if os.path.exists(config_file):
os.remove(config_file)