[airos] updated ntpclient converter to use ntp schema from openwrt

openwisp · Jul 24, 2017 · fb5284f · fb5284f
1 parent 377985d
commit fb5284f
Showing 1 changed file with 24 additions and 13 deletions.
diff --git a/netjsonconfig/backends/airos/converters.py b/netjsonconfig/backends/airos/converters.py
@@ -349,22 +349,33 @@ def to_intermediate(self):
 
 
 class Ntpclient(AirOsConverter):
-    netjson_key = 'ntp_servers'
+    netjson_key = 'ntp'
+
+    default_servers = [
+        "0.openwrt.pool.ntp.org",
+        "1.openwrt.pool.ntp.org",
+        "2.openwrt.pool.ntp.org",
+        "3.openwrt.pool.ntp.org",
+    ]
+
+    def ntp_status(self, ntp):
+        if ntp.get('enabled', True):
+            return 'enabled'
+        else:
+            return 'disabled'
 
     def to_intermediate(self):
         result = []
-        temp = []
-        original = get_copy(self.netjson, self.netjson_key, [])
-        if original:
-            for ntp in original:
-                temp.append({
-                    'server': ntp,
-                    'status': 'enabled',
-                })
-            result.append(temp)
-            result.append({'status': 'enabled'})
-        else:
-            result.append({'status': 'disabled'})
+        servers = []
+        original = get_copy(self.netjson, self.netjson_key, {})
+        result.append({'status': self.ntp_status(original)})
+
+        for ntp in original.get('servers', self.default_servers):
+            servers.append({
+                'server': ntp,
+                'status': 'enabled',
+            })
+        result.append(servers)
         return (('ntpclient', result),)