[airos] used wireless property in converter where needed

Author: edoput

netjsonconfig/backends/airos/converters.py

@@ -615,13 +615,17 @@ def to_intermediate(self):
 class Wireless(AirOsConverter):
     netjson_key = 'interfaces'
 
+    @property
+    def wireless(self):
+        """
+        Return all the wireless interfaces
+        """
+        return wireless(get_copy(self.netjson, 'interfaces', []))
+
     def to_intermediate(self):
         result = []
-        original = [
-            i for i in get_copy(self.netjson, self.netjson_key, []) if i['type'] == 'wireless'
-        ]
         wireless_list = []
-        for w in original:
+        for w in self.wireless:
             wireless_list.append({
                 'addmtikie': 'enabled',
                 'devname': radio(w),
@@ -655,6 +659,13 @@ def to_intermediate(self):
 class Wpasupplicant(AirOsConverter):
     netjson_key = 'interfaces'
 
+    @property
+    def wireless(self):
+        """
+        Return all the wireless interfaces
+        """
+        return wireless(get_copy(self.netjson, 'interfaces', []))
+
     def _station_intermediate(self, original):
         station_auth_protocols = available_mode_authentication['station']
         temp_dev = {
@@ -733,11 +744,10 @@ def secondary_network(self):
         }
 
     def to_intermediate(self):
-        original = [
-            i for i in get_copy(self.netjson, self.netjson_key, []) if i['type'] == 'wireless'
-        ]
-        if original:
-            head = original[0]
+        try:
+            head = self.wireless[0]
             # call either ``_station_intermediate`` or ``_access_point_intermediate``
             # and return the result
-            return getattr(self, '_%s_intermediate' % head['wireless']['mode'])(original)
+            return getattr(self, '_%s_intermediate' % head['wireless']['mode'])(self.wireless)
+        except IndexError:
+            raise Warning('Zero wireless interface found')