lp:~yamahata/nova/boot-from-volume-0

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 1198

Rick Harris (community): Approve on 2011-06-17

Matt Dietz (community): Approve on 2011-06-15

Devin Carlen (community): Needs Information on 2011-05-27

Diff: 1797 lines (+1068/-149)

23 files modified

nova/api/ec2/apirequest.py (+3/-75)
nova/api/ec2/cloud.py (+47/-11)
nova/api/ec2/ec2utils.py (+94/-0)
nova/compute/api.py (+87/-17)
nova/compute/manager.py (+136/-10)
nova/compute/utils.py (+29/-0)
nova/db/api.py (+35/-0)
nova/db/sqlalchemy/api.py (+79/-0)
nova/db/sqlalchemy/migrate_repo/versions/024_add_block_device_mapping.py (+87/-0)
nova/db/sqlalchemy/models.py (+39/-0)
nova/scheduler/simple.py (+7/-1)
nova/tests/test_api.py (+1/-1)
nova/tests/test_cloud.py (+312/-10)
nova/tests/test_compute.py (+15/-0)
nova/virt/driver.py (+1/-1)
nova/virt/fake.py (+5/-1)
nova/virt/hyperv.py (+1/-1)
nova/virt/libvirt.xml.template (+9/-0)
nova/virt/libvirt/connection.py (+58/-18)
nova/virt/vmwareapi_conn.py (+1/-1)
nova/virt/xenapi_conn.py (+1/-1)
nova/volume/api.py (+13/-1)
nova/volume/driver.py (+8/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1035. By Isaku Yamahata on 2011-06-17

pep8: white space/blank lines

1034. By Isaku Yamahata on 2011-06-15

fix mismerge.

1033. By Isaku Yamahata on 2011-06-15

merge with nova trunk

1032. By Isaku Yamahata on 2011-06-15

_setup_block_device_mapping: raise ApiError when db inconsistency found

Instead of assert, log it and raise ApiError if db inconsistency in
block_device_mapping table is found.

1031. By Isaku Yamahata on 2011-06-15

db/block_device_mapping_get_all_by_instance: don't raise.

Make db.block_device_mapping_get_all_by_instance() not raise,
but returns empty list when no column found as all users catch notfound
exception and ignore it.
Thus ugly 'catch NotFound: pass' is eliminated.

1030. By Isaku Yamahata on 2011-06-15

pep8

1029. By Isaku Yamahata on 2011-06-15

typo

1028. By Isaku Yamahata on 2011-06-15

ec2utils: minor optimize _try_convert()

don't call lower() twice.

1027. By Isaku Yamahata on 2011-06-15

block_device_mapping: don't use [] as default argument

1026. By Isaku Yamahata on 2011-06-15

api/ec2: make the parameter parser an independent method

Following the review, make the parser of argument items
an independent method for readability.