[airos] updated converter and wpasupplicant module to support

wpa2_enterprise

Author: edoput

netjsonconfig/backends/airos/converters.py

@@ -710,9 +710,9 @@ def _access_point_intermediate(self, original):
             'profile': 'AUTO',
         }
         wpasupplicant_status = {
+            'none': 'enabled',
             'wpa2_personal': 'disabled',
             'wpa2_enterprise': 'disabled',
-            'none': 'enabled',
         }
         result = []
 
@@ -725,15 +725,18 @@ def _access_point_intermediate(self, original):
             })
             temp_dev['status'] = status
             network = ap_auth_protocols[proto](head)
+            profile = {
+                'name': 'AUTO',
+                'network': [network, self.secondary_network()],
+            }
+
+            if proto == 'wpa2_enterprise':
+                del temp_dev['profile']
+                del profile['name']
 
         result.append({
             'device': [temp_dev],
-            'profile': [
-                {
-                    'name': 'AUTO',
-                    'network': [network, self.secondary_network()],
-                },
-            ],
+            'profile': [profile],
         })
         return (('wpasupplicant', result),)
 

netjsonconfig/backends/airos/wpasupplicant.py

@@ -26,12 +26,12 @@ def ap_wpa2_personal(interface):
     return {
         'psk': encryption(interface)['key'],
         'ssid': ssid(interface),
+        'priority': 100,
         'key_mgmt': [
             {
                 'name': 'NONE',
             },
         ],
-        'priority': 100,
     }
 
 
@@ -43,33 +43,10 @@ def ap_wpa2_enterprise(interface):
     """
     return {
         'ssid': ssid(interface),
-        'phase2=auth': 'MSCHAPV2',
-        'eap': [
-            {
-                'name': 'TTLS',
-                'status': 'enabled',
-            },
-        ],
-        'anonymous_identity': 'TODO',
-        'pairwise': [
-            {
-                'name': 'CCMP',
-            },
-        ],
-        'proto': [
-            {
-                'name': 'RSN',
-            },
-        ],
-        'priority': 100,
-        'key_mgmt': [
-            {
-                'name': 'WPA-EAP',
-            },
-        ],
     }
 
 
+# STATION
 def sta_no_encryption(interface):
     """
     Returns the wpasupplicant.profile.1.network