Skip to content

Commit 4ca28df

Browse files
edoputedoput
committed
[airos] somebody PEP8's me
1 parent eb40826 commit 4ca28df

19 files changed

+65
-65
lines changed

‎bin/netjsonconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ backends = {
170170
'openwrt': netjsonconfig.OpenWrt,
171171
'openwisp': netjsonconfig.OpenWisp,
172172
'openvpn': netjsonconfig.OpenVpn,
173-
'airos': netjsonconfig.AirOS,
173+
'airos': netjsonconfig.AirOs,
174174
}
175175

176176
backend_class = backends[args.backend]

‎netjsonconfig/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
from .backends.openwrt.openwrt import OpenWrt # noqa
44
from .backends.openwisp.openwisp import OpenWisp # noqa
55
from .backends.openvpn.openvpn import OpenVpn # noqa
6-
from .backends.airos.airos import AirOS # noqa
6+
from .backends.airos.airos import AirOs # noqa

‎netjsonconfig/backends/airos/airos.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
Httpd, Igmpproxy, Iptables, Netconf, Netmode, Ntpclient, \
55
Pwdog, Radio, Resolv, Route, Snmp, Sshd, Syslog, System, \
66
Telnetd, Update, Users, Vlan, Wireless, Wpasupplicant
7-
from .renderers import AirOS
7+
from .renderers import AirOS as AirOsRenderer
88
from ..base.backend import BaseBackend
99
from .schema import schema
1010

1111

12-
class AirOS(BaseBackend):
12+
class AirOs(BaseBackend):
1313
"""
1414
AirOS backend
1515
"""
@@ -52,10 +52,10 @@ class AirOS(BaseBackend):
5252
# templates lives
5353
env_path = 'netjsonconfig.backends.airos'
5454

55-
renderer = AirOS
55+
renderer = AirOsRenderer
5656

5757
def to_intermediate(self):
58-
super(AirOS, self).to_intermediate()
58+
super(AirOs, self).to_intermediate()
5959
for k, v in self.intermediate_data.items():
6060
self.intermediate_data[k] = [x for x in flatten(intermediate_to_list(v)) if x != {}]
6161

‎tests/airos/dummy.py

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from netjsonconfig import AirOS
1+
from netjsonconfig import AirOs
22

3-
from netjsoncongig.backends.airos.converters import Aaa, Bridge, Discovery, Dyndns, Ebtables, Gui, \
3+
from netjsonconfig.backends.airos.converters import Aaa, Bridge, Discovery, Dyndns, Ebtables, Gui, \
44
Httpd, Igmpproxy, Iptables, Netconf, Netmode, Ntpclient, \
55
Pwdog, Radio, Resolv, Route, Snmp, Sshd, Syslog, System, \
66
Telnetd, Update, Users, Vlan, Wireless, Wpasupplicant
@@ -33,7 +33,7 @@ def assertEqualConfig(self, a, b):
3333
self.assertEqual(a, b)
3434

3535

36-
class AaaAirOS(AirOS):
36+
class AaaAirOs(AirOs):
3737
"""
3838
Mock backend with converter for radius authentication
3939
"""
@@ -42,7 +42,7 @@ class AaaAirOS(AirOS):
4242
]
4343

4444

45-
class BridgeAirOS(AirOS):
45+
class BridgeAirOs(AirOs):
4646
"""
4747
Mock backend with converter for bridge interface
4848
"""
@@ -51,7 +51,7 @@ class BridgeAirOS(AirOS):
5151
]
5252

5353

54-
class DiscoveryAirOS(AirOS):
54+
class DiscoveryAirOs(AirOs):
5555
"""
5656
Mock backend with converter for network hardware discovery
5757
"""
@@ -60,7 +60,7 @@ class DiscoveryAirOS(AirOS):
6060
]
6161

6262

63-
class DyndnsAirOS(AirOS):
63+
class DyndnsAirOs(AirOs):
6464
"""
6565
Mock backend with converter for dynamic dns capabilities
6666
"""
@@ -69,7 +69,7 @@ class DyndnsAirOS(AirOS):
6969
]
7070

7171

72-
class EbtablesAirOS(AirOS):
72+
class EbtablesAirOs(AirOs):
7373
"""
7474
Mock backend with converter for ebtables
7575
"""
@@ -78,7 +78,7 @@ class EbtablesAirOS(AirOS):
7878
]
7979

8080

81-
class GuiAirOS(AirOS):
81+
class GuiAirOs(AirOs):
8282
"""
8383
Mock backend with converter for web interface settings
8484
"""
@@ -87,7 +87,7 @@ class GuiAirOS(AirOS):
8787
]
8888

8989

90-
class HttpdAirOS(AirOS):
90+
class HttpdAirOs(AirOs):
9191
"""
9292
Mock backend with converter for web server
9393
"""
@@ -96,7 +96,7 @@ class HttpdAirOS(AirOS):
9696
]
9797

9898

99-
class Igmpproxy(AirOS):
99+
class Igmpproxy(AirOs):
100100
"""
101101
Mock backend with converter for igmpproxy
102102
"""
@@ -105,7 +105,7 @@ class Igmpproxy(AirOS):
105105
]
106106

107107

108-
class IptablesAirOS(AirOS):
108+
class IptablesAirOs(AirOs):
109109
"""
110110
Mock backend with converter for iptables
111111
"""
@@ -114,7 +114,7 @@ class IptablesAirOS(AirOS):
114114
]
115115

116116

117-
class NetconfAirOS(AirOS):
117+
class NetconfAirOs(AirOs):
118118
"""
119119
Mock backend with converter for network configuration
120120
"""
@@ -123,7 +123,7 @@ class NetconfAirOS(AirOS):
123123
]
124124

125125

126-
class NetmodeAirOS(AirOS):
126+
class NetmodeAirOs(AirOs):
127127
"""
128128
Mock backend with converter for network mode
129129
"""
@@ -132,7 +132,7 @@ class NetmodeAirOS(AirOS):
132132
]
133133

134134

135-
class NtpclientAirOS(AirOS):
135+
class NtpclientAirOs(AirOs):
136136
"""
137137
Mock backend with converter for ntp settings
138138
"""
@@ -141,7 +141,7 @@ class NtpclientAirOS(AirOS):
141141
]
142142

143143

144-
class PwdogAirOS(AirOS):
144+
class PwdogAirOs(AirOs):
145145
"""
146146
Mock backend with converter for ping watchdog settings
147147
"""
@@ -150,7 +150,7 @@ class PwdogAirOS(AirOS):
150150
]
151151

152152

153-
class RadioAirOS(AirOS):
153+
class RadioAirOs(AirOs):
154154
"""
155155
Mock backend with converter for radio settings
156156
"""
@@ -159,7 +159,7 @@ class RadioAirOS(AirOS):
159159
]
160160

161161

162-
class ResolvAirOS(AirOS):
162+
class ResolvAirOs(AirOs):
163163
"""
164164
Mock backend with converter for network resolver
165165
"""
@@ -168,7 +168,7 @@ class ResolvAirOS(AirOS):
168168
]
169169

170170

171-
class RouteAirOS(AirOS):
171+
class RouteAirOs(AirOs):
172172
"""
173173
Mock backend with converter for static routes
174174
"""
@@ -177,7 +177,7 @@ class RouteAirOS(AirOS):
177177
]
178178

179179

180-
class SnmpAirOS(AirOS):
180+
class SnmpAirOs(AirOs):
181181
"""
182182
Mock backend with converter for simple network management protocol
183183
"""
@@ -187,7 +187,7 @@ class SnmpAirOS(AirOS):
187187

188188

189189

190-
class SshdAirOS(AirOS):
190+
class SshdAirOs(AirOs):
191191
"""
192192
Mock backend with converter for ssh daemon settings
193193
"""
@@ -196,7 +196,7 @@ class SshdAirOS(AirOS):
196196
]
197197

198198

199-
class SyslogAirOS(AirOS):
199+
class SyslogAirOs(AirOs):
200200
"""
201201
Mock backend with converter for remote logging
202202
"""
@@ -205,7 +205,7 @@ class SyslogAirOS(AirOS):
205205
]
206206

207207

208-
class SystemAirOS(AirOS):
208+
class SystemAirOs(AirOs):
209209
"""
210210
Mock backend with converter for system settings
211211
"""
@@ -214,7 +214,7 @@ class SystemAirOS(AirOS):
214214
]
215215

216216

217-
class TelnetdAirOS(AirOS):
217+
class TelnetdAirOs(AirOs):
218218
"""
219219
Mock backend with converter for telnet daemon settings
220220
"""
@@ -223,7 +223,7 @@ class TelnetdAirOS(AirOS):
223223
]
224224

225225

226-
class UpdateAirOS(AirOS):
226+
class UpdateAirOs(AirOs):
227227
"""
228228
Mock backend with converter for update
229229
"""
@@ -232,7 +232,7 @@ class UpdateAirOS(AirOS):
232232
]
233233

234234

235-
class UsersAirOS(AirOS):
235+
class UsersAirOs(AirOs):
236236
"""
237237
Mock backend with converter for users settings
238238
"""
@@ -241,7 +241,7 @@ class UsersAirOS(AirOS):
241241
]
242242

243243

244-
class VlanAirOS(AirOS):
244+
class VlanAirOs(AirOs):
245245
"""
246246
Mock backend with converter for vlan settings
247247
"""
@@ -250,7 +250,7 @@ class VlanAirOS(AirOS):
250250
]
251251

252252

253-
class WirelessAirOS(AirOS):
253+
class WirelessAirOs(AirOs):
254254
"""
255255
Mock backend with converter for wireless settings
256256
"""
@@ -259,7 +259,7 @@ class WirelessAirOS(AirOS):
259259
]
260260

261261

262-
class WpasupplicantAirOS(AirOS):
262+
class WpasupplicantAirOs(AirOs):
263263
"""
264264
Mock backend with converter for wpasupplicant settings
265265
"""

‎tests/airos/test_aaa.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from .dummy import AaaAirOS, ConverterTest
1+
from .dummy import AaaAirOs, ConverterTest
22

33

44
class TestResolvConverter(ConverterTest):
55

6-
backend = AaaAirOS
6+
backend = AaaAirOs
77

88
def test_aaa_key(self):
99
o = self.backend({

‎tests/airos/test_bridge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from .dummy import BridgeAirOS, ConverterTest
1+
from .dummy import BridgeAirOs, ConverterTest
22

33

44
class TestBridgeConverter(ConverterTest):
55
"""
66
tests for backends.airos.renderers.SystemRenderer
77
"""
8-
backend = BridgeAirOS
8+
backend = BridgeAirOs
99

1010
def test_active_bridge(self):
1111

‎tests/airos/test_discovery.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from .dummy import DiscoveryAirOS, ConverterTest
1+
from .dummy import DiscoveryAirOs, ConverterTest
22

33

44
class TestDiscoveryConverter(ConverterTest):
55

6-
backend = DiscoveryAirOS
6+
backend = DiscoveryAirOs
77

88
def test_discovery_key(self):
99
o = self.backend({

‎tests/airos/test_dyndns.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from .dummy import DyndnsAirOS, ConverterTest
1+
from .dummy import DyndnsAirOs, ConverterTest
22

33

44
class TestDyndnsConverter(ConverterTest):
55

6-
backend = DyndnsAirOS
6+
backend = DyndnsAirOs
77

88
def test_Dyndns_key(self):
99
o = self.backend({

‎tests/airos/test_gui.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from .dummy import GuiAirOS, ConverterTest
1+
from .dummy import GuiAirOs, ConverterTest
22

33

44
class TestGuiConverter(ConverterTest):
55

6-
backend = GuiAirOS
6+
backend = GuiAirOs
77

88
def test_gui_key(self):
99
o = self.backend({

‎tests/airos/test_httpd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from .dummy import HttpdAirOS, ConverterTest
1+
from .dummy import HttpdAirOs, ConverterTest
22

33

44
class TestHttpdConverter(ConverterTest):
55

6-
backend = HttpdAirOS
6+
backend = HttpdAirOs
77

88
def test_httpd_key(self):
99
o = self.backend({

0 commit comments

Comments
 (0)