Merge lp:~raharper/curtin/fix-no-dns-search into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

Implement dns-search key in network config.

[Blake Rouse (blake-rouse)]

Looks good to me.

review: Approve

[Scott Moser (smoser)]

<smoser> i think isinstance(paths, list)
<smoser> woudl be preferable to type(paths) == list

i approve, fix type== to isinstance
then merge it.

review: Approve

[lp:~raharper/curtin/fix-no-dns-search]

274. By Ryan Harper on 2015-09-18

Prefer isinstance() over type().

=== modified file 'curtin/net/__init__.py'
--- curtin/net/__init__.py	2015-09-04 18:36:31 +0000
+++ curtin/net/__init__.py	2015-09-18 18:13:09 +0000
@@ -267,11 +267,15 @@
         'pointopoint',
         'mtu',
         'scope',
+        'dns_search',
+        'dns_nameservers',
     ]
     for key, value in subnet.items():
         if value and key in valid_map:
             if type(value) == list:
                 value = " ".join(value)
+            if '_' in key:
+                key = key.replace('_', '-')
             content += "    {} {}\n".format(key, value)
 
     return content
@@ -362,8 +366,9 @@
             content += iface_add_attrs(iface)
             content += "\n"
 
-    for (addr, dns) in network_state.get('nameservers').items():
-        content += "{}\n".format(dns)
+    for dnskey, value in network_state.get('dns', {}).items():
+        if len(value):
+            content += "dns-{} {}\n".format(dnskey, " ".join(value))
 
     for route in network_state.get('routes'):
         content += render_route(route)

=== modified file 'curtin/net/network_state.py'
--- curtin/net/network_state.py	2015-09-04 18:58:41 +0000
+++ curtin/net/network_state.py	2015-09-18 18:13:09 +0000
@@ -40,7 +40,10 @@
         self.network_state = {
             'interfaces': {},
             'routes': [],
-            'nameservers': {},
+            'dns': {
+                'nameservers': [],
+                'search': [],
+            }
         }
         self.command_handlers = self.get_command_handlers()
 
@@ -286,10 +289,19 @@
             print(self.dump_network_state())
             return
 
-        nameservers = self.network_state.get('nameservers')
+        dns = self.network_state.get('dns')
         if 'address' in command:
-            nameservers[command['address']] = \
-                "dns-nameserver {address}".format(**command)
+            addrs = command['address']
+            if not type(addrs) == list:
+                addrs = [addrs]
+            for addr in addrs:
+                dns['nameservers'].append(addr)
+        if 'search' in command:
+            paths = command['search']
+            if not isinstance(paths, list):
+                paths = [paths]
+            for path in paths:
+                dns['search'].append(path)
 
     def handle_route(self, command):
         required_keys = [

=== modified file 'examples/network-all.yaml'
--- examples/network-all.yaml	2015-09-02 13:55:39 +0000
+++ examples/network-all.yaml	2015-09-18 18:13:09 +0000
@@ -34,6 +34,11 @@
               gateway: 192.168.0.1
               dns_nameservers:
                 - 192.168.0.10
+                - 10.23.23.134
+              dns_search:
+                - barley.maas
+                - sacchromyces.maas
+                - brettanomyces.maas
             - type: static
               address: 192.168.2.10/24
         # Bond.
@@ -84,6 +89,15 @@
         # A global nameserver.
         - type: nameserver
           address: 8.8.8.8
+          search: barley.maas
+        # global nameservers and search in list form
+        - type: nameserver
+          address:
+            - 4.4.4.4
+            - 8.8.4.4
+          search:
+            - wark.maas
+            - foobar.maas
         # A global route.
         - type: route
           destination: 10.0.0.0/8

=== modified file 'examples/tests/basic_network.yaml'
--- examples/tests/basic_network.yaml	2015-09-02 13:55:39 +0000
+++ examples/tests/basic_network.yaml	2015-09-18 18:13:09 +0000
@@ -17,6 +17,10 @@
                 gateway: 10.0.2.1
               - type: static
                 address: 10.0.2.200/24
+                dns_nameservers:
+                  - 8.8.8.8
+                dns_search:
+                  - barley.maas
         - type: physical
           name: eth2
           mac_address: "52:54:00:12:34:04"

=== modified file 'tests/unittests/test_net.py'
--- tests/unittests/test_net.py	2015-09-04 18:58:41 +0000
+++ tests/unittests/test_net.py	2015-09-18 18:13:09 +0000
@@ -259,10 +259,23 @@
           mac_address: "c0:d6:9f:2c:e8:80"
           subnets:
               - type: dhcp4
+              - type: static
+                address: 192.168.21.3/24
+                dns_nameservers:
+                  - 8.8.8.8
+                  - 8.8.4.4
+                dns_search: barley.maas sach.maas
         - type: physical
           name: eth1
           mac_address: "cf:d6:af:48:e8:80"
+        - type: nameserver
+          address:
+            - 1.2.3.4
+            - 5.6.7.8
+          search:
+            - wark.maas
 '''
+
         with open(self.config_f, 'w') as fp:
             fp.write(self.config)
 
@@ -308,8 +321,16 @@
     def test_render_interfaces(self):
         ns = self.get_net_state()
         ifaces = ('auto eth0\n' + 'iface eth0 inet dhcp\n\n' +
-                  'auto eth1\n' + 'iface eth1 inet manual\n\n')
+                  'auto eth0:1\n' +
+                  'iface eth0:1 inet static\n' +
+                  '    address 192.168.21.3/24\n' +
+                  '    dns-nameservers 8.8.8.8 8.8.4.4\n' +
+                  '    dns-search barley.maas sach.maas\n\n' +
+                  'auto eth1\n' + 'iface eth1 inet manual\n\n' +
+                  'dns-nameservers 1.2.3.4 5.6.7.8\n' +
+                  'dns-search wark.maas\n')
         net_ifaces = net.render_interfaces(ns.network_state)
+        print(ns.network_state.get('interfaces'))
         self.assertEqual(sorted(ifaces.split('\n')),
                          sorted(net_ifaces.split('\n')))
 

=== modified file 'tests/vmtests/__init__.py'
--- tests/vmtests/__init__.py	2015-09-10 13:02:40 +0000
+++ tests/vmtests/__init__.py	2015-09-18 18:13:09 +0000
@@ -283,6 +283,13 @@
     def get_expected_etc_network_interfaces(self):
         return curtin_net.render_interfaces(self.network_state)
 
+    @classmethod
+    def get_expected_etc_resolvconf(self):
+        ifaces = {}
+        eni = curtin_net.render_interfaces(self.network_state)
+        curtin_net.parse_deb_config_data(ifaces, eni, None)
+        return ifaces
+
     # Misc functions that are useful for many tests
     def output_files_exist(self, files):
         for f in files:

=== modified file 'tests/vmtests/test_network.py'
--- tests/vmtests/test_network.py	2015-09-09 19:07:27 +0000
+++ tests/vmtests/test_network.py	2015-09-18 18:13:09 +0000
@@ -64,6 +64,7 @@
         runcmd:
           - ifconfig -a > /media/output/ifconfig_a
           - cp -av /etc/network/interfaces /media/output
+          - cp /etc/resolv.conf /media/output
           - cp -av /etc/udev/rules.d/70-persistent-net.rules /media/output
           - ip -o route show > /media/output/ip_route_show
           - route -n > /media/output/route_n
@@ -74,6 +75,7 @@
     def test_output_files_exist(self):
         self.output_files_exist(["ifconfig_a",
                                  "interfaces",
+                                 "resolv.conf",
                                  "70-persistent-net.rules",
                                  "ip_route_show",
                                  "route_n"])
@@ -88,6 +90,45 @@
         for line in expected_eni.split('\n'):
             self.assertTrue(line in eni_lines)
 
+    def test_etc_resolvconf(self):
+        with open(os.path.join(self.td.mnt, "resolv.conf")) as fp:
+            resolvconf = fp.read()
+            logger.debug('etc/resolv.conf:\n{}'.format(resolvconf))
+
+        resolv_lines = resolvconf.split('\n')
+        logger.debug('resolv.conf lines:\n{}'.format(resolv_lines))
+        # resolv.conf
+        '''
+        nameserver X.Y.Z.A
+        nameserver 1.2.3.4
+        search foo.bar
+        '''
+
+        # eni
+        ''''
+        auto eth1:1
+        iface eth1:1 inet static
+            dns-nameserver X.Y.Z.A
+            dns-search foo.bar
+        '''
+
+        # iface dict
+        ''''
+        eth1:1:
+          dns:
+            nameserver: X.Y.Z.A
+            search: foo.bar
+        '''
+        expected_ifaces = self.get_expected_etc_resolvconf()
+        logger.debug('parsed eni ifaces:\n{}'.format(expected_ifaces))
+        for ifname in expected_ifaces.keys():
+            iface = expected_ifaces.get(ifname)
+            for k, v in iface.get('dns', {}).items():
+                dns_line = '{} {}'.format(
+                    k.replace('nameservers', 'nameserver'), " ".join(v))
+                logger.debug('dns_line:{}'.format(dns_line))
+                self.assertTrue(dns_line in resolv_lines)
+
     def test_ifconfig_output(self):
         '''check ifconfig output with test input'''
         network_state = self.get_network_state()