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

Branch merges

Propose for merging

No branches dependent on this one.

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

Vish Ishaya (community): Approve on 2011-07-18

Brian Waldon (community): Abstain on 2011-07-15

Sandy Walsh (community): Approve on 2011-07-11

Diff: 2188 lines (+1545/-98)

19 files modified

nova/api/ec2/__init__.py (+5/-2)
nova/api/ec2/cloud.py (+295/-34)
nova/api/ec2/ec2utils.py (+40/-0)
nova/compute/api.py (+71/-25)
nova/compute/manager.py (+11/-9)
nova/db/api.py (+7/-1)
nova/db/sqlalchemy/api.py (+17/-0)
nova/db/sqlalchemy/migrate_repo/versions/032_add_root_device_name.py (+47/-0)
nova/db/sqlalchemy/models.py (+2/-0)
nova/image/fake.py (+10/-1)
nova/image/s3.py (+41/-12)
nova/test.py (+16/-0)
nova/tests/image/test_s3.py (+122/-0)
nova/tests/test_api.py (+70/-0)
nova/tests/test_bdm.py (+233/-0)
nova/tests/test_cloud.py (+405/-12)
nova/tests/test_compute.py (+111/-0)
nova/tests/test_volume.py (+31/-0)
nova/volume/api.py (+11/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1076. By Isaku Yamahata on 2011-07-08

image/fake: added teardown method

Unit tests may alter images in FakeImageService which has pre-defined images.
Since some unit tests depend on those images, so it needs to be cleaned up
after image alternation. Otherwise running many unit tests may fail.

1075. By Isaku Yamahata on 2011-07-08

tests/test_cloud: make an unit test, test_create_image, happy

1074. By Isaku Yamahata on 2011-07-08

nova/compute/api.py: fixed mismerge

1073. By Isaku Yamahata on 2011-07-08

sqlalchemy/migrate: resolved version conflict

1072. By Isaku Yamahata on 2011-07-08

merge with trunk

1071. By Isaku Yamahata on 2011-06-27

sqlalchmey/migration: resolved version conflict

1070. By Isaku Yamahata on 2011-06-27

merge with trunk

1069. By Isaku Yamahata on 2011-06-24

ec2/cloud: typo

1068. By Isaku Yamahata on 2011-06-24

image/s3: typo

1067. By Isaku Yamahata on 2011-06-23

ec2/cloud: address review.

- eliminated commented out lines in create_image()
- added time out to create_image()
,