Merge pull request #332 from thomas-mangin/T2230

template: T2230: use render to generate templates

1 files changed, 2 insertions, 12 deletions

diff --git a/src/conf_mode/protocols_igmp.py b/src/conf_mode/protocols_igmp.py
index 141b1950d..9b338c5b9 100755
--- a/src/conf_mode/protocols_igmp.py
+++ b/src/conf_mode/protocols_igmp.py
@@ -17,13 +17,12 @@
 import os
 
 from ipaddress import IPv4Address
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos import ConfigError
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/tmp/igmp.frr'
@@ -88,16 +87,7 @@ def generate(igmp):
     if igmp is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'igmp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('igmp.frr.tmpl')
-    config_text = tmpl.render(igmp)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'igmp/igmp.frr.tmpl', igmp)
     return None
 
 def apply(igmp):