From 1fbaa2c59d0c0f43acad10db99d66b92fc520888 Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Sat, 11 Apr 2020 19:32:25 +0100
Subject: template: T2230: use render to generate templates

convert all call to jinja to use template.render
---
 python/vyos/template.py                   | 22 +++++++++++-----
 src/conf_mode/bcast_relay.py              | 13 ++--------
 src/conf_mode/dhcp_relay.py               | 14 ++--------
 src/conf_mode/dhcp_server.py              | 23 +++--------------
 src/conf_mode/dhcpv6_relay.py             | 14 ++--------
 src/conf_mode/dhcpv6_server.py            | 20 +++-----------
 src/conf_mode/dns_forwarding.py           | 13 ++--------
 src/conf_mode/dynamic_dns.py              | 15 +++--------
 src/conf_mode/flow_accounting_conf.py     | 18 +++++--------
 src/conf_mode/https.py                    | 13 ++--------
 src/conf_mode/igmp_proxy.py               | 14 ++--------
 src/conf_mode/interfaces-openvpn.py       | 21 ++++-----------
 src/conf_mode/interfaces-pppoe.py         | 43 +++++++++----------------------
 src/conf_mode/interfaces-wireless.py      | 21 +++++----------
 src/conf_mode/interfaces-wirelessmodem.py | 42 +++++++-----------------------
 src/conf_mode/ipsec-settings.py           | 29 +++++----------------
 src/conf_mode/lldp.py                     | 19 +++-----------
 src/conf_mode/mdns_repeater.py            | 14 ++--------
 src/conf_mode/ntp.py                      | 14 ++--------
 src/conf_mode/protocols_bfd.py            | 14 ++--------
 src/conf_mode/protocols_igmp.py           | 14 ++--------
 src/conf_mode/protocols_mpls.py           | 15 ++---------
 src/conf_mode/protocols_pim.py            | 14 ++--------
 src/conf_mode/salt-minion.py              | 13 ++--------
 src/conf_mode/service-ipoe.py             | 20 ++++----------
 src/conf_mode/service-pppoe.py            | 19 +++-----------
 src/conf_mode/service-router-advert.py    | 13 ++--------
 src/conf_mode/snmp.py                     | 31 ++++------------------
 src/conf_mode/ssh.py                      | 13 ++--------
 src/conf_mode/system-login.py             | 13 ++--------
 src/conf_mode/system-syslog.py            | 21 +++++----------
 src/conf_mode/system-wifi-regdom.py       | 21 +++------------
 src/conf_mode/tftp_server.py              | 13 ++--------
 src/conf_mode/vpn-pptp.py                 | 21 ++++-----------
 src/conf_mode/vpn_l2tp.py                 | 20 +++-----------
 src/conf_mode/vpn_sstp.py                 | 23 +++--------------
 src/conf_mode/vrf.py                      | 15 +++--------
 src/conf_mode/vrrp.py                     | 22 ++++------------
 38 files changed, 153 insertions(+), 564 deletions(-)

diff --git a/python/vyos/template.py b/python/vyos/template.py
index e559120c0..6c73ce753 100644
--- a/python/vyos/template.py
+++ b/python/vyos/template.py
@@ -22,10 +22,17 @@ from vyos.defaults import directories
 
 
 # reuse the same Environment to improve performance
-_templates_env = Environment(loader=FileSystemLoader(directories['templates']))
-_templates_mem = {}
+_templates_env = {
+    False: Environment(loader=FileSystemLoader(directories['templates'])),
+    True:  Environment(loader=FileSystemLoader(directories['templates']), trim_blocks=True),
+}
+_templates_mem = {
+    False: {},
+    True: {},
+}
 
-def render(destination, template, content):
+
+def render(destination, template, content, trim_blocks=False, formater=None):
     """
     render a template from the template directory, it will raise on any errors
     destination: the file where the rendered template must be saved
@@ -41,15 +48,18 @@ def render(destination, template, content):
 
     # Setup a renderer for the given template
     # This is cached and re-used for performance
-    if template not in _templates_mem:
-        _templates_mem[template] = _templates_env.get_template(template)
-    template = _templates_mem[template]
+    if template not in _templates_mem[trim_blocks]:
+        _templates_mem[trim_blocks][template] = _templates_env[trim_blocks].get_template(template)
+    template = _templates_mem[trim_blocks][template]
 
     # As we are opening the file with 'w', we are performing the rendering
     # before calling open() to not accidentally erase the file if the 
     # templating fails
     content = template.render(content)
 
+    if formater:
+        content = formater(content)
+
     # Write client config file
     with open(destination, 'w') as f:
         f.write(content)
diff --git a/src/conf_mode/bcast_relay.py b/src/conf_mode/bcast_relay.py
index 8d4c4a89a..0069218f6 100755
--- a/src/conf_mode/bcast_relay.py
+++ b/src/conf_mode/bcast_relay.py
@@ -19,12 +19,11 @@ import fnmatch
 
 from sys import exit
 from copy import deepcopy
-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.util import call
+from vyos.template import render
 
 config_file = r'/etc/default/udp-broadcast-relay'
 
@@ -112,11 +111,6 @@ def generate(relay):
     if relay is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'bcast-relay')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     config_dir = os.path.dirname(config_file)
     config_filename = os.path.basename(config_file)
     active_configs = []
@@ -146,10 +140,7 @@ def generate(relay):
 
         # configuration filename contains instance id
         file = config_file + str(r['id'])
-        tmpl = env.get_template('udp-broadcast-relay.tmpl')
-        config_text = tmpl.render(r)
-        with open(file, 'w') as f:
-            f.write(config_text)
+        render(file, 'bcast-relay/udp-broadcast-relay.tmpl', r)
 
     return None
 
diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
index c92d6a4e1..fdc8d2443 100755
--- a/src/conf_mode/dhcp_relay.py
+++ b/src/conf_mode/dhcp_relay.py
@@ -16,13 +16,12 @@
 
 import os
 
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 config_file = r'/etc/default/isc-dhcp-relay'
 
@@ -99,16 +98,7 @@ def generate(relay):
     if relay is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dhcp-relay')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('config.tmpl')
-    config_text = tmpl.render(relay)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'dhcp-relay/config.tmpl', relay)
     return None
 
 def apply(relay):
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py
index 553247b88..13304bf19 100755
--- a/src/conf_mode/dhcp_server.py
+++ b/src/conf_mode/dhcp_server.py
@@ -17,16 +17,15 @@
 import os
 
 from ipaddress import ip_address, ip_network
-from jinja2 import FileSystemLoader, Environment
 from socket import inet_ntoa
 from struct import pack
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.validate import is_subnet_connected
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/dhcp/dhcpd.conf'
@@ -604,25 +603,11 @@ def generate(dhcp):
         print('Warning: DHCP server will be deactivated because it is disabled')
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dhcp-server')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('dhcpd.conf.tmpl')
-    config_text = tmpl.render(dhcp)
     # Please see: https://phabricator.vyos.net/T1129 for quoting of the raw parameters
     # we can pass to ISC DHCPd
-    config_text = config_text.replace("&quot;",'"')
-
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
-    tmpl = env.get_template('daemon.tmpl')
-    config_text = tmpl.render(dhcp)
-    with open(daemon_config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'dhcp-server/dhcpd.conf.tmpl', dhcp,
+           formater=lambda _: _.replace("&quot;", '"'))
+    render(daemon_config_file, 'dhcp-server/daemon.tmpl', dhcp)
     return None
 
 def apply(dhcp):
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py
index 9355d9794..6544db055 100755
--- a/src/conf_mode/dhcpv6_relay.py
+++ b/src/conf_mode/dhcpv6_relay.py
@@ -18,12 +18,11 @@ import os
 
 from sys import exit
 from copy import deepcopy
-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.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/default/isc-dhcpv6-relay'
@@ -86,16 +85,7 @@ def generate(relay):
     if relay is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dhcpv6-relay')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('config.tmpl')
-    config_text = tmpl.render(relay)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'dhcpv6-relay/config.tmpl', relay)
     return None
 
 def apply(relay):
diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index 950ca1ce2..a7807ed9f 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -19,13 +19,12 @@ import ipaddress
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.validate import is_subnet_connected
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/dhcp/dhcpdv6.conf'
@@ -344,21 +343,8 @@ def generate(dhcpv6):
         print('Warning: DHCPv6 server will be deactivated because it is disabled')
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dhcpv6-server')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('dhcpdv6.conf.tmpl')
-    config_text = tmpl.render(dhcpv6)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
-    tmpl = env.get_template('daemon.tmpl')
-    config_text = tmpl.render(dhcpv6)
-    with open(daemon_config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'dhcpv6-server/dhcpdv6.conf.tmpl', dhcpv6)
+    render(daemon_config_file, 'dhcpv6-server/daemon.tmpl', dhcpv6)
     return None
 
 def apply(dhcpv6):
diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py
index 4071c05c9..a7b12fa01 100755
--- a/src/conf_mode/dns_forwarding.py
+++ b/src/conf_mode/dns_forwarding.py
@@ -19,14 +19,13 @@ import argparse
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.hostsd_client import Client as hostsd_client
 from vyos.util import wait_for_commit_lock
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 parser = argparse.ArgumentParser()
 parser.add_argument("--dhclient", action="store_true",
@@ -153,15 +152,7 @@ def generate(dns):
     if dns is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dns-forwarding')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
-    tmpl = env.get_template('recursor.conf.tmpl')
-    config_text = tmpl.render(dns)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
+    render(config_file, 'dns-forwarding/recursor.conf.tmpl', dns, trim_blocks=True)
     return None
 
 def apply(dns):
diff --git a/src/conf_mode/dynamic_dns.py b/src/conf_mode/dynamic_dns.py
index b54d76b06..b76503419 100755
--- a/src/conf_mode/dynamic_dns.py
+++ b/src/conf_mode/dynamic_dns.py
@@ -18,13 +18,12 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from stat import S_IRUSR, S_IWUSR
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/ddclient/ddclient.conf'
@@ -226,11 +225,6 @@ def generate(dyndns):
 
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dynamic-dns')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     dirname = os.path.dirname(dyndns['pid_file'])
     if not os.path.exists(dirname):
         os.mkdir(dirname)
@@ -239,11 +233,8 @@ def generate(dyndns):
     if not os.path.exists(dirname):
         os.mkdir(dirname)
 
-    tmpl = env.get_template('ddclient.conf.tmpl')
-    config_text = tmpl.render(dyndns)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'dynamic-dns/ddclient.conf.tmpl', dyndns)
+    
     # Config file must be accessible only by its owner
     os.chmod(config_file, S_IRUSR | S_IWUSR)
 
diff --git a/src/conf_mode/flow_accounting_conf.py b/src/conf_mode/flow_accounting_conf.py
index 54928cdfe..3320075fb 100755
--- a/src/conf_mode/flow_accounting_conf.py
+++ b/src/conf_mode/flow_accounting_conf.py
@@ -16,18 +16,18 @@
 
 import os
 import re
+from sys import exit
 import ipaddress
 
 from ipaddress import ip_address
 from jinja2 import FileSystemLoader, Environment
-from sys import exit
 
 from vyos.ifconfig import Section
 from vyos.ifconfig import Interface
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import cmd
+from vyos.render import render
 
 
 # default values
@@ -335,16 +335,10 @@ def generate(config):
                 timeout_string = "{}:{}={}".format(timeout_string, timeout_type, timeout_value)
     config['netflow']['timeout_string'] = timeout_string
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'netflow')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    # Generate daemon configs
-    tmpl = env.get_template('uacctd.conf.tmpl')
-    config_text = tmpl.render(templatecfg = config, snaplen = default_captured_packet_size)
-    with open(uacctd_conf_path, 'w') as file:
-        file.write(config_text)
+    render(uacctd_conf_path, 'netflow/uacctd.conf.tmpl', {
+        'templatecfg': config,
+        'snaplen': default_captured_packet_size,
+    })
 
 
 def apply(config):
diff --git a/src/conf_mode/https.py b/src/conf_mode/https.py
index da7193c9b..7d3a1b9cb 100755
--- a/src/conf_mode/https.py
+++ b/src/conf_mode/https.py
@@ -18,15 +18,14 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 
 import vyos.defaults
 import vyos.certbot_util
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = '/etc/nginx/sites-available/default'
@@ -133,18 +132,10 @@ def generate(https):
     if https is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'https')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
     if 'server_block_list' not in https or not https['server_block_list']:
         https['server_block_list'] = [default_server_block]
 
-    tmpl = env.get_template('nginx.default.tmpl')
-    config_text = tmpl.render(https)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
+    render(config_file, 'https/nginx.default.tmpl', https, trim_blocks=True)
 
     return None
 
diff --git a/src/conf_mode/igmp_proxy.py b/src/conf_mode/igmp_proxy.py
index 77e2bb150..9fa591a2c 100755
--- a/src/conf_mode/igmp_proxy.py
+++ b/src/conf_mode/igmp_proxy.py
@@ -18,13 +18,12 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 
 from netifaces import interfaces
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/igmpproxy.conf'
@@ -116,16 +115,7 @@ def generate(igmp_proxy):
         print('Warning: IGMP Proxy will be deactivated because it is disabled')
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'igmp-proxy')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('igmpproxy.conf.tmpl')
-    config_text = tmpl.render(igmp_proxy)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'igmp-proxy/igmpproxy.conf.tmpl', igmp_proxy)
     return None
 
 def apply(igmp_proxy):
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py
index 974aeea69..85945ba58 100755
--- a/src/conf_mode/interfaces-openvpn.py
+++ b/src/conf_mode/interfaces-openvpn.py
@@ -17,7 +17,6 @@
 import os
 import re
 
-from jinja2 import FileSystemLoader, Environment
 from copy import deepcopy
 from sys import exit
 from ipaddress import ip_address,ip_network,IPv4Interface
@@ -26,11 +25,12 @@ from time import sleep
 from shutil import rmtree
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.ifconfig import VTunIf
 from vyos.util import call, is_bridge_member, chown, chmod_600, chmod_755
 from vyos.validate import is_addr_assigned
 from vyos import ConfigError
+from vyos.template import render
+
 
 user = 'openvpn'
 group = 'openvpn'
@@ -653,11 +653,6 @@ def generate(openvpn):
     if openvpn['deleted'] or openvpn['disable']:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'openvpn')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     interface = openvpn['intf']
     directory = os.path.dirname(get_config_name(interface))
 
@@ -697,19 +692,13 @@ def generate(openvpn):
     # Generate client specific configuration
     for client in openvpn['client']:
         client_file = os.path.join(ccd_dir, client['name'])
-        tmpl = env.get_template('client.conf.tmpl')
-        client_text = tmpl.render(client)
-        with open(client_file, 'w') as f:
-            f.write(client_text)
+        render(client_file, 'openvpn/client.conf.tmpl', client)
         chown(client_file, user, group)
 
-    tmpl = env.get_template('server.conf.tmpl')
-    config_text = tmpl.render(openvpn)
     # we need to support quoting of raw parameters from OpenVPN CLI
     # see https://phabricator.vyos.net/T1632
-    config_text = config_text.replace("&quot;",'"')
-    with open(get_config_name(interface), 'w') as f:
-        f.write(config_text)
+    render(get_config_name(interface), 'openvpn/server.conf.tmpl', openvpn,
+           formater=lambda _: _.replace("&quot;", '"'))
     chown(get_config_name(interface), user, group)
 
     # Fixup file permissions
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index 8eed3159d..f942b7d2f 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -18,14 +18,14 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from netifaces import interfaces
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.ifconfig import Interface
 from vyos.util import chown, chmod_755, cmd
 from vyos import ConfigError
+from vyos.template import render
+
 
 default_config_data = {
     'access_concentrator': '',
@@ -161,11 +161,6 @@ def verify(pppoe):
     return None
 
 def generate(pppoe):
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir["data"], "templates", "pppoe")
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
     # set up configuration file path variables where our templates will be
     # rendered into
     intf = pppoe['intf']
@@ -195,34 +190,20 @@ def generate(pppoe):
 
     else:
         # Create PPP configuration files
-        tmpl = env.get_template('peer.tmpl')
-        config_text = tmpl.render(pppoe)
-        with open(config_pppoe, 'w') as f:
-            f.write(config_text)
-
+        render(config_pppoe, 'pppoe/peer.tmpl',
+               pppoe, trim_blocks=True)
         # Create script for ip-pre-up.d
-        tmpl = env.get_template('ip-pre-up.script.tmpl')
-        config_text = tmpl.render(pppoe)
-        with open(script_pppoe_pre_up, 'w') as f:
-            f.write(config_text)
-
+        render(script_pppoe_pre_up, 'pppoe/ip-pre-up.script.tmpl',
+               pppoe, trim_blocks=True)
         # Create script for ip-up.d
-        tmpl = env.get_template('ip-up.script.tmpl')
-        config_text = tmpl.render(pppoe)
-        with open(script_pppoe_ip_up, 'w') as f:
-            f.write(config_text)
-
+        render(script_pppoe_ip_up, 'pppoe/ip-up.script.tmpl',
+               pppoe, trim_blocks=True)
         # Create script for ip-down.d
-        tmpl = env.get_template('ip-down.script.tmpl')
-        config_text = tmpl.render(pppoe)
-        with open(script_pppoe_ip_down, 'w') as f:
-            f.write(config_text)
-
+        render(script_pppoe_ip_down, 'pppoe/ip-down.script.tmpl',
+               pppoe, trim_blocks=True)
         # Create script for ipv6-up.d
-        tmpl = env.get_template('ipv6-up.script.tmpl')
-        config_text = tmpl.render(pppoe)
-        with open(script_pppoe_ipv6_up, 'w') as f:
-            f.write(config_text)
+        render(script_pppoe_ipv6_up, 'pppoe/ipv6-up.script.tmpl',
+               pppoe, trim_blocks=True)
 
         # make generated script file executable
         chmod_755(script_pppoe_pre_up)
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index 66fdd2d93..10aec3dcd 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -19,18 +19,18 @@ from sys import exit
 from re import findall
 
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 
 from netifaces import interfaces
 from netaddr import EUI, mac_unix_expanded
 
 from vyos.config import Config
 from vyos.configdict import list_diff, vlan_to_dict
-from vyos.defaults import directories as vyos_data_dir
 from vyos.ifconfig import WiFiIf
 from vyos.ifconfig_vlan import apply_vlan_config, verify_vlan_config
 from vyos.util import chown, is_bridge_member, call
 from vyos import ConfigError
+from vyos.template import render
+
 
 default_config_data = {
     'address': [],
@@ -600,11 +600,6 @@ def verify(wifi):
     return None
 
 def generate(wifi):
-    # 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)
-
     interface = wifi['intf']
 
     # always stop hostapd service first before reconfiguring it
@@ -646,16 +641,12 @@ def generate(wifi):
 
     # render appropriate new config files depending on access-point or station mode
     if wifi['op_mode'] == 'ap':
-        tmpl = env.get_template('hostapd.conf.tmpl')
-        config_text = tmpl.render(wifi)
-        with open(get_conf_file('hostapd', interface), 'w') as f:
-            f.write(config_text)
+        conf = get_conf_file('hostapd', interface)
+        render(conf, 'wifi/hostapd.conf.tmpl', wifi)
 
     elif wifi['op_mode'] == 'station':
-        tmpl = env.get_template('wpa_supplicant.conf.tmpl')
-        config_text = tmpl.render(wifi)
-        with open(get_conf_file('wpa_supplicant', interface), 'w') as f:
-            f.write(config_text)
+        conf = get_conf_file('wpa_supplicant', interface)
+        render(conf, 'wifi/wpa_supplicant.conf.tmpl', wifi)
 
     return None
 
diff --git a/src/conf_mode/interfaces-wirelessmodem.py b/src/conf_mode/interfaces-wirelessmodem.py
index a37e47ada..da1855cd9 100755
--- a/src/conf_mode/interfaces-wirelessmodem.py
+++ b/src/conf_mode/interfaces-wirelessmodem.py
@@ -18,15 +18,17 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from netifaces import interfaces
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
-from vyos.util import chown, chmod_755, is_bridge_member
+from vyos.util import chown
+from vyos.util import chmod_755
+from vyos.util import is_bridge_member
 from vyos.util import cmd
 from vyos.util import call
 from vyos import ConfigError
+from vyos.template import render
+
 
 default_config_data = {
     'address': [],
@@ -141,11 +143,6 @@ def verify(wwan):
     return None
 
 def generate(wwan):
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'wwan')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     # set up configuration file path variables where our templates will be
     # rendered into
     intf = wwan['intf']
@@ -175,34 +172,15 @@ def generate(wwan):
 
     else:
         # Create PPP configuration files
-        tmpl = env.get_template('peer.tmpl')
-        config_text = tmpl.render(wwan)
-        with open(config_wwan, 'w') as f:
-            f.write(config_text)
-
+        render(config_wwan, 'wwan/peer.tmpl', wwan)
         # Create PPP chat script
-        tmpl = env.get_template('chat.tmpl')
-        config_text = tmpl.render(wwan)
-        with open(config_wwan_chat, 'w') as f:
-            f.write(config_text)
-
+        render(config_wwan_chat, 'wwan/chat.tmpl', wwan)
         # Create script for ip-pre-up.d
-        tmpl = env.get_template('ip-pre-up.script.tmpl')
-        config_text = tmpl.render(wwan)
-        with open(script_wwan_pre_up, 'w') as f:
-            f.write(config_text)
-
+        render(script_wwan_pre_up, 'wwan/ip-pre-up.script.tmpl', wwan)
         # Create script for ip-up.d
-        tmpl = env.get_template('ip-up.script.tmpl')
-        config_text = tmpl.render(wwan)
-        with open(script_wwan_ip_up, 'w') as f:
-            f.write(config_text)
-
+        render(script_wwan_ip_up, 'wwan/ip-up.script.tmpl', wwan)
         # Create script for ip-down.d
-        tmpl = env.get_template('ip-down.script.tmpl')
-        config_text = tmpl.render(wwan)
-        with open(script_wwan_ip_down, 'w') as f:
-            f.write(config_text)
+        render(script_wwan_ip_down, 'wwan/ip-down.script.tmpl', wwan)
 
         # make generated script file executable
         chmod_755(script_wwan_pre_up)
diff --git a/src/conf_mode/ipsec-settings.py b/src/conf_mode/ipsec-settings.py
index dc04e9131..4fffa11ee 100755
--- a/src/conf_mode/ipsec-settings.py
+++ b/src/conf_mode/ipsec-settings.py
@@ -18,13 +18,13 @@ import re
 import os
 
 from time import sleep
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
+
 
 ra_conn_name = "remote-access"
 charon_conf_file = "/etc/strongswan.d/charon.conf"
@@ -147,43 +147,26 @@ def verify(data):
            raise ConfigError("L2TP VPN configuration error: \"vpn ipsec ipsec-interfaces\" must be specified.")
 
 def generate(data):
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'ipsec')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
-    tmpl = env.get_template('charon.tmpl')
-    config_text = tmpl.render(data)
-    with open(charon_conf_file, 'w') as f:
-        f.write(config_text)
+    render(charon_conf_file, 'ipsec/charon.tmpl', data, trim_blocks=True)
 
     if data["ipsec_l2tp"]:
         remove_confs(delim_ipsec_l2tp_begin, delim_ipsec_l2tp_end, ipsec_conf_flie)
 
-        tmpl = env.get_template('ipsec.secrets.tmpl')
-        l2pt_ipsec_secrets_txt = tmpl.render(c)
         old_umask = os.umask(0o077)
-        with open(ipsec_secrets_flie,'w') as f:
-            f.write(l2pt_ipsec_secrets_txt)
+        render(ipsec_secrets_flie, 'ipsec/ipsec.secrets.tmpl', c, trim_blocks=True)
         os.umask(old_umask)
 
-        tmpl = env.get_template('remote-access.tmpl')
-        ipsec_ra_conn_txt = tmpl.render(c)
         old_umask = os.umask(0o077)
 
         # Create tunnels directory if does not exist
         if not os.path.exists(ipsec_ra_conn_dir):
             os.makedirs(ipsec_ra_conn_dir)
 
-        with open(ipsec_ra_conn_file,'w') as f:
-            f.write(ipsec_ra_conn_txt)
+        render(ipsec_ra_conn_file, 'ipsec/remote-access.tmpl', c, trim_blocks=True)
         os.umask(old_umask)
 
-
-        tmpl = env.get_template('ipsec.conf.tmpl')
-        l2pt_ipsec_conf_txt = tmpl.render(c)
         old_umask = os.umask(0o077)
-        with open(ipsec_conf_flie,'a') as f:
-            f.write(l2pt_ipsec_conf_txt)
+        render(ipsec_conf_flie, 'ipsec/ipsec.conf.tmpl', c, trim_blocks=True)
         os.umask(old_umask)
 
     else:
diff --git a/src/conf_mode/lldp.py b/src/conf_mode/lldp.py
index ec59c68d0..d128c1fe6 100755
--- a/src/conf_mode/lldp.py
+++ b/src/conf_mode/lldp.py
@@ -18,15 +18,14 @@ import os
 import re
 
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
 from vyos.validate import is_addr_assigned,is_loopback_addr
-from vyos.defaults import directories as vyos_data_dir
 from vyos.version import get_version_data
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = "/etc/default/lldpd"
@@ -210,11 +209,6 @@ def generate(lldp):
     if lldp is None:
         return
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'lldp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     # generate listen on interfaces
     for intf in lldp['interface_list']:
         tmp = ''
@@ -226,16 +220,9 @@ def generate(lldp):
         lldp['options']['listen_on'].append(tmp)
 
     # generate /etc/default/lldpd
-    tmpl = env.get_template('lldpd.tmpl')
-    config_text = tmpl.render(lldp)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'lldp/lldpd.tmpl', lldp)
     # generate /etc/lldpd.d/01-vyos.conf
-    tmpl = env.get_template('vyos.conf.tmpl')
-    config_text = tmpl.render(lldp)
-    with open(vyos_config_file, 'w') as f:
-        f.write(config_text)
+    render(vyos_config_file, 'lldp/vyos.conf.tmpl', lldp)
 
 
 def apply(lldp):
diff --git a/src/conf_mode/mdns_repeater.py b/src/conf_mode/mdns_repeater.py
index 9230aaf61..bca1a537e 100755
--- a/src/conf_mode/mdns_repeater.py
+++ b/src/conf_mode/mdns_repeater.py
@@ -18,13 +18,12 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from netifaces import ifaddresses, AF_INET
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/default/mdns-repeater'
@@ -82,16 +81,7 @@ def generate(mdns):
         print('Warning: mDNS repeater will be deactivated because it is disabled')
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'mdns-repeater')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('mdns-repeater.tmpl')
-    config_text = tmpl.render(mdns)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'mdns-repeater/mdns-repeater.tmpl', mdns)
     return None
 
 def apply(mdns):
diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py
index 75328dfd7..a1a7befcb 100755
--- a/src/conf_mode/ntp.py
+++ b/src/conf_mode/ntp.py
@@ -18,13 +18,12 @@ import os
 
 from copy import deepcopy
 from ipaddress import ip_network
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.util import render
 
 
 config_file = r'/etc/ntp.conf'
@@ -100,16 +99,7 @@ def generate(ntp):
     if ntp is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'ntp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('ntp.conf.tmpl')
-    config_text = tmpl.render(ntp)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'ntp/ntp.conf.tmpl', ntp)
     return None
 
 def apply(ntp):
diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py
index cf4db5f54..ed8c3637b 100755
--- a/src/conf_mode/protocols_bfd.py
+++ b/src/conf_mode/protocols_bfd.py
@@ -18,13 +18,12 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 
 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 call
+from vyos.template import render
 
 
 config_file = r'/tmp/bfd.frr'
@@ -191,16 +190,7 @@ def generate(bfd):
     if bfd is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'frr-bfd')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('bfd.frr.tmpl')
-    config_text = tmpl.render(bfd)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'frr-bfd/bfd.frr.tmpl', bfd)
     return None
 
 def apply(bfd):
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):
diff --git a/src/conf_mode/protocols_mpls.py b/src/conf_mode/protocols_mpls.py
index b5753aea8..0a241277d 100755
--- a/src/conf_mode/protocols_mpls.py
+++ b/src/conf_mode/protocols_mpls.py
@@ -16,12 +16,10 @@
 
 import os
 
-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.util import call
+from vyos.template import render
 
 
 config_file = r'/tmp/ldpd.frr'
@@ -129,16 +127,7 @@ def generate(mpls):
     if mpls is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'mpls')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('ldpd.frr.tmpl')
-    config_text = tmpl.render(mpls)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'mpls/ldpd.frr.tmpl', mpls)
     return None
 
 def apply(mpls):
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py
index 44fc9293b..f12de4a72 100755
--- a/src/conf_mode/protocols_pim.py
+++ b/src/conf_mode/protocols_pim.py
@@ -17,13 +17,12 @@
 import os
 
 from ipaddress import IPv4Address
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/tmp/pimd.frr'
@@ -115,16 +114,7 @@ def generate(pim):
     if pim is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'pim')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('pimd.frr.tmpl')
-    config_text = tmpl.render(pim)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'pim/pimd.frr.tmpl', pim)
     return None
 
 def apply(pim):
diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py
index bfc3a707e..236480854 100755
--- a/src/conf_mode/salt-minion.py
+++ b/src/conf_mode/salt-minion.py
@@ -17,16 +17,15 @@
 import os
 
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from pwd import getpwnam
 from socket import gethostname
 from sys import exit
 from urllib3 import PoolManager
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/salt/minion'
@@ -88,18 +87,10 @@ def generate(salt):
     if salt is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'salt-minion')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     if not os.path.exists(directory):
         os.makedirs(directory)
 
-    tmpl = env.get_template('minion.tmpl')
-    config_text = tmpl.render(salt)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
+    render(config_file, 'salt-minion/minion.tmpl', salt)
 
     path = "/etc/salt/"
     for path in paths:
diff --git a/src/conf_mode/service-ipoe.py b/src/conf_mode/service-ipoe.py
index 5bd4aea2e..3a14d92ef 100755
--- a/src/conf_mode/service-ipoe.py
+++ b/src/conf_mode/service-ipoe.py
@@ -17,15 +17,15 @@
 import os
 import re
 
-from jinja2 import FileSystemLoader, Environment
 from socket import socket, AF_INET, SOCK_STREAM
 from sys import exit
 from time import sleep
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import run
+from vyos.template import render
+
 
 ipoe_cnf_dir = r'/etc/accel-ppp/ipoe'
 ipoe_cnf = ipoe_cnf_dir + r'/ipoe.config'
@@ -219,25 +219,15 @@ def generate(c):
     if c == None or not c:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'ipoe-server')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
     c['thread_cnt'] = _get_cpu()
 
     if c['auth']['mech'] == 'local':
-        tmpl = env.get_template('chap-secrets.tmpl')
-        chap_secrets_txt = tmpl.render(c)
         old_umask = os.umask(0o077)
-        with open(chap_secrets, 'w') as f:
-            f.write(chap_secrets_txt)
+        render(chap_secrets, 'ipoe-server/chap-secrets.tmpl', c, trim_blocks=True)
         os.umask(old_umask)
 
-    tmpl = env.get_template('ipoe.config.tmpl')
-    config_text = tmpl.render(c)
-    with open(ipoe_cnf, 'w') as f:
-        f.write(config_text)
+    render(ipoe_cnf, 'ipoe-server/ipoe.config.tmpl', c, trim_blocks=True)
+    # return c ??
     return c
 
 
diff --git a/src/conf_mode/service-pppoe.py b/src/conf_mode/service-pppoe.py
index d3fc82406..a96249199 100755
--- a/src/conf_mode/service-pppoe.py
+++ b/src/conf_mode/service-pppoe.py
@@ -17,15 +17,15 @@
 import os
 import re
 
-from jinja2 import FileSystemLoader, Environment
 from socket import socket, AF_INET, SOCK_STREAM
 from sys import exit
 from time import sleep
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import run
+from vyos.template import render
+
 
 pidfile = r'/var/run/accel_pppoe.pid'
 pppoe_cnf_dir = r'/etc/accel-ppp/pppoe'
@@ -376,11 +376,6 @@ def generate(c):
     if c == None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'pppoe-server')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
     # accel-cmd reload doesn't work so any change results in a restart of the
     # daemon
     try:
@@ -394,17 +389,11 @@ def generate(c):
         else:
             c['thread_cnt'] = int(os.cpu_count() / 2)
 
-    tmpl = env.get_template('pppoe.config.tmpl')
-    config_text = tmpl.render(c)
-    with open(pppoe_conf, 'w') as f:
-        f.write(config_text)
+    render(pppoe_conf, 'pppoe-server/pppoe.config.tmpl', c, trim_blocks=True)
 
     if c['authentication']['local-users']:
-        tmpl = env.get_template('chap-secrets.tmpl')
-        chap_secrets_txt = tmpl.render(c)
         old_umask = os.umask(0o077)
-        with open(chap_secrets, 'w') as f:
-            f.write(chap_secrets_txt)
+        render(chap_secrets, 'pppoe-server/chap-secrets.tmpl', c, trim_blocks=True)
         os.umask(old_umask)
 
     return c
diff --git a/src/conf_mode/service-router-advert.py b/src/conf_mode/service-router-advert.py
index 75a324260..620f3eacf 100755
--- a/src/conf_mode/service-router-advert.py
+++ b/src/conf_mode/service-router-advert.py
@@ -16,14 +16,13 @@
 
 import os
 
-from jinja2 import FileSystemLoader, Environment
 from stat import S_IRUSR, S_IWUSR, S_IRGRP
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/radvd.conf'
@@ -139,15 +138,7 @@ def generate(rtradv):
     if not rtradv['interfaces']:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'router-advert')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
-    tmpl = env.get_template('radvd.conf.tmpl')
-    config_text = tmpl.render(rtradv)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
+    render(config_file, 'router-advert/radvd.conf.tmpl', rtradv, trim_blocks=True)
 
     # adjust file permissions of new configuration file
     if os.path.exists(config_file):
diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py
index 4a69e8742..d654dcb84 100755
--- a/src/conf_mode/snmp.py
+++ b/src/conf_mode/snmp.py
@@ -20,14 +20,13 @@ from binascii import hexlify
 from time import sleep
 from stat import S_IRWXU, S_IXGRP, S_IXOTH, S_IROTH, S_IRGRP
 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.validate import is_ipv4, is_addr_assigned
 from vyos.version import get_version_data
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file_client  = r'/etc/snmp/snmp.conf'
@@ -518,34 +517,14 @@ def generate(snmp):
     if snmp is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'snmp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     # Write client config file
-    tmpl = env.get_template('etc.snmp.conf.tmpl')
-    config_text = tmpl.render(snmp)
-    with open(config_file_client, 'w') as f:
-        f.write(config_text)
-
+    render(config_file_client, 'snmp/etc.snmp.conf.tmpl', snmp)
     # Write server config file
-    tmpl = env.get_template('etc.snmpd.conf.tmpl')
-    config_text = tmpl.render(snmp)
-    with open(config_file_daemon, 'w') as f:
-        f.write(config_text)
-
+    render(config_file_daemon, 'snmp/etc.snmpd.conf.tmpl', snmp)
     # Write access rights config file
-    tmpl = env.get_template('usr.snmpd.conf.tmpl')
-    config_text = tmpl.render(snmp)
-    with open(config_file_access, 'w') as f:
-        f.write(config_text)
-
+    render(config_file_access, 'snmp/usr.snmpd.conf.tmpl', snmp)
     # Write access rights config file
-    tmpl = env.get_template('var.snmpd.conf.tmpl')
-    config_text = tmpl.render(snmp)
-    with open(config_file_user, 'w') as f:
-        f.write(config_text)
+    render(config_file_user, 'snmp/var.snmpd.conf.tmpl', snmp)
 
     return None
 
diff --git a/src/conf_mode/ssh.py b/src/conf_mode/ssh.py
index a6cdb7ccc..ae79eac2d 100755
--- a/src/conf_mode/ssh.py
+++ b/src/conf_mode/ssh.py
@@ -15,13 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/ssh/sshd_config'
@@ -120,15 +119,7 @@ def generate(ssh):
     if ssh is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'ssh')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
-    tmpl = env.get_template('sshd_config.tmpl')
-    config_text = tmpl.render(ssh)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
+    render(config_file, 'ssh/sshd_config.tmpl', ssh, trim_blocks=True)
     return None
 
 def apply(ssh):
diff --git a/src/conf_mode/system-login.py b/src/conf_mode/system-login.py
index 7e854c9c9..6008ca0b3 100755
--- a/src/conf_mode/system-login.py
+++ b/src/conf_mode/system-login.py
@@ -16,7 +16,6 @@
 
 import os
 
-from jinja2 import FileSystemLoader, Environment
 from psutil import users
 from pwd import getpwall, getpwnam
 from stat import S_IRUSR, S_IWUSR, S_IRWXU, S_IRGRP, S_IXGRP
@@ -24,11 +23,11 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.configdict import list_diff
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import cmd
 from vyos.util import call
 from vyos.util import DEVNULL
+from vyos.template import render
 
 
 radius_config_file = "/etc/pam_radius_auth.conf"
@@ -222,15 +221,7 @@ def generate(login):
             #     env=env)
 
     if len(login['radius_server']) > 0:
-        # Prepare Jinja2 template loader from files
-        tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'system-login')
-        fs_loader = FileSystemLoader(tmpl_path)
-        env = Environment(loader=fs_loader)
-
-        tmpl = env.get_template('pam_radius_auth.conf.tmpl')
-        config_text = tmpl.render(login)
-        with open(radius_config_file, 'w') as f:
-            f.write(config_text)
+        render(radius_config_file, 'system-login/pam_radius_auth.conf.tmpl', login)
 
         uid = getpwnam('root').pw_uid
         gid = getpwnam('root').pw_gid
diff --git a/src/conf_mode/system-syslog.py b/src/conf_mode/system-syslog.py
index 25b9b5bed..7d93ffdd5 100755
--- a/src/conf_mode/system-syslog.py
+++ b/src/conf_mode/system-syslog.py
@@ -17,13 +17,13 @@
 import os
 import re
 
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import run
+from vyos.template import render
+
 
 def get_config():
     c = Config()
@@ -192,22 +192,13 @@ def generate(c):
     if c == None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'syslog')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
-    tmpl = env.get_template('rsyslog.conf.tmpl')
-    config_text = tmpl.render(c)
-    with open('/etc/rsyslog.d/vyos-rsyslog.conf', 'w') as f:
-        f.write(config_text)
+    conf = '/etc/rsyslog.d/vyos-rsyslog.conf'
+    render(conf, 'syslog/rsyslog.conf.tmpl', c, trim_blocks=True)
 
     # eventually write for each file its own logrotate file, since size is
     # defined it shouldn't matter
-    tmpl = env.get_template('logrotate.tmpl')
-    config_text = tmpl.render(c)
-    with open('/etc/logrotate.d/vyos-rsyslog', 'w') as f:
-        f.write(config_text)
+    conf = '/etc/logrotate.d/vyos-rsyslog'
+    render(conf, 'syslog/logrotate.tmpl', c, trim_blocks=True)
 
 
 def verify(c):
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):
diff --git a/src/conf_mode/tftp_server.py b/src/conf_mode/tftp_server.py
index 7a7246783..229202304 100755
--- a/src/conf_mode/tftp_server.py
+++ b/src/conf_mode/tftp_server.py
@@ -20,14 +20,13 @@ import pwd
 
 from copy import deepcopy
 from glob import glob
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.validate import is_ipv4, is_addr_assigned
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/default/tftpd'
@@ -90,11 +89,6 @@ def generate(tftpd):
     if tftpd is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'tftp-server')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     idx = 0
     for listen in tftpd['listen']:
         config = deepcopy(tftpd)
@@ -103,11 +97,8 @@ def generate(tftpd):
         else:
             config['listen'] = ["[" + listen + "]" + tftpd['port'] + " -6"]
 
-        tmpl = env.get_template('default.tmpl')
-        config_text = tmpl.render(config)
         file = config_file + str(idx)
-        with open(file, 'w') as f:
-            f.write(config_text)
+        render(file, 'tftp-server/default.tmpl', config)
 
         idx = idx + 1
 
diff --git a/src/conf_mode/vpn-pptp.py b/src/conf_mode/vpn-pptp.py
index 45b2c4b40..15b80f984 100755
--- a/src/conf_mode/vpn-pptp.py
+++ b/src/conf_mode/vpn-pptp.py
@@ -17,15 +17,15 @@
 import os
 import re
 
-from jinja2 import FileSystemLoader, Environment
 from socket import socket, AF_INET, SOCK_STREAM
 from sys import exit
 from time import sleep
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import run
+from vyos.template import render
+
 
 pidfile = r'/var/run/accel_pptp.pid'
 pptp_cnf_dir = r'/etc/accel-ppp/pptp'
@@ -206,11 +206,6 @@ def generate(c):
     if c == None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'pptp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
     # accel-cmd reload doesn't work so any change results in a restart of the daemon
     try:
         if os.cpu_count() == 1:
@@ -223,19 +218,13 @@ def generate(c):
         else:
             c['thread_cnt'] = int(os.cpu_count()/2)
 
-    tmpl = env.get_template('pptp.config.tmpl')
-    config_text = tmpl.render(c)
-    with open(pptp_conf, 'w') as f:
-        f.write(config_text)
+    render(pptp_conf, 'pptp/pptp.config.tmpl', c, trim_blocks=True)
 
     if c['authentication']['local-users']:
-        tmpl = env.get_template('chap-secrets.tmpl')
-        chap_secrets_txt = tmpl.render(c)
         old_umask = os.umask(0o077)
-        with open(chap_secrets, 'w') as f:
-            f.write(chap_secrets_txt)
+        render(chap_secrets, 'pptp/chap-secrets.tmpl', c, trim_blocks=True)
         os.umask(old_umask)
-
+    # return c ??
     return c
 
 
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index 4595c13a7..a8b183bef 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -23,13 +23,13 @@ from sys import exit
 from time import sleep
 
 from ipaddress import ip_network
-from jinja2 import FileSystemLoader, Environment
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.util import call
 from vyos.validate import is_ipv4
 from vyos import ConfigError
+from vyos.template import render
+
 
 l2tp_conf = '/run/accel-pppd/l2tp.conf'
 l2tp_chap_secrets = '/run/accel-pppd/l2tp.chap-secrets'
@@ -344,26 +344,14 @@ def generate(l2tp):
     if not l2tp:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'l2tp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
     dirname = os.path.dirname(l2tp_conf)
     if not os.path.exists(dirname):
         os.mkdir(dirname)
 
-    tmpl = env.get_template('l2tp.config.tmpl')
-    config_text = tmpl.render(c)
-    with open(l2tp_conf, 'w') as f:
-        f.write(config_text)
+    render(l2tp_conf, 'l2tp/l2tp.config.tmpl', c, trim_blocks=True)
 
     if l2tp['auth_mode'] == 'local':
-        tmpl = env.get_template('chap-secrets.tmpl')
-        config_text = tmpl.render(l2tp)
-        with open(l2tp_chap_secrets, 'w') as f:
-            f.write(config_text)
-
+        render(l2tp_chap_secrets, 'l2tp/chap-secrets.tmpl', l2tp)
         os.chmod(l2tp_chap_secrets, S_IRUSR | S_IWUSR | S_IRGRP)
 
     else:
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index 645beddad..438731972 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -20,12 +20,12 @@ from time import sleep
 from sys import exit
 from copy import deepcopy
 from stat import S_IRUSR, S_IWUSR, S_IRGRP
-from jinja2 import FileSystemLoader, Environment
 
 from vyos.config import Config
 from vyos import ConfigError
-from vyos.defaults import directories as vyos_data_dir
 from vyos.util import call, run
+from vyos.template import render
+
 
 sstp_conf = '/run/accel-pppd/sstp.conf'
 sstp_chap_secrets = '/run/accel-pppd/sstp.chap-secrets'
@@ -302,30 +302,15 @@ def generate(sstp):
     if not sstp:
         return None
 
-    import pprint
-    pprint.pprint(sstp)
-
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'sstp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
     dirname = os.path.dirname(sstp_conf)
     if not os.path.exists(dirname):
         os.mkdir(dirname)
 
     # accel-cmd reload doesn't work so any change results in a restart of the daemon
-    tmpl = env.get_template('sstp.config.tmpl')
-    config_text = tmpl.render(sstp)
-    with open(sstp_conf, 'w') as f:
-        f.write(config_text)
+    render(sstp_conf, 'sstp/sstp.config.tmpl', sstp, trim_blocks=True)
 
     if sstp['local_users']:
-        tmpl = env.get_template('chap-secrets.tmpl')
-        config_text = tmpl.render(sstp)
-        with open(sstp_chap_secrets, 'w') as f:
-            f.write(config_text)
-
+        render(sstp_chap_secrets, 'sstp/chap-secrets.tmpl', sstp, trim_blocks=True)
         os.chmod(sstp_chap_secrets, S_IRUSR | S_IWUSR | S_IRGRP)
     else:
         if os.path.exists(sstp_chap_secrets):
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index 586424c09..eb73293a9 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -18,15 +18,15 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from json import loads
 
 from vyos.config import Config
 from vyos.configdict import list_diff
-from vyos.defaults import directories as vyos_data_dir
 from vyos.ifconfig import Interface
 from vyos.util import read_file, cmd
 from vyos import ConfigError
+from vyos.template import render
+
 
 config_file = r'/etc/iproute2/rt_tables.d/vyos-vrf.conf'
 
@@ -178,16 +178,7 @@ def verify(vrf_config):
     return None
 
 def generate(vrf_config):
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'vrf')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('vrf.conf.tmpl')
-    config_text = tmpl.render(vrf_config)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'vrf/vrf.conf.tmpl', vrf_config)
     return None
 
 def apply(vrf_config):
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py
index 3f1b73385..b9b0405e2 100755
--- a/src/conf_mode/vrrp.py
+++ b/src/conf_mode/vrrp.py
@@ -18,16 +18,16 @@ import os
 
 from sys import exit
 from ipaddress import ip_address, ip_interface, IPv4Interface, IPv6Interface, IPv4Address, IPv6Address
-from jinja2 import FileSystemLoader, Environment
 from json import dumps
 from pathlib import Path
 
 import vyos.config
 import vyos.keepalived
 
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
+
 
 daemon_file = "/etc/default/keepalived"
 config_file = "/etc/keepalived/keepalived.conf"
@@ -201,11 +201,6 @@ def verify(data):
 
 
 def generate(data):
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'vrrp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     vrrp_groups, sync_groups = data
 
     # Remove disabled groups from the sync group member lists
@@ -217,16 +212,9 @@ def generate(data):
     # Filter out disabled groups
     vrrp_groups = list(filter(lambda x: x["disable"] is not True, vrrp_groups))
 
-    tmpl = env.get_template('keepalived.conf.tmpl')
-    config_text = tmpl.render({"groups": vrrp_groups, "sync_groups": sync_groups})
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
-    tmpl = env.get_template('daemon.tmpl')
-    config_text = tmpl.render()
-    with open(daemon_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'vrrp/keepalived.conf.tmpl',
+           {"groups": vrrp_groups, "sync_groups": sync_groups})
+    render(daemon_file, 'vrrp/daemon.tmpl', {})
     return None
 
 
-- 
cgit v1.2.3