router-advert: T2230: move inlined templates to dedicated files

2 files changed, 50 insertions, 46 deletions

diff --git a/data/templates/router-advert/radvd.conf.tmpl b/data/templates/router-advert/radvd.conf.tmpl
new file mode 100644
index 000000000..2768f6f2e
--- /dev/null
+++ b/data/templates/router-advert/radvd.conf.tmpl
@@ -0,0 +1,37 @@
+### Autogenerated by service-router-advert.py ###
+
+{% for i in interfaces -%}
+interface {{ i.name }} {
+    IgnoreIfMissing on;
+    AdvDefaultPreference {{ i.default_preference }};
+    AdvManagedFlag {{ i.managed_flag }};
+    MaxRtrAdvInterval {{ i.interval_max }};
+{% if i.interval_min %}
+    MinRtrAdvInterval {{ i.interval_min }};
+{% endif %}
+    AdvReachableTime {{ i.reachable_time }};
+    AdvIntervalOpt {{ i.send_advert }};
+    AdvSendAdvert {{ i.send_advert }};
+{% if i.default_lifetime %}
+    AdvDefaultLifetime {{ i.default_lifetime }};
+{% endif %}
+{% if i.link_mtu %}
+    AdvLinkMTU {{ i.link_mtu }};
+{% endif %}
+    AdvOtherConfigFlag {{ i.other_config_flag }};
+    AdvRetransTimer {{ i.retrans_timer }};
+    AdvCurHopLimit {{ i.hop_limit }};
+{% for p in i.prefixes %}
+    prefix {{ p.prefix }} {
+        AdvAutonomous {{ p.autonomous_flag }};
+        AdvValidLifetime {{ p.valid_lifetime }};
+        AdvOnLink {{ p.on_link }};
+        AdvPreferredLifetime {{ p.preferred_lifetime }};
+    };
+{% endfor %}
+{% if i.name_server %}
+    RDNSS {{ i.name_server | join(" ") }} {
+    };
+{% endif %}
+};
+{% endfor -%}
diff --git a/src/conf_mode/service-router-advert.py b/src/conf_mode/service-router-advert.py
index 1e0d28397..38c5cb2dc 100755
--- a/src/conf_mode/service-router-advert.py
+++ b/src/conf_mode/service-router-advert.py
@@ -15,55 +15,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import sys
-import jinja2
 
+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
 
 config_file = r'/etc/radvd.conf'
 
-config_tmpl = """
-### Autogenerated by service-router-advert.py ###
-
-{% for i in interfaces -%}
-interface {{ i.name }} {
-    IgnoreIfMissing on;
-    AdvDefaultPreference {{ i.default_preference }};
-    AdvManagedFlag {{ i.managed_flag }};
-    MaxRtrAdvInterval {{ i.interval_max }};
-{% if i.interval_min %}
-    MinRtrAdvInterval {{ i.interval_min }};
-{% endif %}
-    AdvReachableTime {{ i.reachable_time }};
-    AdvIntervalOpt {{ i.send_advert }};
-    AdvSendAdvert {{ i.send_advert }};
-{% if i.default_lifetime %}
-    AdvDefaultLifetime {{ i.default_lifetime }};
-{% endif %}
-{% if i.link_mtu %}
-    AdvLinkMTU {{ i.link_mtu }};
-{% endif %}
-    AdvOtherConfigFlag {{ i.other_config_flag }};
-    AdvRetransTimer {{ i.retrans_timer }};
-    AdvCurHopLimit {{ i.hop_limit }};
-{% for p in i.prefixes %}
-    prefix {{ p.prefix }} {
-        AdvAutonomous {{ p.autonomous_flag }};
-        AdvValidLifetime {{ p.valid_lifetime }};
-        AdvOnLink {{ p.on_link }};
-        AdvPreferredLifetime {{ p.preferred_lifetime }};
-    };
-{% endfor %}
-{% if i.name_server %}
-    RDNSS {{ i.name_server | join(" ") }} {
-    };
-{% endif %}
-};
-{% endfor -%}
-"""
-
 default_config_data = {
     'interfaces': []
 }
@@ -175,7 +137,12 @@ def generate(rtradv):
     if not rtradv['interfaces']:
         return None
 
-    tmpl = jinja2.Template(config_tmpl, trim_blocks=True)
+    # 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)
@@ -189,13 +156,13 @@ def generate(rtradv):
 def apply(rtradv):
     if not rtradv['interfaces']:
         # bail out early - looks like removal from running config
-        os.system('sudo systemctl stop radvd.service')
+        os.system('systemctl stop radvd.service')
         if os.path.exists(config_file):
             os.unlink(config_file)
 
         return None
 
-    os.system('sudo systemctl restart radvd.service')
+    os.system('systemctl restart radvd.service')
     return None
 
 if __name__ == '__main__':
@@ -206,4 +173,4 @@ if __name__ == '__main__':
         apply(c)
     except ConfigError as e:
         print(e)
-        sys.exit(1)
+        exit(1)