template: T2230: use render to generate templates

convert all call to jinja to use template.render

1 files changed, 4 insertions, 17 deletions

diff --git a/src/conf_mode/system-wifi-regdom.py b/src/conf_mode/system-wifi-regdom.py
index 943c42274..b222df0a9 100755
--- a/src/conf_mode/system-wifi-regdom.py
+++ b/src/conf_mode/system-wifi-regdom.py
@@ -18,11 +18,11 @@ import os
 
 from copy import deepcopy
 from sys import exit
-from jinja2 import FileSystemLoader, Environment
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
+from vyos.template import render
+
 
 config_80211_file='/etc/modprobe.d/cfg80211.conf'
 config_crda_file='/etc/default/crda'
@@ -67,21 +67,8 @@ def generate(regdom):
 
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'wifi')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('cfg80211.conf.tmpl')
-    config_text = tmpl.render(regdom)
-    with open(config_80211_file, 'w') as f:
-        f.write(config_text)
-
-    tmpl = env.get_template('crda.tmpl')
-    config_text = tmpl.render(regdom)
-    with open(config_crda_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_80211_file, 'wifi/cfg80211.conf.tmpl', regdom)
+    render(config_crda_file, 'wifi/crda.tmpl', regdom)
     return None
 
 def apply(regdom):