lp:~rackspace-titan/nova/osapi_fault_wrap_webob_exc

Branch merges

Propose for merging

No branches dependent on this one.

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

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

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

Alex Meade (community): Approve on 2011-07-21

Diff: 763 lines (+90/-102)

15 files modified

nova/api/openstack/accounts.py (+3/-3)
nova/api/openstack/backup_schedules.py (+4/-5)
nova/api/openstack/common.py (+12/-7)
nova/api/openstack/consoles.py (+3/-4)
nova/api/openstack/create_instance_helper.py (+3/-4)
nova/api/openstack/image_metadata.py (+2/-3)
nova/api/openstack/images.py (+1/-2)
nova/api/openstack/ips.py (+5/-6)
nova/api/openstack/server_metadata.py (+0/-1)
nova/api/openstack/servers.py (+42/-50)
nova/api/openstack/shared_ip_groups.py (+6/-7)
nova/api/openstack/users.py (+1/-2)
nova/api/openstack/wsgi.py (+5/-1)
nova/api/openstack/zones.py (+2/-6)
nova/tests/api/openstack/test_servers.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #790728: Remove unnecessary fault.Fault wrapping from OSAPI	Wishlist	Fix Released
Bug #790743: FaultWrapper middleware does not respect content types	Low	Fix Released

Link a bug report

Related blueprints

1295. By Dan Prince on 2011-07-21

pep8 and stuff.

1294. By Dan Prince on 2011-07-21

Merge w/ trunk.

1293. By Dan Prince on 2011-07-21

Perform fault wrapping in the openstack WSGI controller. This allows
us to just raise webob Exceptions in OS API controllers with the
appropriate explanations set. This resolves some inconsistencies
with exception raising and returning that could cause HTML output
to occur when an exception was raised.

1292. By Johannes Erdfelt on 2011-07-20

Older Windows agents are very picky about the data sent to it. It also requires the public key for the password exchange to be in a string format and not an integer.

Also, because of the length of time it takes Windows to boot fully (including a full reboot), the reset network command gets lost. Move this to after we've made sure the agent is up and running successfully.

1291. By Dan Prince on 2011-07-20

Set the status_int on fault wrapped exceptions. Fixes WSGI logging issues when faults are returned.

Updated so that webob exceptions aren't used for the happy path (HTTP 200 responses). We now return a proper webob object response in these cases. This fixes issues where HTML/XML would get incorrectly returned with the old style happy path exceptions.

1290. By Adam Gandelman on 2011-07-20

Fixes bug #807764. Please disregard previous proposal with incorrect bug #.

1289. By Trey Morris on 2011-07-20

lp812489: better handling of periodic network host setup to prevent exception

1288. By Scott Moser on 2011-07-20

correct broken logic for lxc and uml to avoid adding vnc arguments (LP: #812553)

This fixes the logic, so that lxc and uml will not get vnc arguments added to
their libvirt xml. It also seems more readable to me.

1287. By Johannes Erdfelt on 2011-07-20

Most of the XenServer plugin files need the execute bit set to run properly. However, they are inconsistent as it is, with one file having the execute bit set, but the another having it set when it is not needed.

This trivial merge fixes the permissions to what they need to be to ensure the plugins will work properly on the dom0.

1286. By John Tran on 2011-07-20

network api release_floating_ip method will now check to see if an instance is associated to it, prior to releasing.