Skip to content

Commit bdba39a

Browse files
committed
[airos] make flake happier
1 parent 157892a commit bdba39a

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

netjsonconfig/backends/airos/aaa.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def sta_psk(interface):
3535
}
3636
}
3737

38+
3839
_profile = {}
3940

4041
_profile_from_mode = {
@@ -48,13 +49,15 @@ def sta_psk(interface):
4849
},
4950
}
5051

52+
5153
def profile_from_interface(interface):
5254
profile = _profile.copy()
5355
profile.update(
5456
_profile_from_mode[mode(interface)][protocol(interface)](interface)
5557
)
5658
return profile
5759

60+
5861
_status = {}
5962

6063
_status_from_mode = {

netjsonconfig/backends/airos/converters.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,18 @@ def to_intermediate(self):
5858
result = []
5959
try:
6060
wireless = self.wireless[0]
61-
bridge = self.bridge[0]
6261
base.update(profile_from_interface(wireless))
6362
base.update(status_from_interface(wireless))
6463
base.update(radius_from_interface(wireless))
65-
base.update(bridge_devname(wireless, bridge))
6664
except IndexError:
6765
raise Exception('input is missing a wireless or bridge interface')
66+
67+
try:
68+
bridge = self.bridge[0]
69+
base.update(bridge_devname(wireless, bridge))
70+
except IndexError:
71+
pass
72+
6873
result.append(status_from_interface(wireless))
6974
result.append([base])
7075

@@ -305,7 +310,6 @@ def to_intermediate(self):
305310
class Ntpclient(AirOsConverter):
306311
netjson_key = 'ntp'
307312

308-
309313
def ntp_status(self, ntp):
310314
if ntp.get('enabled', True):
311315
return 'enabled'
@@ -639,7 +643,7 @@ def to_intermediate(self):
639643
'signal_led4': 15,
640644
'signal_led_status': 'enabled',
641645
'ssid': w['wireless']['ssid'],
642-
'ap': w['wireless'].get('bssid',''),
646+
'ap': w['wireless'].get('bssid', ''),
643647
'status': status(w),
644648
'wds': {'status': 'enabled'},
645649
})

netjsonconfig/backends/airos/radius.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,15 @@
4545
}
4646
}
4747

48+
4849
def radius_from_interface(interface):
4950
radius = _radius.copy()
5051
radius.update(
5152
_radius_from_mode[mode(interface)][protocol(interface)]
5253
)
5354
return radius
5455

56+
5557
__all__ = [
5658
radius_from_interface,
5759
]

0 commit comments

Comments
 (0)