[airos] updated ebtable module for router and wpa2_personal

Author: edoput

netjsonconfig/backends/airos/converters.py

@@ -168,7 +168,9 @@ def bridge_intermediate(self):
         return ebtables_from_interface(self.wireless[0])
 
     def router_intermediate(self):
-        return [{}]
+        result = ebtables_from_interface(self.wireless[0])
+        del result['sys']['fw']
+        return result
 
     def to_intermediate(self):
         result = getattr(self, '{netmode}_intermediate'.format(netmode=self.netmode))()

netjsonconfig/backends/airos/ebtables.py

@@ -1,6 +1,15 @@
-from .interface import mode, protocol, radio
 import copy
 
+from .interface import mode, protocol, radio
+
+
+_base = {
+    'sys': {
+        'fw': {'status': 'disabled'},
+        'status': 'enabled',
+    },
+}
+
 
 def default(interace):
     return {}
@@ -12,23 +21,18 @@ def station(interface):
     for an interface in ``station`` mode with ``wpa2_enterpise``
     or ``wpa2_personal`` authentication
     """
-    return {
+    base = copy.deepcopy(_base)
+    base['sys'].update({
         'eap': [
             {
                 'devname': radio(interface),
                 'status': 'enabled',
             }
         ],
         'eap.status': 'enabled',
-    }
-
+    })
+    return base
 
-_base = {
-    'sys': {
-        'fw': {'status': 'disabled'},
-        'status': 'enabled',
-    },
-}
 
 _status = {
     'status': 'enabled',
@@ -38,7 +42,7 @@ def station(interface):
 _mapping = {
     'access_point': {
         'none': default,
-        'wpa2_personal': default,
+        'wpa2_personal': station,
         'wpa2_enterprise': default,
     },
     'station': {
@@ -50,7 +54,6 @@ def station(interface):
 
 
 def ebtables_from_interface(interface):
-    base = copy.deepcopy(_base)
     status = _status.copy()
-    base['sys'].update(_mapping[mode(interface)][protocol(interface)](interface))
+    base = _mapping[mode(interface)][protocol(interface)](interface)
     return [status, base]