make flake happier

Author: edoput

netjsonconfig/backends/airos/airos.py

@@ -1,12 +1,14 @@
-import re
-
 from six import string_types
 
-from .converters import *
+from .converters import Aaa, Bridge, Discovery, Dyndns, Ebtables, Gui, \
+        Httpd, Igmpproxy, Iptables, Netconf, Netmode, Ntpclient, \
+        Pwdog, Radio, Resolv, Route, Snmp, Sshd, Syslog, System, \
+        Telnetd, Update, Users, Vlan, Wireless, Wpasupplicant
 from .renderers import AirOS
 from ..base.backend import BaseBackend
 from .schema import schema
 
+
 class AirOS(BaseBackend):
     """
     AirOS backend
@@ -55,7 +57,8 @@ class AirOS(BaseBackend):
     def to_intermediate(self):
         super(AirOS, self).to_intermediate()
         for k, v in self.intermediate_data.items():
-            self.intermediate_data[k] = [ x for x in flatten(intermediate_to_list(v)) if x != {}]
+            self.intermediate_data[k] = [x for x in flatten(intermediate_to_list(v)) if x != {}]
+
 
 def flatten(xs):
     """
@@ -64,7 +67,8 @@ def flatten(xs):
     if xs is not list:
         return xs
     else:
-        return reduce(lambda x,y: x + flatten(y), xs, [])
+        return reduce(lambda x, y: x + flatten(y), xs, [])
+
 
 def intermediate_to_list(configuration):
     """
@@ -153,7 +157,7 @@ def intermediate_to_list(configuration):
                             nested_key = '{key}.{subkey}'.format(key=k, subkey=sk)
                             temp[nested_key] = sv
 
-            # now it is atomic, append it to 
+            # now it is atomic, append it to
             result.append(temp)
 
         else:

netjsonconfig/backends/airos/converters.py

@@ -804,3 +804,6 @@ def to_intermediate(self):
             # call either ``_station_intermediate`` or ``_access_point_intermediate``
             # and return the result
             return getattr(self, '_%s_intermediate' % head['wireless']['mode'])(original)
+
+
+__all__ = []

netjsonconfig/backends/airos/schema.py

@@ -5,6 +5,14 @@
 from ...schema import DEFAULT_FILE_MODE  # noqa - backward compatibility
 from ...utils import merge_config
 
+
+def merge_list(schema_list):
+    schema = default_schema
+    for s in schema_list:
+        schema = merge_config(schema, s)
+    return schema
+
+
 """
 This defines a new property in the ``Interface``.
 
@@ -30,13 +38,13 @@
         }
     }
 
+
 """
 This schema defines a new property for netjson
 
 As the antenna can be in ``bridge`` or ``router`` mode
 this mode can be selected from this property
 """
-
 netmode_schema = {
         "type": "object",
         "properties": {
@@ -51,6 +59,7 @@
         },
     }
 
+
 """
 This schema override the possible encryption for AirOS from the default schema
 """
@@ -88,9 +97,11 @@
 }
 
 
-schema = merge_config(
+schema = merge_list([
         default_schema,
         netconf_schema,
         netmode_schema,
         wpasupplicant_schema,
-    )
+        ])
+
+__all__ = [schema]

tests/airos/dummy.py

@@ -1,6 +1,9 @@
 from netjsonconfig import AirOS
 
-from netjsonconfig.backends.airos.converters import *
+from netjsoncongig.backends.airos.converters import Aaa, Bridge, Discovery, Dyndns, Ebtables, Gui, \
+        Httpd, Igmpproxy, Iptables, Netconf, Netmode, Ntpclient, \
+        Pwdog, Radio, Resolv, Route, Snmp, Sshd, Syslog, System, \
+        Telnetd, Update, Users, Vlan, Wireless, Wpasupplicant
 
 from unittest import TestCase
 
@@ -66,6 +69,15 @@ class DyndnsAirOS(AirOS):
     ]
 
 
+class EbtablesAirOS(AirOS):
+    """
+    Mock backend with converter for ebtables
+    """
+    converters = [
+            Ebtables,
+    ]
+
+
 class GuiAirOS(AirOS):
     """
     Mock backend with converter for web interface settings
@@ -84,6 +96,24 @@ class HttpdAirOS(AirOS):
     ]
 
 
+class Igmpproxy(AirOS):
+    """
+    Mock backend with converter for igmpproxy
+    """
+    converters = [
+            Igmpproxy,
+    ]
+
+
+class IptablesAirOS(AirOS):
+    """
+    Mock backend with converter for iptables
+    """
+    converters = [
+            Iptables,
+    ]
+
+
 class NetconfAirOS(AirOS):
     """
     Mock backend with converter for network configuration

tests/airos/test_bridge.py

@@ -1,5 +1,3 @@
-from netjsonconfig.backends.airos.converters import *
-
 from .dummy import BridgeAirOS, ConverterTest
 
 

tests/airos/test_discovery.py

@@ -19,5 +19,4 @@ def test_discovery_key(self):
                 },
         ]
 
-
         self.assertEqualConfig(o.intermediate_data['discovery'], expected)

tests/airos/test_netconf.py

@@ -78,7 +78,6 @@ def test_inactive_interface(self):
                 },
         ]
 
-
         self.assertEqualConfig(o.intermediate_data['netconf'], expected)
 
     def test_vlan(self):
@@ -143,7 +142,7 @@ def test_management_vlan(self):
                     'status': 'enabled',
                 },
         ]
-        
+
         self.assertEqualConfig(o.intermediate_data['netconf'], expected)
 
     def test_access_point(self):
@@ -445,7 +444,7 @@ def test_other(self):
                     'status': 'enabled',
                 },
         ]
-    
+
         self.assertEqualConfig(o.intermediate_data['netconf'], expected)
 
     def test_more_interfaces(self):

tests/airos/test_netmode.py

@@ -1,4 +1,3 @@
-from unittest import skip
 from .dummy import NetmodeAirOS, ConverterTest
 
 
@@ -48,5 +47,4 @@ def test_router(self):
                 },
         ]
 
-
         self.assertEqualConfig(o.intermediate_data['netmode'], expected)