lp:~harlowja/cloud-init/cloud-init-net-refactor

Branch merges

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

Scott Moser: Approve on 2016-06-10

Diff: 3349 lines (+1330/-1196)

32 files modified

cloudinit/cs_utils.py (+2/-1)
cloudinit/distros/debian.py (+6/-4)
cloudinit/net/__init__.py (+29/-654)
cloudinit/net/cmdline.py (+203/-0)
cloudinit/net/eni.py (+457/-0)
cloudinit/net/network_state.py (+121/-160)
cloudinit/serial.py (+50/-0)
cloudinit/sources/DataSourceAzure.py (+1/-1)
cloudinit/sources/DataSourceConfigDrive.py (+7/-145)
cloudinit/sources/DataSourceSmartOS.py (+1/-3)
cloudinit/sources/helpers/openstack.py (+145/-0)
cloudinit/stages.py (+2/-1)
cloudinit/util.py (+13/-3)
packages/bddeb (+1/-0)
requirements.txt (+6/-2)
setup.py (+0/-1)
test-requirements.txt (+1/-0)
tests/unittests/helpers.py (+9/-76)
tests/unittests/test__init__.py (+4/-13)
tests/unittests/test_cli.py (+1/-6)
tests/unittests/test_cs_util.py (+3/-24)
tests/unittests/test_datasource/test_azure.py (+3/-9)
tests/unittests/test_datasource/test_azure_helper.py (+1/-11)
tests/unittests/test_datasource/test_cloudsigma.py (+1/-1)
tests/unittests/test_datasource/test_cloudstack.py (+1/-10)
tests/unittests/test_datasource/test_configdrive.py (+143/-27)
tests/unittests/test_datasource/test_nocloud.py (+3/-12)
tests/unittests/test_datasource/test_smartos.py (+4/-2)
tests/unittests/test_net.py (+84/-11)
tests/unittests/test_reporting.py (+3/-1)
tests/unittests/test_rh_subscription.py (+19/-7)
tox.ini (+6/-11)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1232. By Joshua Harlow on 2016-06-10

Just mock 'on_first_boot' vs special argument

1231. By Joshua Harlow on 2016-06-10

Just do all the imports on one line

1230. By Joshua Harlow on 2016-06-10

Add unittest2 to builder list

1229. By Joshua Harlow on 2016-06-10

Less less tweaking of tox.ini

1228. By Joshua Harlow on 2016-06-10

Less tweaking of tox.ini

1227. By Joshua Harlow on 2016-06-07

For now just remove compat.py module

Let's reduce the size of this change for now.

1226. By Joshua Harlow on 2016-06-07

Get cmdline working again

1225. By Joshua Harlow on 2016-06-07

Rebase against master

1224. By Joshua Harlow on 2016-05-24

Fix up some of the net usage and restore imports and add a mini compat module

1223. By Joshua Harlow on 2016-05-24

Fix load -> read