Merge ~jcastets/cloud-init:fix-net-cfg into cloud-init:master

[Julien Castets]

Add address to config entry generated by _klibc_to_config_entry

If /run/net-<name>.cfg contains an IPV4ADDR or an IPV6ADDR, the config
file generated by _klibc_to_config_entry now contains the "address".

LP: #1691135

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

PASSED: Continuous integration, rev:881495e7930dacf5a7195e560ec66589e44b55df
https://jenkins.ubuntu.com/server/job/cloud-init-ci/338/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/338
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/338
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/338
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/338

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

review: Approve (continuous-integration)

[Scott Moser (smoser)]

My only comments here is with respect to dhcp.
If the configuration type was dhcp, then i think its more correct to not include 'address', as most dhcp stanzas for network config are not going to have an address so that is at very least confusing.

How about this diff :
  http://paste.ubuntu.com/24587345/

[Julien Castets (jcastets)]

I pushed --force with your modifications

diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py
index 7c5d11a..61e2369 100755
--- a/cloudinit/net/cmdline.py
+++ b/cloudinit/net/cmdline.py
@@ -100,6 +100,11 @@ def _klibc_to_config_entry(content, mac_addrs=None):
         cur_proto = data.get(pre + 'PROTO', proto)
         subnet = {'type': cur_proto, 'control': 'manual'}
 
+        # only populate address for static types. While the rendered config
+        # may have an address for dhcp, that is not really expected.
+        if cur_proto == 'static':
+            subnet['address'] = data[pre + 'ADDR']
+
         # these fields go right on the subnet
         for key in ('NETMASK', 'BROADCAST', 'GATEWAY'):
             if pre + key in data:
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index 7c5dc4e..052c401 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -100,7 +100,8 @@ STATIC_EXPECTED_1 = {
                  'gateway': '10.0.0.1',
                  'dns_search': ['foo.com'], 'type': 'static',
                  'netmask': '255.255.255.0',
-                 'dns_nameservers': ['10.0.1.1']}],
+                 'dns_nameservers': ['10.0.1.1'],
+                 'address': '10.0.0.2'}],
 }
 
 # Examples (and expected outputs for various renderers).