[openwrt] Fixed invalid UCI name bug in default renderer

Author: nemesifier

netjsonconfig/backends/openwrt/converters/default.py

@@ -39,7 +39,12 @@ def to_intermediate(self):
                           '{0}\n\n'.format(json_block))
                     continue
                 block['.type'] = block.pop('config_name')
-                block['.name'] = block.pop('config_value', '{0}_{1}'.format(block['.type'], i))
+                block['.name'] = block.pop('config_value',
+                                           # default value in case the
+                                           # UCI name is not defined
+                                           '{0}_{1}'.format(block['.type'], i))
+                # ensure UCI name is valid
+                block['.name'] = self._get_uci_name(block['.name'])
                 block_list.append(sorted_dict(block))
                 i += 1
             if block_list:

tests/openwrt/test_default.py

@@ -238,3 +238,28 @@ def test_merge(self):
     def test_skip_nonlists(self):
         o = OpenWrt({"custom_package": {'unknown': True}})
         self.assertEqual(o.render(), '')
+
+    def test_render_invalid_uci_name(self):
+        o = OpenWrt({
+            "olsrd2": [
+                {
+                    "lan": "10.150.25.0/24 domain=0",
+                    "config_value": "lan-hna",
+                    "config_name": "olsrv2"
+                },
+                {
+                    "lan": "0.0.0.0/24 domain=1",
+                    "config_value": "internet-hna",
+                    "config_name": "olsrv2"
+                }
+            ],
+        })
+        expected = self._tabs("""package olsrd2
+
+config olsrv2 'lan_hna'
+    option lan '10.150.25.0/24 domain=0'
+
+config olsrv2 'internet_hna'
+    option lan '0.0.0.0/24 domain=1'
+""")
+        self.assertEqual(o.render(), expected)