lp:~jtran/nova/lp744519

Branch merges

Propose for merging

No branches dependent on this one.

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

Devin Carlen (community): Approve on 2011-07-09

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

Brian Waldon (community): Approve on 2011-07-08

Diff: 111 lines (+28/-8)

2 files modified

nova/api/ec2/cloud.py (+5/-1)
nova/tests/test_cloud.py (+23/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #744519: euca-deregister deletes wrong image

Medium

Fix Released

Link a bug report

Related blueprints

1252. By John Tran on 2011-07-08

peer review fix - per vish: 'This method automatically converts unknown formats to ami, which is the same logic used to display unknown images in the ec2 api. This will allow you to properly deregister raw images, etc.'

1251. By John Tran on 2011-07-08

ec2 api _get_image method logic flaw that strips the hex16 digit off of the image name, and does a search against the db for it and ignores that it may not be the correct image, such as if doing a search for aki-0000009, yet that image name doesn't exist, it strips off aki- and looks for any image_id 0000009 and if there was an image match that happens to be an ami instead of aki, it will go ahead and deregister that. That behavior is unintended, so added logic to ensure that the original request image_id matches the type of image being returned from database by matching against container_format attr

1250. By Salvatore Orlando on 2011-07-07

implemented clean-up logic when VM fails to spawn for xenapi back-end

1249. By Ed Leafe on 2011-07-07

Adds the os-hosts API extension for interacting with hosts while performing maintenance. This differs from the previous merge prop as it uses a RESTful design instead of GET-based actions.

This supersedes the previous merge prop (https://code.launchpad.net/~ed-leafe/nova/maintmode/+merge/66303). The code has been both simplified and cleaned up a great deal, so there is no real need for the previous interim code.

1248. By Chuck Short on 2011-07-07

Fixes Bug #805083: "libvirtError: internal error cannot determine default video type" when using UML

1247. By Alex Meade on 2011-07-07

Updated the links container for flavors to be compliant with the current spec.

bug #803505

1246. By Jimmy Bergman on 2011-07-07

Add a socket server responding with an allowing flash socket policy for all requests from flash on port 843 to nova-vncproxy

1245. By Thierry Carrez on 2011-07-06

Silence warning in case tests.sqlite doesn't exist

1244. By John Tran on 2011-07-01

Added the GroupId param to any pertinent security_group methods that support it in the official AWS API.

1243. By Brian Waldon on 2011-07-01

Removes 'import IPy' introduced in recent commit