[airos] moved stp status function to interface module

Author: edoput

netjsonconfig/backends/airos/converters.py

@@ -4,7 +4,7 @@
 from ...utils import get_copy
 from ..base.converter import BaseConverter
 from .aaa import bridge_devname, profile_from_interface, status_from_interface
-from .interface import autonegotiation, bridge, bssid, flowcontrol, hidden_ssid, protocol, radio, split_cidr, ssid, stp, wireless
+from .interface import autonegotiation, bridge, bssid, flowcontrol, hidden_ssid, protocol, radio, split_cidr, ssid, stp, vlan, wireless
 from .radius import radius_from_interface
 from .schema import default_ntp_servers
 from .radio import radio_device_base, radio_configuration
@@ -80,11 +80,6 @@ def to_intermediate(self):
 class Bridge(AirOsConverter):
     netjson_key = 'interfaces'
 
-    def stp_status(self, interface):
-        if interface.get('stp', False):
-            return 'enabled'
-        else:
-            return 'disabled'
 
     def to_intermediate(self):
         result = []
@@ -104,7 +99,7 @@ def to_intermediate(self):
                 'devname': interface['name'],
                 'port': bridge_ports,
                 'status': status(interface),
-                'stp': {'status': self.stp_status(interface)}
+                'stp': {'status': stp(interface)}
             })
 
         result.append(bridges)

netjsonconfig/backends/airos/interface.py

@@ -96,6 +96,16 @@ def ssid(interface):
     return interface['wireless']['ssid']
 
 
+def stp(interface):
+    """
+    Return wether the spanning tree protocol is enabled
+    """
+    if interface.get('stp', False):
+        return 'enabled'
+    else:
+        return 'disabled'
+
+
 def vlan(interfaces):
     """
     Return the vlan interfaces from the interfaces list