[openwrt] Added 'config_value' identifier in utils.merge_list

openwisp · Jan 24, 2017 · fcae96c · fcae96c
1 parent 6f712d1
commit fcae96c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/netjsonconfig/utils.py b/netjsonconfig/utils.py
@@ -33,7 +33,7 @@ def merge_config(template, config):
     return result
 
 
-def merge_list(list1, list2, identifiers=['name', 'id']):
+def merge_list(list1, list2, identifiers=['name', 'config_value', 'id']):
     """
     Merges ``list2`` on top of ``list1``.
 

diff --git a/tests/openwrt/test_default.py b/tests/openwrt/test_default.py
@@ -109,3 +109,39 @@ def test_warning(self):
             ]
         })
         self.assertEqual(o.render(), 'package luci\n')
+
+    def test_merge(self):
+        template = {
+            "luci": [
+                {
+                    "config_name": "core",
+                    "config_value": "main",
+                    "number": 3,
+                    "list": ["eth0"],
+                    "some_value": True
+                }
+            ]
+        }
+        config = {
+            "luci": [
+                {
+                    "config_name": "core",
+                    "config_value": "main",
+                    "number": 4,
+                    "list": ["wlan0"]
+                }
+            ]
+        }
+        expected = {
+            "luci": [
+                {
+                    "config_name": "core",
+                    "config_value": "main",
+                    "number": 4,
+                    "list": ["eth0", "wlan0"],
+                    "some_value": True
+                }
+            ]
+        }
+        o = OpenWrt(config, templates=[template])
+        self.assertEqual(o.config, expected)
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -186,3 +186,9 @@ def test_merge_list_union_and_override(self):
             {"id": "test1", "a": "0", "b": "b"},
             {"id": "test2", "c": "c"}
         ])
+
+    def test_merge_list_config_value(self):
+        template = [{"config_value": "test1", "tx": 1}]
+        config = [{"config_value": "test1", "tx": 2}]
+        result = merge_list(template, config)
+        self.assertEqual(result, config)