From c9ad82ef583a1f44f84c7e69124f2a5d868da857 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 18 Aug 2021 09:30:33 +0200
Subject: nat66: ndppd: T2518: rename Jinja2 template folder to match common
 naming convention

---
 data/templates/ndppd/ndppd.conf.tmpl     | 44 ++++++++++++++++++++++++++++++++
 data/templates/proxy-ndp/ndppd.conf.tmpl | 44 --------------------------------
 src/conf_mode/nat66.py                   | 10 ++++----
 3 files changed, 49 insertions(+), 49 deletions(-)
 create mode 100644 data/templates/ndppd/ndppd.conf.tmpl
 delete mode 100644 data/templates/proxy-ndp/ndppd.conf.tmpl

diff --git a/data/templates/ndppd/ndppd.conf.tmpl b/data/templates/ndppd/ndppd.conf.tmpl
new file mode 100644
index 000000000..502dab5b8
--- /dev/null
+++ b/data/templates/ndppd/ndppd.conf.tmpl
@@ -0,0 +1,44 @@
+########################################################
+#
+# autogenerated by nat66.py
+#
+#   The configuration file must define one upstream
+#   interface.
+#
+#   For some services, such as nat66, because it runs
+#    stateless, it needs to rely on NDP Proxy to respond
+#   to NDP requests.
+#
+#   When using nat66 source rules, NDP Proxy needs
+#   to be enabled
+#
+########################################################
+
+{% set global = namespace(ndppd_interfaces = [],ndppd_prefixs = []) %}
+{% if source is defined and source.rule is defined and source.rule is not none %}
+{%   for rule, config in source.rule.items() if config.disable is not defined %}
+{%     if config.outbound_interface is defined %}
+{%         if config.outbound_interface not in global.ndppd_interfaces %}
+{%             set global.ndppd_interfaces = global.ndppd_interfaces + [config.outbound_interface] %}
+{%         endif   %}
+{%         if config.translation is defined and config.translation.address is defined and config.translation.address | is_ip_network %}
+{%             set global.ndppd_prefixs = global.ndppd_prefixs + [{'interface':config.outbound_interface,'rule':config.translation.address}] %}
+{%         endif    %}
+{%     endif    %}
+{%   endfor %}
+{% endif %}
+
+{% for interface in global.ndppd_interfaces %}
+proxy {{ interface }} {
+    router yes
+    timeout 500
+    ttl 30000
+{%  for map in global.ndppd_prefixs %}
+{%     if map.interface == interface %}
+    rule {{ map.rule }} {
+        static
+    }
+{%     endif  %}
+{%  endfor   %}
+}
+{% endfor %}
diff --git a/data/templates/proxy-ndp/ndppd.conf.tmpl b/data/templates/proxy-ndp/ndppd.conf.tmpl
deleted file mode 100644
index 502dab5b8..000000000
--- a/data/templates/proxy-ndp/ndppd.conf.tmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-########################################################
-#
-# autogenerated by nat66.py
-#
-#   The configuration file must define one upstream
-#   interface.
-#
-#   For some services, such as nat66, because it runs
-#    stateless, it needs to rely on NDP Proxy to respond
-#   to NDP requests.
-#
-#   When using nat66 source rules, NDP Proxy needs
-#   to be enabled
-#
-########################################################
-
-{% set global = namespace(ndppd_interfaces = [],ndppd_prefixs = []) %}
-{% if source is defined and source.rule is defined and source.rule is not none %}
-{%   for rule, config in source.rule.items() if config.disable is not defined %}
-{%     if config.outbound_interface is defined %}
-{%         if config.outbound_interface not in global.ndppd_interfaces %}
-{%             set global.ndppd_interfaces = global.ndppd_interfaces + [config.outbound_interface] %}
-{%         endif   %}
-{%         if config.translation is defined and config.translation.address is defined and config.translation.address | is_ip_network %}
-{%             set global.ndppd_prefixs = global.ndppd_prefixs + [{'interface':config.outbound_interface,'rule':config.translation.address}] %}
-{%         endif    %}
-{%     endif    %}
-{%   endfor %}
-{% endif %}
-
-{% for interface in global.ndppd_interfaces %}
-proxy {{ interface }} {
-    router yes
-    timeout 500
-    ttl 30000
-{%  for map in global.ndppd_prefixs %}
-{%     if map.interface == interface %}
-    rule {{ map.rule }} {
-        static
-    }
-{%     endif  %}
-{%  endfor   %}
-}
-{% endfor %}
diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py
index e2bd6417d..2314b6623 100755
--- a/src/conf_mode/nat66.py
+++ b/src/conf_mode/nat66.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020 VyOS maintainers and contributors
+# Copyright (C) 2020-2021 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -55,7 +55,7 @@ def get_config(config=None):
         conf = config
     else:
         conf = Config()
-    
+
     base = ['nat66']
     nat = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
 
@@ -90,7 +90,7 @@ def get_config(config=None):
     # be done only once
     if not get_handler(condensed_json, 'PREROUTING', 'NAT_CONNTRACK'):
         nat['helper_functions'] = 'add'
-        
+
         # Retrieve current table handler positions
         nat['pre_ct_ignore'] = get_handler(condensed_json, 'PREROUTING', 'VYATTA_CT_IGNORE')
         nat['pre_ct_conntrack'] = get_handler(condensed_json, 'PREROUTING', 'VYATTA_CT_PREROUTING_HOOK')
@@ -109,7 +109,7 @@ def verify(nat):
     if 'helper_functions' in nat and nat['helper_functions'] != 'has':
         if not (nat['pre_ct_conntrack'] or nat['out_ct_conntrack']):
             raise Exception('could not determine nftable ruleset handlers')
-    
+
     if dict_search('source.rule', nat):
         for rule, config in dict_search('source.rule', nat).items():
             err_msg = f'Source NAT66 configuration error in rule {rule}:'
@@ -145,7 +145,7 @@ def verify(nat):
 
 def generate(nat):
     render(iptables_nat_config, 'firewall/nftables-nat66.tmpl', nat, permission=0o755)
-    render(ndppd_config, 'proxy-ndp/ndppd.conf.tmpl', nat, permission=0o755)
+    render(ndppd_config, 'ndppd/ndppd.conf.tmpl', nat, permission=0o755)
     return None
 
 def apply(nat):
-- 
cgit v1.2.3