lp:~cbehrens/nova/swapdisk

Branch merges

Propose for merging

No branches dependent on this one.

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

Ed Leafe (community): Approve on 2011-05-26

Josh Kearney (community): Approve on 2011-05-26

Diff: 484 lines (+202/-62)

6 files modified

nova/tests/test_xenapi.py (+23/-0)
nova/tests/xenapi/stubs.py (+26/-6)
nova/virt/xenapi/fake.py (+4/-1)
nova/virt/xenapi/vm_utils.py (+40/-9)
nova/virt/xenapi/vmops.py (+38/-21)
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance (+71/-25)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1113. By Chris Behrens on 2011-05-26

add a comment when calling glance:download_vhd so it's clear what is returned

1112. By Chris Behrens on 2011-05-26

put back the hidden assert check i accidentally removed from glance plugin

1111. By Chris Behrens on 2011-05-26

fix image_path in glance plugin

1110. By Chris Behrens on 2011-05-26

Merged trunk

1109. By Chris Behrens on 2011-05-26

Change the return from glance to be a list of dictionaries describing VDIs
Fix the rest of the code to account for this
Add a test for swap

1108. By Chris Behrens on 2011-05-25

Merged trunk

1107. By Chris Behrens on 2011-05-24

move devices back

1106. By Chris Behrens on 2011-05-23

swap should use device 1 and rescue use device 2

1105. By Chris Behrens on 2011-05-23

fix tests, have glance plugin return json encoded string of vdi uuids

1104. By Chris Behrens on 2011-05-23

cleanup and fixes