lp:~citrix-openstack/nova/xenapi-glance-2

Branch merges

Propose for merging

No branches dependent on this one.

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

Sandy Walsh (community): Approve on 2011-01-18

Ed Leafe (community): Approve on 2011-01-18

Thierry Carrez (community): Approve (ffe) on 2011-01-18

Jay Pipes (community): Needs Information on 2011-01-13

Rick Harris: Pending requested 2011-01-16

Diff: 869 lines (+504/-70)

10 files modified

nova/tests/glance/__init__.py (+20/-0)
nova/tests/glance/stubs.py (+37/-0)
nova/tests/test_xenapi.py (+72/-38)
nova/tests/xenapi/stubs.py (+19/-5)
nova/virt/xenapi/fake.py (+77/-10)
nova/virt/xenapi/vm_utils.py (+242/-14)
nova/virt/xenapi/vmops.py (+2/-1)
nova/virt/xenapi_conn.py (+3/-0)
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance (+31/-2)
tools/pip-requires (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #701880: [BFE] Merge ~citrix-openstack/nova/xenapi-glance-2 for bexar-xenapi-support-for-glance blueprint

Undecided

Opinion

Link a bug report

Related blueprints

544. By Ewan Mellor on 2011-01-17

Merged with trunk revno 572.

543. By Ewan Mellor on 2011-01-14

Merged with trunk revno 565.

542. By Salvatore Orlando on 2011-01-12

Fixed another issue in _stream_disk, as it did never execute _write_partition.
Fixed fake method accordingly.
Fixed pep8 errors.

541. By Salvatore Orlando on 2011-01-12

pep8 fixes

540. By Salvatore Orlando on 2011-01-12

Fixing the stub for _stream_disk as well

539. By Salvatore Orlando on 2011-01-12

Fix for _stream_disk

538. By Ewan Mellor on 2011-01-12

PEP8 fixes, and switch to using the new LOG in vm_utils, matching what's
just come in from trunk.

537. By Ewan Mellor on 2011-01-12

Merged with trunk.

536. By Ewan Mellor on 2011-01-12

Merged with Orlando's recent changes.

535. By Ewan Mellor on 2011-01-12

Added unit tests for the xenapi-glance integration. This adds a glance
simulator that can stub in place of glance.client.Client, and enhances the
xapi simulator to add the additional calls that the Glance-specific path
requires.

The test itself is just the spawn test, but now we run through with
xenapi_image_service set to "objectstore", and then again set to "glance".