Skip to content

Commit ad5f75f

Browse files
pandafypandafy
committed
[fix] Fixed typo in fields of ZeroTier backend #342
Fixes #342
1 parent f569320 commit ad5f75f

4 files changed

Lines changed: 41 additions & 42 deletions

File tree

‎docs/source/backends/zerotier.rst‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ See an example of initialization and rendering below:
8585
"remoteTraceLevel": 1,
8686
"client_options": {
8787
"allow_managed": True,
88-
"allowed_global": False,
89-
"allowed_default": False,
90-
"allowed_dns": False,
88+
"allow_global": False,
89+
"allow_default": False,
90+
"allow_dns": False,
9191
},
9292
}
9393
]
@@ -276,18 +276,17 @@ key name type default description
276276
``remoteTraceLevel`` integer level of network tracing
277277
``client_options`` dict ``{}`` These options are only used for client configurations
278278

279-
=================== ======= ==========================================
280-
key name type description
281-
=================== ======= ==========================================
282-
``allow_managed`` boolean allow ZeroTier to set IP addresses and
283-
routes
284-
``allowed_global`` boolean allow ZeroTier to set
285-
global/public/not-private range IPs and
286-
routes
287-
``allowed_default`` boolean allow ZeroTier to set the default route on
288-
the system
289-
``allowed_dns`` boolean allow ZeroTier to set DNS servers
290-
=================== ======= ==========================================
279+
================= ======= =============================================
280+
key name type description
281+
================= ======= =============================================
282+
``allow_managed`` boolean allow ZeroTier to set IP addresses and routes
283+
``allow_global`` boolean allow ZeroTier to set
284+
global/public/not-private range IPs and
285+
routes
286+
``allow_default`` boolean allow ZeroTier to set the default route on
287+
the system
288+
``allow_dns`` boolean allow ZeroTier to set DNS servers
289+
================= ======= =============================================
291290
===================== ======= =========== =======================================================================
292291

293292
Client specific settings

‎netjsonconfig/backends/openwrt/converters/zerotier.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ def __netjson_network(self, network):
7979
network.pop(key)
8080
network['ifname'] = self._get_ifname_from_id(network['id'])
8181
# Handle boolean fields
82-
if 'allowed_global' in network:
83-
network['allowed_global'] = network['allowed_global'] == '1'
84-
if 'allowed_default' in network:
85-
network['allowed_default'] = network['allowed_default'] == '1'
86-
if 'allowed_dns' in network:
87-
network['allowed_dns'] = network['allowed_dns'] == '1'
82+
if 'allow_global' in network:
83+
network['allow_global'] = network['allow_global'] == '1'
84+
if 'allow_default' in network:
85+
network['allow_default'] = network['allow_default'] == '1'
86+
if 'allow_dns' in network:
87+
network['allow_dns'] = network['allow_dns'] == '1'
8888
if 'allow_managed' in network:
8989
network['allow_managed'] = network['allow_managed'] == '1'
9090
return network

‎tests/openwrt/test_zerotier.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ class TestZeroTier(unittest.TestCase, _TabsMixin):
1818
"id": "9536600adf654321",
1919
"ifname": "owzt654321",
2020
"allow_managed": True,
21-
"allowed_global": False,
22-
"allowed_default": False,
23-
"allowed_dns": False,
21+
"allow_global": False,
22+
"allow_default": False,
23+
"allow_dns": False,
2424
},
2525
{
2626
"id": "9536600adf654322",
2727
"ifname": "owzt654322",
2828
"allow_managed": True,
29-
"allowed_global": False,
30-
"allowed_default": False,
31-
"allowed_dns": False,
29+
"allow_global": False,
30+
"allow_default": False,
31+
"allow_dns": False,
3232
},
3333
],
3434
},
@@ -46,17 +46,17 @@ class TestZeroTier(unittest.TestCase, _TabsMixin):
4646
option local_conf_path '/etc/openwisp/zerotier/zerotier.conf'
4747
4848
config network 'owzt654321'
49+
option allow_default '0'
50+
option allow_dns '0'
51+
option allow_global '0'
4952
option allow_managed '1'
50-
option allowed_default '0'
51-
option allowed_dns '0'
52-
option allowed_global '0'
5353
option id '9536600adf654321'
5454
5555
config network 'owzt654322'
56+
option allow_default '0'
57+
option allow_dns '0'
58+
option allow_global '0'
5659
option allow_managed '1'
57-
option allowed_default '0'
58-
option allowed_dns '0'
59-
option allowed_global '0'
6060
option id '9536600adf654322'
6161
6262
# ---------- files ---------- #
@@ -132,10 +132,10 @@ def test_zt_parse_new(self):
132132
133133
config network
134134
option id '9536600adf654322'
135+
option allow_default '0'
136+
option allow_dns '0'
137+
option allow_global '0'
135138
option allow_managed '1'
136-
option allowed_default '0'
137-
option allowed_dns '0'
138-
option allowed_global '0'
139139
"""
140140
)
141141
expected = {
@@ -148,9 +148,9 @@ def test_zt_parse_new(self):
148148
"id": "9536600adf654322",
149149
"ifname": "owzt654322",
150150
"allow_managed": True,
151-
"allowed_global": False,
152-
"allowed_default": False,
153-
"allowed_dns": False,
151+
"allow_global": False,
152+
"allow_default": False,
153+
"allow_dns": False,
154154
},
155155
],
156156
"name": "ow_zt",

‎tests/zerotier/test_backend.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ class TestBackend(unittest.TestCase):
6262
"remoteTraceLevel": 1,
6363
"client_options": {
6464
"allow_managed": True,
65-
"allowed_global": False,
66-
"allowed_default": False,
67-
"allowed_dns": False,
65+
"allow_global": False,
66+
"allow_default": False,
67+
"allow_dns": False,
6868
},
6969
}
7070
]

0 commit comments

Comments
 (0)