lp://qastaging/~yamahata/nova/boot-from-volume-2

Branch merges

Propose for merging

No branches dependent on this one.

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

Brian Lamar (community): Approve on 2011-08-08

Devin Carlen (community): Approve on 2011-08-05

Vish Ishaya (community): Approve on 2011-08-05

Soren Hansen (community): Needs Information on 2011-08-04

Diff: 1798 lines (+981/-161)

21 files modified

nova/api/ec2/cloud.py (+153/-27)
nova/api/ec2/ec2utils.py (+0/-29)
nova/block_device.py (+71/-0)
nova/compute/api.py (+56/-17)
nova/compute/manager.py (+26/-8)
nova/db/sqlalchemy/api.py (+18/-1)
nova/image/glance.py (+46/-0)
nova/tests/image/test_glance.py (+36/-0)
nova/tests/test_api.py (+6/-3)
nova/tests/test_block_device.py (+87/-0)
nova/tests/test_cloud.py (+153/-4)
nova/tests/test_compute.py (+28/-12)
nova/tests/test_libvirt.py (+37/-0)
nova/tests/test_metadata.py (+1/-0)
nova/tests/test_virt.py (+83/-0)
nova/virt/driver.py (+29/-2)
nova/virt/fake.py (+2/-2)
nova/virt/hyperv.py (+2/-2)
nova/virt/libvirt.xml.template (+23/-10)
nova/virt/libvirt/connection.py (+122/-42)
nova/virt/xenapi_conn.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1334. By Isaku Yamahata on 2011-08-05

fix mismerge

1333. By Isaku Yamahata on 2011-08-05

merged with nova trunk.

1332. By Isaku Yamahata on 2011-08-02

merged with nova trunk

1331. By Isaku Yamahata on 2011-07-29

api/ec2: rename CloudController._get_instance_mapping into _format_instance_mapping

This patch renames nova.api.ec2.cloud.CouldController._get_instance_mapping
to _format_instance_mapping in order to make it clear that the method is
for API formatting, not for internal use.

1330. By Isaku Yamahata on 2011-07-23

tests: unit tests for describe instance attribute

1329. By Isaku Yamahata on 2011-07-23

tests: an unit test for nova.compute.api.API._ephemeral_size()

1328. By Isaku Yamahata on 2011-07-23

tests: unit tests for nova.virt.libvirt.connection._volume_in_mapping()

1327. By Isaku Yamahata on 2011-07-23

tests/glance: unit tests for glance serializer

1326. By Isaku Yamahata on 2011-07-23

tests: unit tests for nova.virt

1325. By Isaku Yamahata on 2011-07-23

tests: unit tests for nova.block_device