[openwrt] Complete ddns converter

Signed-off-by: Konrad Kreitmair <kkreitmair@tdt.de>

Author: kkreitmair

netjsonconfig/backends/openwrt/converters/ddns.py

@@ -16,6 +16,7 @@ def to_intermediate_loop(self, block, result, index=None):
             block.update({'.type': 'ddns', '.name': block.pop('id', 'global')})
             result.setdefault('ddns', [])
             result['ddns'] = [self.sorted_dict(block)] + provider_list
+
         return result
 
     def __intermediate_providers(self, providers):
@@ -24,20 +25,32 @@ def __intermediate_providers(self, providers):
         UCI intermediate data structure
         """
         result = []
+
         for provider in providers:
             uci_name = self._get_uci_name(provider['lookup_host'])
             resultdict = OrderedDict((('.name', uci_name), ('.type', 'service')))
             resultdict.update(provider)
             result.append(resultdict)
+
         return result
 
     def to_netjson_loop(self, block, result, index):
-        result['ddns'] = self.__netjson_ddns(block)
+        result.setdefault(self.netjson_key, {})
+
+        if block['.type'] == 'service':
+            result[self.netjson_key].setdefault('providers', [])
+            result[self.netjson_key]['providers'].append(self.__netjson_ddns(block))
+        else:
+            result['ddns'] = self.__netjson_ddns(block)
+
         return result
 
     def __netjson_ddns(self, ddns):
-        del ddns['.type']
-        _name = ddns.pop('.name')
-        if _name != 'ddns':
-            ddns['id'] = _name
+        _type = ddns.pop('.type')
+        del ddns['.name']
+
+        if _type == 'service':
+            ddns_schema = self._schema.get('properties').get('providers').get('items')
+            return self.type_cast(ddns, schema=ddns_schema)
+
         return self.type_cast(ddns)