Merge ~powersj/cloud-init:fix-arch-dns into cloud-init:master

[Joshua Powers]

archlinux: Fix empty dns on writing network config

cloud-init fails when dns-nameservers is None.

LP: #1663045

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:05e4261342dfbb6f5766450ecad4f2a6df929c06
https://jenkins.ubuntu.com/server/job/cloud-init-ci/78/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: CentOS 6 & 7: Build & Test
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/78/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

Heres a bit larger change, but one that seems more generic.
I'd also like to add some tests for 'convert_netctl'.

http://paste.ubuntu.com/25164556/

[Scott Moser (smoser)]

seems better url is
 https://git.archlinux.org/netctl.git/tree/docs/netctl.profile.5.txt
for the docstring

[Scott Moser (smoser)]

I'll come back to this, but i put some stuff at
 https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+ref/bug/1663045-archlinux-empty-dns

which has a some unit tests too.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:6e47a2e039fbc0a8d6f02bad11762fb1edffae83
https://jenkins.ubuntu.com/server/job/cloud-init-ci/88/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/88/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:a682fa271e29ba5fb4b2ac67e8f7ed296cbc1ec9
https://jenkins.ubuntu.com/server/job/cloud-init-ci/90/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: CentOS 6 & 7: Build & Test
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/90/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

I'm marking this rejected as I had opened up https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/328114 with some related work and unit tests with it.

I really hate how harsh 'rejected' sounds.

diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py
index b4c0ba7..03f997c 100644
--- a/cloudinit/distros/arch.py
+++ b/cloudinit/distros/arch.py
@@ -61,10 +61,10 @@ class Distro(distros.Distro):
                 'Connection': 'ethernet',
                 'Interface': dev,
                 'IP': info.get('bootproto'),
-                'Address': "('%s/%s')" % (info.get('address'),
-                                          info.get('netmask')),
+                'Address': "%s/%s" % (info.get('address'),
+                                      info.get('netmask')),
                 'Gateway': info.get('gateway'),
-                'DNS': str(tuple(info.get('dns-nameservers'))).replace(',', '')
+                'DNS': info.get('dns-nameservers', []),
             }
             util.write_file(net_fn, convert_netctl(net_cfg))
             if info.get('auto'):
@@ -174,12 +174,20 @@ class Distro(distros.Distro):
 
 
 def convert_netctl(settings):
-    """Returns a settings string formatted for netctl."""
-    result = ''
-    if isinstance(settings, dict):
-        for k, v in settings.items():
-            result = result + '%s=%s\n' % (k, v)
-        return result
+    """Given a dictionary, returns a string in netctl profile format.
+
+    https://git.archlinux.org/netctl.git/tree/docs/netctl.profile.5.txt
+
+    Note that the 'Special Quoting Rules' are not handled here"""
+    result = []
+    for key in sorted(settings):
+        val = settings[key]
+        if val is None:
+            val = ""
+        elif isinstance(val, (tuple, list)):
+            val = "(" + ' '.join("'%s'" % v for v in val) + ")"
+        result.append("%s=%s\n" % (key, val))
+    return ''.join(result)
 
 
 def convert_resolv_conf(settings):
diff --git a/tests/unittests/test_distros/test_netctl.py b/tests/unittests/test_distros/test_netctl.py
new file mode 100644
index 0000000..d1670c3
--- /dev/null
+++ b/tests/unittests/test_distros/test_netctl.py
@@ -0,0 +1,42 @@
+# This file is part of cloud-init. See LICENSE file for license information.
+
+from cloudinit.distros.arch import convert_netctl as netctl
+
+from ..helpers import CiTestCase
+
+
+NET_CFG_DHCP = '''
+Interface=enp1s0
+Connection=ethernet
+IP=dhcp
+'''
+
+NET_CFG_STATIC = '''
+Interface=enp1s0
+Connection=ethernet
+IP=static
+Address=('10.1.10.2/24')
+Gateway=('10.1.10.1')
+DNS=('10.1.10.1')
+'''
+
+NET_CFG_BOND = '''
+Description='Bond Interface'
+Interface='bond0'
+Connection=bond
+BindsToInterfaces=('eth0' 'eth1')
+IP=dhcp
+IP6=stateless
+'''
+
+
+class TestNetctlDistro(CiTestCase):
+    def test_basic_dhcp(self):
+        """Simple dhcp config."""
+        entries = {'Interface': 'enp1s0',
+                   'Connection': 'ethernet',
+                   'IP': 'DHCP'}
+
+        netctl(entries)
+
+# vi: ts=4 expandtab