lp:~oddbloke/cloud-init/fix-dmi

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~cloud-init-dev/cloud-init/trunk at revision 1073

cloud-init Commiters: Pending requested 2015-03-04

Diff: 228 lines (+103/-62)

2 files modified

cloudinit/util.py (+51/-19)
tests/unittests/test_util.py (+52/-43)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1427687: Reading of DMI data is broken

Undecided

Fix Released

Link a bug report

Related blueprints

1073. By Dan Watkins on 2015-03-04

Use more consistent logging invocation.

1072. By Dan Watkins on 2015-03-04

Convert dmidecode values to sysfs names before looking for them.

dmidecode and /sys/class/dmi/id/* use different names for the same
information. This modified the logic in util.read_dmi_data to map from
dmidecode names to sysfs names before looking in sysfs.

1071. By Scott Moser on 2015-03-02

MAAS: fix oauth imports and reading of command line seed.

1070. By Scott Moser on 2015-03-02

util.py: remove 'print' debug statement

1069. By Scott Moser on 2015-03-02

url_helper.py: fix undefined variable

python2 scoping is different and running wait_for_url in python3
results in a use of undeclared variable 'e'.

$ python3 -c 'from cloudinit import url_helper; \
    url_helper.wait_for_url("o", max_wait=3,timeout=1, exception_cb=print)'
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "cloudinit/url_helper.py", line 358, in wait_for_url
    exception_cb(msg=status_msg, exception=e)

1068. By Scott Moser on 2015-03-02

pep8

1067. By Scott Moser on 2015-02-26

readurl, read_file_or_url returns bytes, user must convert as necessary

 * explicitly test compressed user-data.
 * userdata_raw is now bytes
 * add load_tfile_or_url for loading text file or url
 * ec2_utils: all meta-data is text, remove non-obvious string translations
 * DigitalOcean: adjust for ec2_utils
 * DataSourceGCE, DataSourceMAAS: user-data is binary other fields are text.
 * openstack.py: read paths without decoding to text. This is ok as paths
                 other than user-data are json, and load_json will handle
 * load_file still returns text, and that is what most things use.

1066. By Scott Moser on 2015-02-24

further fixing of non-text user-data.

1065. By Scott Moser on 2015-02-24

move recently added test_udprocess tests to test_data, improve a bit

explicitly test compressed user-data.

1064. By Scott Moser on 2015-02-24

Azure: Fix consumption of user-data

This was previously broken in python3 as the userdata would be bytes
rather than a string.