lp:~cerberus/nova/lp813006

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Brian Lamar (community): Approve on 2011-07-20

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

Diff: 204 lines (+20/-21)

10 files modified

nova/compute/instance_types.py (+1/-1)
nova/compute/manager.py (+1/-1)
nova/db/api.py (+2/-2)
nova/db/sqlalchemy/api.py (+1/-1)
nova/network/manager.py (+1/-2)
nova/tests/db/fakes.py (+4/-4)
nova/tests/test_compute.py (+3/-3)
nova/tests/test_instance_types_extra_specs.py (+4/-4)
nova/tests/test_network.py (+2/-2)
nova/virt/libvirt/netutils.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #813006: Inconsistent database API method naming for instance_types

Wishlist

Fix Released

Link a bug report

Related blueprints

1286. By Matt Dietz on 2011-07-21

Some broken tests from my other merge

1285. By Matt Dietz on 2011-07-21

Merge from trunk

1284. By Matt Dietz on 2011-07-19

Fixes lp813006 - inconsistent DB API naming

1283. By Isaku Yamahata on 2011-07-18

This change adds the basic boot-from-volume support to the image service.

Specifically following API will supports --block-device-mapping with volume/snapshot and root device name

- register image

- describe image

- create image(newly support)

At the moment swap and ephemeral aren't supported yet. They will be supported with the next step

Next step

- describe instance attribute with euca command

- get metadata for bundle volume

- swap/ephemeral device support

1282. By Dan Prince on 2011-07-18

Updates to the XenServer agent plugin to fix file injection:

  -Update _agent_has_method so that it parses the features 'message' from nova-agent correctly. (it was trying to call .split on a dict).
  -Rip out the agent_has_method caching functionality which just plain wasn't working (with XenServer 5.6 SP2).
  -Pass the arg_dict to _agent_has_method. This fixes an issue where a subsequent call to xenstore.write_record didn't get the 'dom_id' (KeyError).
  -Fix a string formatting issue in inject_file in creating the b64 data.

1281. By Naveed Massjouni on 2011-07-16

Added some unit and integration tests for updating the server name via the openstack api.

1280. By Brian Waldon on 2011-07-15

Ensures a bookmark link is returned in GET /images. Before, it was only returned in GET /images/detail

1279. By Kevin L. Mitchell on 2011-07-15

Adds greater configuration flexibility to rate limiting via api-paste.ini. In particular:

* "limits" relation provides a string representation of desired default limits in the form:

  - '(VERB, URI, REGEX, VALUE, UNIT); (VERB, URI, REGEX, VALUE, UNIT)'[...]

    + VALUE must be an integer, and UNIT must be one of SECOND, MINUTE, HOUR, DAY (case insensitive)

    + Empty string is also a valid value

* "user:<username>" relations specify limits in the same format, but per user.

* "limiter" relation can specify an alternate class to use in place of Limiter.

  - This makes it easier to use WsgiLimiterProxy if desired

(All these relations are specified in the '[filter:ratelimit]' section.)

1278. By Anne Gentle on 2011-07-15

Adds distributed scheduler and multinic docs to the Developer Reference page.

1277. By Brian Waldon on 2011-07-15

- Present ip addresses in their actual networks, not just a static public/private
- Floating ip addresses are grouped into the networks with their associated fixed ips
- Add addresses attribute to server entities