[req-change] Changed zt interface path to /etc/openwisp/zerotier

openwisp · Aug 23, 2023 · a07e093 · a07e093
1 parent b226a66
commit a07e093
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/docs/source/backends/zerotier.rst b/docs/source/backends/zerotier.rst
@@ -328,7 +328,7 @@ Will be rendered as:
     package zerotier
 
     config zerotier 'ow_zt'
-        option config_path '/etc/ow_zerotier_extra'
+        option config_path '/etc/openwisp/zerotier'
         option copy_config_path '1'
         option enabled '1'
         list join '9536600adf654321'

diff --git a/netjsonconfig/backends/openwrt/converters/zerotier.py b/netjsonconfig/backends/openwrt/converters/zerotier.py
@@ -15,7 +15,7 @@ def __intermediate_vpn(self, vpn):
             {
                 '.name': self._get_uci_name(vpn.pop('name')),
                 '.type': 'zerotier',
-                'config_path': vpn.get('config_path', '/etc/ow_zerotier_extra'),
+                'config_path': vpn.get('config_path', '/etc/openwisp/zerotier'),
                 'copy_config_path': vpn.get('copy_config_path', '1'),
                 'join': [nwid_ifname.get('id', '') for nwid_ifname in nwid_ifnames],
                 'enabled': not vpn.pop('disabled', False),
@@ -36,7 +36,7 @@ def __netjson_vpn(self, vpn):
         return super().__netjson_vpn(vpn)
 
     def __get_zt_ifname_files(self, vpn, files):
-        config_path = vpn.get('config_path', '/etc/ow_zerotier_extra')
+        config_path = vpn.get('config_path', '/etc/openwisp/zerotier')
         nwid_ifnames = vpn.get('nwid_ifname', [])
         zt_file_contents = '# network_id=interface_name\n'
 

diff --git a/netjsonconfig/backends/zerotier/zerotier.py b/netjsonconfig/backends/zerotier/zerotier.py
@@ -20,7 +20,7 @@ def auto_client(
         name='ow_zt',
         nwid_ifname=None,
         identity_secret='{{zt_identity_secret}}',
-        config_path='/etc/ow_zerotier_extra',
+        config_path='/etc/openwisp/zerotier',
         disabled=False,
     ):
         nwid_ifname = nwid_ifname or []

diff --git a/tests/openwrt/test_backend.py b/tests/openwrt/test_backend.py
@@ -554,7 +554,7 @@ def test_zerotier_auto_client(self):
                         'name': 'ow_zt',
                         'nwid_ifname': [],
                         'secret': '{{zt_identity_secret}}',
-                        'config_path': '/etc/ow_zerotier_extra',
+                        'config_path': '/etc/openwisp/zerotier',
                         'disabled': False,
                     }
                 ]

diff --git a/tests/openwrt/test_zerotier.py b/tests/openwrt/test_zerotier.py
@@ -42,20 +42,20 @@ def test_zt_multiple_render_diff_name(self):
             """package zerotier
 
 config zerotier 'ow_zt1'
-    option config_path '/etc/ow_zerotier_extra'
+    option config_path '/etc/openwisp/zerotier'
     option copy_config_path '1'
     option enabled '1'
     list join '9536600adf654321'
 
 config zerotier 'ow_zt2'
-    option config_path '/etc/ow_zerotier_extra'
+    option config_path '/etc/openwisp/zerotier'
     option copy_config_path '1'
     option enabled '1'
     list join '9536600adf654322'
 
 # ---------- files ---------- #
 
-# path: /etc/ow_zerotier_extra/devicemap
+# path: /etc/openwisp/zerotier/devicemap
 # mode: 0644
 
 # network_id=interface_name
@@ -104,15 +104,15 @@ def test_zt_multiple_render_same_name(self):
             """package zerotier
 
 config zerotier 'ow_zt'
-    option config_path '/etc/ow_zerotier_extra'
+    option config_path '/etc/openwisp/zerotier'
     option copy_config_path '1'
     option enabled '1'
     list join '9536600adf654321'
     list join '9536600adf654322'
 
 # ---------- files ---------- #
 
-# path: /etc/ow_zerotier_extra/devicemap
+# path: /etc/openwisp/zerotier/devicemap
 # mode: 0644
 
 # network_id=interface_name

diff --git a/tests/zerotier/test_backend.py b/tests/zerotier/test_backend.py
@@ -390,7 +390,7 @@ def test_auto_client(self):
             'name': 'ow_zt',
             'nwid_ifname': [{'id': '9536600adf654321', 'ifname': 'owzt654321'}],
             'secret': 'test_secret',
-            'config_path': '/etc/ow_zerotier_extra',
+            'config_path': '/etc/openwisp/zerotier',
             'disabled': False,
         }
         self.assertEqual(