[airos] always run converter from netjson to native configuration

Author: edoput

netjsonconfig/backends/airos/converters.py

@@ -13,7 +13,18 @@ def status(config, key='disabled'):
         return 'enabled'
 
 
-class Aaa(BaseConverter):
+class AirOSConverter(BaseConverter):
+    """
+    Always run the converter from NetJSON
+    to native
+    """
+
+    @classmethod
+    def should_run_forward(cls, config):
+        return True
+
+
+class Aaa(AirOSConverter):
     netjson_key = 'general'
 
     def wpa2_personal(self):
@@ -70,7 +81,7 @@ def to_intermediate(self):
         return (('aaa', result),)
 
 
-class Bridge(BaseConverter):
+class Bridge(AirOSConverter):
     netjson_key = 'interfaces'
 
     def to_intermediate(self):
@@ -107,7 +118,7 @@ def to_intermediate(self):
         return (('bridge', result),)
 
 
-class Discovery(BaseConverter):
+class Discovery(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -122,7 +133,7 @@ def to_intermediate(self):
         return (('discovery', result),)
 
 
-class Dyndns(BaseConverter):
+class Dyndns(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -139,7 +150,7 @@ def to_intermediate(self):
         return (('dyndns', result),)
 
 
-class Ebtables(BaseConverter):
+class Ebtables(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -158,7 +169,7 @@ def to_intermediate(self):
         return (('httpd', result),)
 
 
-class Gui(BaseConverter):
+class Gui(AirOSConverter):
     netjson_key = 'gui'
 
     def to_intermediate(self):
@@ -177,7 +188,7 @@ def to_intermediate(self):
         return (('gui', result),)
 
 
-class Httpd(BaseConverter):
+class Httpd(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -200,7 +211,7 @@ def to_intermediate(self):
         return (('httpd', result),)
 
 
-class Igmpproxy(BaseConverter):
+class Igmpproxy(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -213,7 +224,7 @@ def to_intermediate(self):
         return (('igmpproxy', result),)
 
 
-class Iptables(BaseConverter):
+class Iptables(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -232,7 +243,7 @@ def to_intermediate(self):
         return (('iptables', result),)
 
 
-class Netconf(BaseConverter):
+class Netconf(AirOSConverter):
     netjson_key = 'interfaces'
 
     def type_to_role(self, typestr):
@@ -307,7 +318,7 @@ def to_intermediate(self):
         return (('netconf', result),)
 
 
-class Netmode(BaseConverter):
+class Netmode(AirOSConverter):
     netjson_key = 'interfaces'
 
     def to_intermediate(self):
@@ -319,7 +330,7 @@ def to_intermediate(self):
         return (('netmode', result), )
 
 
-class Ntpclient(BaseConverter):
+class Ntpclient(AirOSConverter):
     netjson_key = 'ntp_servers'
 
     def to_intermediate(self):
@@ -347,7 +358,7 @@ def to_intermediate(self):
         return (('ntpclient', result),)
 
 
-class Pwdog(BaseConverter):
+class Pwdog(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -389,7 +400,7 @@ def to_intermediate(self):
         return (('radio', result),)
 
 
-class Resolv(BaseConverter):
+class Resolv(AirOSConverter):
     netjson_key = 'dns_servers'
 
     def host(self):
@@ -428,7 +439,7 @@ def to_intermediate(self):
         return (('resolv', result),)
 
 
-class Route(BaseConverter):
+class Route(AirOSConverter):
     netjson_key = 'routes'
 
     def to_intermediate(self):
@@ -454,7 +465,7 @@ def to_intermediate(self):
         return (('route', result),)
 
 
-class Snmp(BaseConverter):
+class Snmp(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -470,7 +481,7 @@ def to_intermediate(self):
         return (('snmp', result),)
 
 
-class Sshd(BaseConverter):
+class Sshd(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -486,7 +497,7 @@ def to_intermediate(self):
         return (('sshd', result),)
 
 
-class Syslog(BaseConverter):
+class Syslog(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -498,7 +509,7 @@ def to_intermediate(self):
         return (('syslog', result),)
 
 
-class System(BaseConverter):
+class System(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -524,7 +535,7 @@ def to_intermediate(self):
         return (('system', result),)
 
 
-class Telnetd(BaseConverter):
+class Telnetd(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -537,23 +548,23 @@ def to_intermediate(self):
         return (('telnetd', result),)
 
 
-class Tshaper(BaseConverter):
+class Tshaper(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
 
         return (('tshaper', [{'status': 'disabled', }]),)
 
 
-class Unms(BaseConverter):
+class Unms(AirOSConverter):
     netjson_keu = 'general'
 
     def to_intermediate(self):
 
         return (('unms', [{'status': 'disabled'}]),)
 
 
-class Update(BaseConverter):
+class Update(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -567,7 +578,7 @@ def to_intermediate(self):
         return (('update', result),)
 
 
-class Users(BaseConverter):
+class Users(AirOSConverter):
     netjson_key = 'general'
 
     def to_intermediate(self):
@@ -588,7 +599,7 @@ def to_intermediate(self):
         return (('users', result),)
 
 
-class Vlan(BaseConverter):
+class Vlan(AirOSConverter):
     netjson_key = 'interfaces'
 
     def to_intermediate(self):
@@ -614,7 +625,7 @@ def to_intermediate(self):
         return (('vlan', result),)
 
 
-class Wireless(BaseConverter):
+class Wireless(AirOSConverter):
     netjson_key = 'interfaces'
 
     def to_intermediate(self):
@@ -664,7 +675,7 @@ def to_intermediate(self):
         return (('wireless', result),)
 
 
-class Wpasupplicant(BaseConverter):
+class Wpasupplicant(AirOSConverter):
     netjson_key = 'interfaces'
 
     def _station_intermediate(self, original):