[airos] moved autonegotiation and flowcontrol method 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 bridge, bssid, hidden_ssid, protocol, radio, split_cidr, ssid, wireless
+from .interface import autonegotiation, bridge, bssid, flowcontrol, hidden_ssid, protocol, radio, split_cidr, ssid, wireless
 from .radius import radius_from_interface
 from .schema import default_ntp_servers
 from .radio import radio_device_base, radio_configuration
@@ -260,26 +260,6 @@ def type_to_role(self, typestr):
         }
         return roles.get(typestr, '')
 
-    def autoneg_status(self, interface):
-        if interface.get('autoneg'):
-            return 'enabled'
-        else:
-            return 'disabled'
-
-    def flowcontrol_status(self, interface):
-        if interface.get('flowcontrol'):
-            status = 'enabled'
-        else:
-            status = 'disabled'
-        return {
-            'rx': {
-                'status': status,
-            },
-            'tx': {
-                'status': status,
-            },
-        }
-
     def to_intermediate(self):
         result = []
         interfaces = []
@@ -294,9 +274,9 @@ def to_intermediate(self):
             }
             # handle interface type quirks
             if interface['type'] == 'ethernet' and '.' not in interface['name']:
-                base['autoneg'] = self.autoneg_status(interface)
+                base['autoneg'] = autonegotiation(interface)
 
-                base['flowcontrol'] = self.flowcontrol_status(interface)
+                base['flowcontrol'] = flowcontrol(interface)
 
             if interface['type'] == 'wireless':
                 base['devname'] = radio(interface)

netjsonconfig/backends/airos/interface.py

@@ -1,6 +1,16 @@
 from ipaddress import ip_interface
 
 
+def autonegotiation(interface):
+    """
+    Return the configuration for ``autoneg`` on interface
+    """
+    if interface.get('autoneg'):
+        return 'enabled'
+    else:
+        return 'disabled'
+
+
 def bridge(interfaces):
     """
     Return the bridge interfaces from the interfaces list
@@ -15,6 +25,24 @@ def bssid(interface):
     return interface['wireless'].get('bssid', '')
 
 
+def flowcontrol(interface):
+    """
+    Return the configuration for ``flowcontrol`` on interface
+    """
+    if interface.get('flowcontrol'):
+        status = 'enabled'
+    else:
+        status = 'disabled'
+    return {
+        'rx': {
+            'status': status,
+        },
+        'tx': {
+            'status': status,
+        },
+    }
+
+
 def hidden_ssid(interface):
     """
     Return wether the ssid is hidden