Merge lp:~smoser/cloud-init/trunk.dmidecode-null into lp:~cloud-init-dev/cloud-init/trunk

[Scott Moser]

change return value for dmi data of all \xff to be ""

Previously we returned a string of "." the same length as the dmi field.
That seems confusing to the user as "." would seem like a valid response
when in fact this value should not be considered valid.

So now, in this case, return empty string.

[lp:~smoser/cloud-init/trunk.dmidecode-null]

1183. By Scott Moser on 2016-03-14

change where we handle the translation

[Dan Watkins (daniel-thewatkins)]

review: Approve

[lp:~smoser/cloud-init/trunk.dmidecode-null]

1184. By Scott Moser on 2016-03-14

strip return of dmidecode and do so before checking for all "."

=== modified file 'cloudinit/util.py'
--- cloudinit/util.py	2016-03-10 21:56:44 +0000
+++ cloudinit/util.py	2016-03-14 13:35:24 +0000
@@ -2148,7 +2148,7 @@
         # uninitialized dmi values show as all \xff and /sys appends a '\n'.
         # in that event, return a string of '.' in the same length.
         if key_data == b'\xff' * (len(key_data) - 1) + b'\n':
-            key_data = b'.' * (len(key_data) - 1) + b'\n'
+            key_data = b""
 
         str_data = key_data.decode('utf8').strip()
         LOG.debug("dmi data %s returned %s", dmi_key_path, str_data)
@@ -2168,6 +2168,9 @@
         cmd = [dmidecode_path, "--string", key]
         (result, _err) = subp(cmd)
         LOG.debug("dmidecode returned '%s' for '%s'", result, key)
+        result = result.strip()
+        if result.replace(".", "") == "":
+            return ""
         return result
     except (IOError, OSError) as _err:
         LOG.debug('failed dmidecode cmd: %s\n%s', cmd, _err.message)

=== modified file 'tests/unittests/test_util.py'
--- tests/unittests/test_util.py	2016-03-10 21:56:44 +0000
+++ tests/unittests/test_util.py	2016-03-14 13:35:24 +0000
@@ -389,7 +389,7 @@
         # uninitialized dmi values show as \xff, return those as .
         my_len = 32
         dmi_value = b'\xff' * my_len + b'\n'
-        expected = '.' * my_len
+        expected = ""
         dmi_key = 'system-product-name'
         sysfs_key = 'product_name'
         self._create_sysfs_file(sysfs_key, dmi_value)