Skip to content

Commit b46202c

Browse files
jonathanunderwoodjonathanunderwood
committed
Run openwisp-qa-format over test_default.py and firewall.py
1 parent cdaf8c5 commit b46202c

2 files changed

Lines changed: 82 additions & 83 deletions

File tree

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

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,18 @@
55

66

77
class Firewall(OpenWrtConverter):
8-
netjson_key = 'firewall'
9-
intermediate_key = 'firewall'
10-
_uci_types = ['defaults', 'forwarding', 'zone', 'rule']
11-
_schema = schema['properties']['firewall']
8+
netjson_key = "firewall"
9+
intermediate_key = "firewall"
10+
_uci_types = ["defaults", "forwarding", "zone", "rule"]
11+
_schema = schema["properties"]["firewall"]
1212

1313
def to_intermediate_loop(self, block, result, index=None):
14-
forwardings = self.__intermediate_forwardings(block.pop('forwardings', {}))
15-
zones = self.__intermediate_zones(block.pop('zones', {}))
16-
rules = self.__intermediate_rules(block.pop('rules', {}))
17-
block.update({
18-
'.type': 'defaults',
19-
'.name': block.pop('id', 'defaults'),
20-
})
21-
result.setdefault('firewall', [])
22-
result['firewall'] = [self.sorted_dict(block)] + forwardings + zones + rules
14+
forwardings = self.__intermediate_forwardings(block.pop("forwardings", {}))
15+
zones = self.__intermediate_zones(block.pop("zones", {}))
16+
rules = self.__intermediate_rules(block.pop("rules", {}))
17+
block.update({".type": "defaults", ".name": block.pop("id", "defaults")})
18+
result.setdefault("firewall", [])
19+
result["firewall"] = [self.sorted_dict(block)] + forwardings + zones + rules
2320
return result
2421

2522
def __intermediate_forwardings(self, forwardings):
@@ -29,19 +26,26 @@ def __intermediate_forwardings(self, forwardings):
2926
"""
3027
result = []
3128
for forwarding in forwardings:
32-
resultdict = OrderedDict((('.name', self.__get_auto_name_forwarding(forwarding)),
33-
('.type', 'forwarding')))
29+
resultdict = OrderedDict(
30+
(
31+
(".name", self.__get_auto_name_forwarding(forwarding)),
32+
(".type", "forwarding"),
33+
)
34+
)
3435
resultdict.update(forwarding)
3536
result.append(resultdict)
3637
return result
3738

3839
def __get_auto_name_forwarding(self, forwarding):
39-
if 'family' in forwarding.keys():
40-
uci_name = self._get_uci_name('_'.join([forwarding['src'], forwarding['dest'],
41-
forwarding['family']]))
40+
if "family" in forwarding.keys():
41+
uci_name = self._get_uci_name(
42+
"_".join([forwarding["src"], forwarding["dest"], forwarding["family"]])
43+
)
4244
else:
43-
uci_name = self._get_uci_name('_'.join([forwarding['src'], forwarding['dest']]))
44-
return 'forwarding_{0}'.format(uci_name)
45+
uci_name = self._get_uci_name(
46+
"_".join([forwarding["src"], forwarding["dest"]])
47+
)
48+
return "forwarding_{0}".format(uci_name)
4549

4650
def __intermediate_zones(self, zones):
4751
"""
@@ -50,14 +54,15 @@ def __intermediate_zones(self, zones):
5054
"""
5155
result = []
5256
for zone in zones:
53-
resultdict = OrderedDict((('.name', self.__get_auto_name_zone(zone)),
54-
('.type', 'zone')))
57+
resultdict = OrderedDict(
58+
((".name", self.__get_auto_name_zone(zone)), (".type", "zone"))
59+
)
5560
resultdict.update(zone)
5661
result.append(resultdict)
5762
return result
5863

5964
def __get_auto_name_zone(self, zone):
60-
return 'zone_{0}'.format(self._get_uci_name(zone['name']))
65+
return "zone_{0}".format(self._get_uci_name(zone["name"]))
6166

6267
def __intermediate_rules(self, rules):
6368
"""
@@ -66,24 +71,25 @@ def __intermediate_rules(self, rules):
6671
"""
6772
result = []
6873
for rule in rules:
69-
if 'config_name' in rule:
70-
del rule['config_name']
71-
resultdict = OrderedDict((('.name', self.__get_auto_name_rule(rule)),
72-
('.type', 'rule')))
74+
if "config_name" in rule:
75+
del rule["config_name"]
76+
resultdict = OrderedDict(
77+
((".name", self.__get_auto_name_rule(rule)), (".type", "rule"))
78+
)
7379
resultdict.update(rule)
7480
result.append(resultdict)
7581
return result
7682

7783
def __get_auto_name_rule(self, rule):
78-
return 'rule_{0}'.format(self._get_uci_name(rule['name']))
84+
return "rule_{0}".format(self._get_uci_name(rule["name"]))
7985

8086
def to_netjson_loop(self, block, result, index):
81-
result['firewall'] = self.__netjson_firewall(block)
87+
result["firewall"] = self.__netjson_firewall(block)
8288
return result
8389

8490
def __netjson_firewall(self, firewall):
85-
del firewall['.type']
86-
_name = firewall.pop('.name')
87-
if _name != 'firewall':
88-
firewall['id'] = _name
91+
del firewall[".type"]
92+
_name = firewall.pop(".name")
93+
if _name != "firewall":
94+
firewall["id"] = _name
8995
return self.type_cast(firewall)

‎tests/openwrt/test_default.py‎

Lines changed: 43 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,47 @@ class TestDefault(unittest.TestCase, _TabsMixin):
88
maxDiff = None
99

1010
def test_render_default(self):
11-
o = OpenWrt({
12-
"luci": [
13-
{
14-
"config_name": "core",
15-
"config_value": "main",
16-
"lang": "auto",
17-
"resourcebase": "/luci-static/resources",
18-
"mediaurlbase": "/luci-static/bootstrap",
19-
"number": 4,
20-
"boolean": True
21-
}
22-
],
23-
"firewall": {
24-
"rules": [
25-
{
26-
"config_name": "rule",
27-
"name": "Allow-MLD",
28-
"src": "wan",
29-
"proto": "icmp",
30-
"src_ip": "fe80::/10",
31-
"family": "ipv6",
32-
"target": "ACCEPT",
33-
"icmp_type": [
34-
"130/0",
35-
"131/0",
36-
"132/0",
37-
"143/0"
38-
]
39-
},
11+
o = OpenWrt(
12+
{
13+
"luci": [
4014
{
41-
"config_name": "rule",
42-
"name": "Rule2",
43-
"src": "wan",
44-
"proto": "icmp",
45-
"src_ip": "192.168.1.1/24",
46-
"family": "ipv4",
47-
"target": "ACCEPT",
48-
"icmp_type": [
49-
"130/0",
50-
"131/0",
51-
"132/0",
52-
"143/0"
53-
]
15+
"config_name": "core",
16+
"config_value": "main",
17+
"lang": "auto",
18+
"resourcebase": "/luci-static/resources",
19+
"mediaurlbase": "/luci-static/bootstrap",
20+
"number": 4,
21+
"boolean": True,
5422
}
55-
]
23+
],
24+
"firewall": {
25+
"rules": [
26+
{
27+
"config_name": "rule",
28+
"name": "Allow-MLD",
29+
"src": "wan",
30+
"proto": "icmp",
31+
"src_ip": "fe80::/10",
32+
"family": "ipv6",
33+
"target": "ACCEPT",
34+
"icmp_type": ["130/0", "131/0", "132/0", "143/0"],
35+
},
36+
{
37+
"config_name": "rule",
38+
"name": "Rule2",
39+
"src": "wan",
40+
"proto": "icmp",
41+
"src_ip": "192.168.1.1/24",
42+
"family": "ipv4",
43+
"target": "ACCEPT",
44+
"icmp_type": ["130/0", "131/0", "132/0", "143/0"],
45+
},
46+
]
47+
},
5648
}
57-
})
58-
expected = self._tabs("""package firewall
49+
)
50+
expected = self._tabs(
51+
"""package firewall
5952
6053
config rule 'rule_Allow_MLD'
6154
option family 'ipv6'
@@ -163,7 +156,7 @@ def test_parse_default(self):
163156
"src_ip": "fe80::/10",
164157
"family": "ipv6",
165158
"target": "ACCEPT",
166-
"icmp_type": ["130/0", "131/0", "132/0", "143/0"]
159+
"icmp_type": ["130/0", "131/0", "132/0", "143/0"],
167160
}
168161
]
169162
},
@@ -185,11 +178,11 @@ def test_parse_default(self):
185178

186179
def test_skip(self):
187180
o = OpenWrt({"skipme": {"enabled": True}})
188-
self.assertEqual(o.render(), '')
181+
self.assertEqual(o.render(), "")
189182

190183
def test_warning(self):
191184
o = OpenWrt({"luci": [{"unrecognized": True}]})
192-
self.assertEqual(o.render(), '')
185+
self.assertEqual(o.render(), "")
193186

194187
def test_merge(self):
195188
template = {
@@ -228,8 +221,8 @@ def test_merge(self):
228221
self.assertEqual(o.config, expected)
229222

230223
def test_skip_nonlists(self):
231-
o = OpenWrt({"custom_package": {'unknown': True}})
232-
self.assertEqual(o.render(), '')
224+
o = OpenWrt({"custom_package": {"unknown": True}})
225+
self.assertEqual(o.render(), "")
233226

234227
def test_render_invalid_uci_name(self):
235228
o = OpenWrt(

0 commit comments

Comments
 (0)