[airos] make flake happier

Author: edoput

netjsonconfig/backends/airos/radius.py

@@ -1,5 +1,6 @@
 from .interface import encryption, mode, protocol
 
+
 def ap_authentication(interface):
     """
     Returns the ``radius.auth`` dict for ``access_point`` interface
@@ -15,7 +16,7 @@ def ap_authentication(interface):
         result.update({
             'ip': enc.get('server', ''),
             'port': enc.get('port', 1812),
-            'secret': enc.get('key',''),
+            'secret': enc.get('key', ''),
             'status': 'enabled',
         })
     return result
@@ -42,7 +43,6 @@ def authentication(interface):
     result = {
         'port': 1812,
     }
-    mod = mode(interface)
     result.update(_authentication_from_mode[mode(interface)](interface))
     return result
 
@@ -61,6 +61,7 @@ def ap_accounting(interface):
         })
     return result
 
+
 def sta_accounting(interface):
     """
     Returns the ``acct`` dict for ``station`` interfaces
@@ -86,7 +87,6 @@ def accounting(interface):
     return result
 
 
-
 def radius_from_interface(interface):
     """
     Return the ``radius`` configuration for

tests/airos/test_aaa.py

@@ -1,7 +1,7 @@
 from .mock import AaaAirOs, ConverterTest
 
 
-class TestAaaConverter(ConverterTest):
+class TestAaaConverterAccess(ConverterTest):
 
     backend = AaaAirOs
 
@@ -92,6 +92,64 @@ def test_ap_psk_authentication(self):
         ]
         self.assertEqualConfig(o.intermediate_data['aaa'], expected)
 
+    def test_ap_eap_authentication(self):
+        o = self.backend({
+            "interfaces": [
+                {
+                    "type": "wireless",
+                    "name": "wlan0",
+                    "wireless": {
+                        "mode": "access_point",
+                        "radio": "ath0",
+                        "ssid": "i-like-pasta",
+                        "encryption": {
+                            "protocol": "wpa2_enterprise",
+                            "key": "secret-radius-key",
+                            "server": "192.168.1.1",
+                            "acct_server": "192.168.1.2",
+                        },
+                    },
+                },
+                {
+                    "type": "bridge",
+                    "name": "br0",
+                    "bridge_members": [
+                        "wlan0",
+                    ],
+                },
+            ],
+        })
+        o.to_intermediate()
+        expected = [
+            {
+                'status': 'enabled',
+            },
+            {
+                '1.br.devname': 'br0',  # only in bridge mode?
+                '1.devname': 'ath0',
+                '1.driver': 'madwifi',
+                '1.radius.acct.1.port': 1813,
+                '1.radius.acct.1.status': 'enabled',
+                '1.radius.acct.1.ip': '192.168.1.2',
+                '1.radius.auth.1.ip': '192.168.1.1',
+                '1.radius.auth.1.port': 1812,
+                '1.radius.auth.1.secret': 'secret-radius-key',
+                '1.radius.auth.1.status': 'enabled',
+                '1.radius.macacl.status': 'disabled',
+                '1.ssid': 'i-like-pasta',
+                '1.status': 'enabled',
+                '1.wpa.1.pairwise': 'CCMP',
+                '1.wpa.key.1.mgmt': 'WPA-EAP',
+                '1.wpa.mode': 2,
+            }
+        ]
+        self.assertEqualConfig(o.intermediate_data['aaa'], expected)
+
+
+class TestAaaConverterStation(ConverterTest):
+
+    backend = AaaAirOs
+
     def test_sta_no_authentication(self):
         o = self.backend({
             "interfaces": [
@@ -171,3 +229,44 @@ def test_sta_psk_authentication(self):
             },
         ]
         self.assertEqualConfig(o.intermediate_data['aaa'], expected)
+
+    def test_sta_eap_authentication(self):
+        o = self.backend({
+            "interfaces": [
+                {
+                    "type": "wireless",
+                    "name": "wlan0",
+                    "wireless": {
+                        "mode": "station",
+                        "radio": "ath0",
+                        "ssid": "i-like-pasta",
+                        "bssid": "00:11:22:33:44:55",
+                        "encryption": {
+                            "protocol": "wpa2_enterprise",
+                            "identity": "some-fake-identity",
+                            "password": "password1234",
+                        },
+                    },
+                },
+                {
+                    "type": "bridge",
+                    "name": "br0",
+                    "bridge_members": [
+                        "wlan0",
+                    ],
+                },
+            ],
+        })
+        o.to_intermediate()
+        expected = [
+            {
+                'status': 'disabled',
+            },
+            {
+                '1.radius.acct.1.port': 1813,
+                '1.radius.acct.1.status': 'disabled',
+                '1.radius.auth.1.port': 1812,
+                '1.status': 'disabled',
+            },
+        ]
+        self.assertEqualConfig(o.intermediate_data['aaa'], expected)