[OpenWrt] Allow to override general dns and dns_search settings

netjsonconfig/backends/openwrt/renderers.py

@@ -77,8 +77,8 @@ def _get_interfaces(self):
                     'name': name,
                     'ifname': interface['name'],
                     'proto': proto,
-                    'dns': self.__get_dns_servers(),
-                    'dns_search': self.__get_dns_search()
+                    'dns': self.__get_dns_servers(uci_interface),
+                    'dns_search': self.__get_dns_search(uci_interface)
                 })
                 # bridging
                 if is_bridge:
@@ -126,6 +126,7 @@ def __get_proto(self, interface, address):
         else:
             # allow override
             return interface['proto']
+
     def _get_routes(self):
         routes = self.config.get('routes', [])
         # results container
@@ -175,12 +176,20 @@ def _get_ip_rules(self):
             uci_rules.append(sorted_dict(uci_rule))
         return uci_rules
 
-    def __get_dns_servers(self):
+    def __get_dns_servers(self, uci):
+        # allow override
+        if 'dns' in uci:
+            return uci['dns']
+        # general setting
         dns = self.config.get('dns_servers', None)
         if dns:
             return ' '.join(dns)
 
-    def __get_dns_search(self):
+    def __get_dns_search(self, uci):
+        # allow override
+        if 'dns_search' in uci:
+            return uci['dns_search']
+        # general setting
         dns_search = self.config.get('dns_search', None)
         if dns_search:
             return ' '.join(dns_search)

tests/openwrt/test_network.py

@@ -948,3 +948,44 @@ def test_address_list_option(self):
 """)
         self.assertEqual(o.render(), expected)
 
+    def test_dns_override(self):
+        o = OpenWrt({
+            "interfaces": [
+                {
+                    "name": "eth0",
+                    "type": "ethernet",
+                    "dns": ["8.8.8.8", "8.8.4.4"]
+                }
+            ],
+            "dns_servers": ["192.168.3.1", "192.168.3.2"]
+        })
+        expected = self._tabs("""package network
+
+config interface 'eth0'
+    list dns '8.8.8.8'
+    list dns '8.8.4.4'
+    option ifname 'eth0'
+    option proto 'none'
+""")
+        self.assertEqual(o.render(), expected)
+
+    def test_dns_search_override(self):
+        o = OpenWrt({
+            "interfaces": [
+                {
+                    "name": "eth0",
+                    "type": "ethernet",
+                    "dns_search": ["openwisp.org", "netjson.org"]
+                }
+            ],
+            "dns_search": ["domain.com"]
+        })
+        expected = self._tabs("""package network
+
+config interface 'eth0'
+    list dns_search 'openwisp.org'
+    list dns_search 'netjson.org'
+    option ifname 'eth0'
+    option proto 'none'
+""")
+        self.assertEqual(o.render(), expected)