Skip to content

Commit f21906c

Browse files
committed
[airos] made indented code more compact
1 parent ab3e0b3 commit f21906c

1 file changed

Lines changed: 20 additions & 55 deletions

File tree

netjsonconfig/backends/airos/converters.py

Lines changed: 20 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,7 @@ def to_intermediate(self):
316316
interfaces.append(base)
317317

318318
result.append(interfaces)
319-
result.append({
320-
'status': 'enabled',
321-
})
319+
result.append({'status': 'enabled'})
322320
return (('netconf', result),)
323321

324322

@@ -397,9 +395,7 @@ def to_intermediate(self):
397395

398396
result.append(radios)
399397

400-
result.append({
401-
'status': 'enabled',
402-
})
398+
result.append({'status': 'enabled'})
403399

404400
return (('radio', result),)
405401

@@ -410,35 +406,30 @@ class Resolv(AirOsConverter):
410406
def host(self):
411407
original = get_copy(self.netjson, 'general', {})
412408
return {
413-
'host': [{
409+
'host': [{
414410
'name': original.get('hostname', 'airos'),
415411
'status': 'enabled',
416412
}],
417413
}
418414

419415
def nameserver(self):
416+
result = []
420417
original = get_copy(self.netjson, self.netjson_key, [])
421418

422-
t = []
423-
424419
for nameserver in original:
425-
t.append({
420+
result.append({
426421
'ip': nameserver,
427422
'status': 'enabled',
428423
})
429424

430-
return {'nameserver': t}
425+
return {'nameserver': result}
431426

432427
def to_intermediate(self):
433428
result = []
434429

435430
result.append(self.host())
436-
437431
result.append(self.nameserver())
438-
439-
result.append({
440-
'status': 'enabled',
441-
})
432+
result.append({'status': 'enabled'})
442433

443434
return (('resolv', result),)
444435

@@ -465,9 +456,7 @@ def to_intermediate(self):
465456
})
466457

467458
result.append(routes)
468-
result.append({
469-
'status': 'enabled',
470-
})
459+
result.append({'status': 'enabled'})
471460
return (('route', result),)
472461

473462

@@ -494,9 +483,7 @@ def to_intermediate(self):
494483
result = []
495484

496485
result.append({
497-
'auth': {
498-
'passwd': 'enabled',
499-
},
486+
'auth': {'passwd': 'enabled'},
500487
'port': 22,
501488
'status': 'enabled',
502489
})
@@ -602,9 +589,7 @@ def key_derivation(self):
602589
def to_intermediate(self):
603590
result = []
604591
original = get_copy(self.netjson, self.netjson_key, {})
605-
result.append({
606-
'status': 'enabled',
607-
})
592+
result.append({'status': 'enabled'})
608593
result.append([
609594
{
610595
'name': original.get('name'),
@@ -635,9 +620,7 @@ def to_intermediate(self):
635620
})
636621

637622
result.append(vlans)
638-
result.append({
639-
'status': 'enabled',
640-
})
623+
result.append({'status': 'enabled'})
641624

642625
return (('vlan', result),)
643626

@@ -662,32 +645,24 @@ def to_intermediate(self):
662645
'policy': 'allow',
663646
'status': 'disabled',
664647
},
665-
'mcast': {
666-
'enhance': 0,
667-
},
648+
'mcast': {'enhance': 0},
668649
'rate': {
669650
'auto': 'enabled',
670651
'mcs': -1,
671652
},
672-
'security': {
673-
'type': 'none',
674-
},
653+
'security': {'type': 'none'},
675654
'signal_led1': 75,
676655
'signal_led2': 50,
677656
'signal_led3': 25,
678657
'signal_led4': 15,
679658
'signal_led_status': 'enabled',
680659
'ssid': w['wireless']['ssid'],
681660
'status': status(w),
682-
'wds': {
683-
'status': 'enabled',
684-
},
661+
'wds': {'status': 'enabled'},
685662
})
686-
result.append(ws)
663+
result.append(wireless_list)
687664

688-
result.append({
689-
'status': 'enabled',
690-
})
665+
result.append({'status': 'enabled'})
691666

692667
return (('wireless', result),)
693668

@@ -732,9 +707,7 @@ def _station_intermediate(self, original):
732707
},
733708
],
734709
})
735-
result.append({
736-
'status': 'enabled',
737-
})
710+
result.append({'status': 'enabled'})
738711

739712
return (('wpasupplicant', result),)
740713

@@ -758,16 +731,12 @@ def _access_point_intermediate(self, original):
758731

759732
if 'encryption' in head:
760733
network = ap_auth_protocols.get(head['encryption']['protocol'])(head)
761-
result.append({
762-
'status': 'disabled',
763-
})
734+
result.append({'status': 'disabled'})
764735

765736
else:
766737
network = ap_auth_protocols['none'](head)
767738
temp_dev['status'] = 'enabled'
768-
result.append({
769-
'status': 'enabled',
770-
})
739+
result.append({'status': 'enabled'})
771740

772741
result.append({
773742
'device': [
@@ -791,11 +760,7 @@ def secondary_network(self):
791760
The default secondary network configuration
792761
"""
793762
return {
794-
'key_mgmt': [
795-
{
796-
'name': 'NONE',
797-
},
798-
],
763+
'key_mgmt': [{'name': 'NONE'}],
799764
'priority': 2,
800765
'status': 'disabled',
801766
}

0 commit comments

Comments
 (0)