lp:~rackspace-titan/nova/instance_type_id

Branch merges

Propose for merging

No branches dependent on this one.

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

justinsb (community): Approve on 2011-04-07

Jay Pipes (community): Approve on 2011-04-07

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

Cory Wright (community): Approve on 2011-04-06

Diff: 998 lines (+265/-108)

23 files modified

bin/nova-manage (+1/-1)
nova/api/ec2/cloud.py (+5/-2)
nova/api/openstack/servers.py (+4/-2)
nova/api/openstack/views/servers.py (+2/-2)
nova/compute/api.py (+10/-8)
nova/compute/instance_types.py (+37/-35)
nova/db/api.py (+5/-0)
nova/db/sqlalchemy/api.py (+22/-0)
nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py (+84/-0)
nova/db/sqlalchemy/models.py (+7/-1)
nova/tests/api/openstack/test_servers.py (+14/-10)
nova/tests/db/fakes.py (+17/-5)
nova/tests/test_compute.py (+10/-8)
nova/tests/test_console.py (+1/-1)
nova/tests/test_instance_types.py (+5/-1)
nova/tests/test_quota.py (+11/-6)
nova/tests/test_scheduler.py (+1/-1)
nova/tests/test_virt.py (+1/-1)
nova/tests/test_volume.py (+1/-1)
nova/tests/test_xenapi.py (+6/-6)
nova/virt/libvirt_conn.py (+12/-10)
nova/virt/xenapi/vm_utils.py (+4/-4)
nova/virt/xenapi/vmops.py (+5/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #742684: OSAPI: GET /server/<id> returns invalid flavor ID

Medium

Fix Released

Link a bug report

Related blueprints

938. By Dan Prince on 2011-04-07

Drop extra 'None' arg from dict.get call.

937. By Dan Prince on 2011-04-07

Some i18n fixes to instance_types.

936. By Dan Prince on 2011-04-07

Drop unneeded Fkey on InstanceTypes.id.

935. By Dan Prince on 2011-04-07

Merge w/ trunk.

934. By Dan Prince on 2011-04-05

Remove comments.

933. By Dan Prince on 2011-04-05

Correct variable name.

932. By Dan Prince on 2011-04-05

Merge w/ trunk.

931. By Dan Prince on 2011-04-04

Refactor so that instances.instance_type is now instances.instance_type_id.

Update the Openstack API to return the correct flavor_id.

930. By Sandy Walsh on 2011-03-31

Removes excessive logging message in the event of a rabbitmq failure.

Pro: logs stay under control
Con: in the event of a non-comm failure, the exception will get eaten.

929. By Mark Washenberger on 2011-03-31

Add a change password action to /servers in openstack api v1.1, and associated tests.