lp:~cbehrens/nova/lp854239

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Jason Kölker (community): Approve on 2011-09-19

Kevin L. Mitchell (community): Approve on 2011-09-19

Josh Kearney (community): Approve on 2011-09-19

Brian Waldon: Pending requested 2011-09-19

Diff: 230 lines (+37/-51)

7 files modified

nova/compute/api.py (+3/-2)
nova/db/api.py (+6/-7)
nova/db/sqlalchemy/api.py (+12/-28)
nova/network/manager.py (+3/-6)
nova/tests/fake_network.py (+5/-3)
nova/tests/test_compute.py (+2/-2)
nova/tests/test_db_api.py (+6/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #854239: instance_get_all_by_filters now does 2 DB queries, but they can be consolidated into 1.

Undecided

Fix Released

Link a bug report

Related blueprints

1598. By Chris Behrens on 2011-09-19

merged trunk and resolved conflict

1597. By Chris Behrens on 2011-09-19

fix unrelated pep8 issue in trunk

1596. By Chris Behrens on 2011-09-19

fix a test where list order was assumed

1595. By Chris Behrens on 2011-09-19

Removed the extra code added to support filtering instances by instance uuids.
Instead, added 'uuid' to the list of exact_filter_match names.
Updated the caller to add 'uuid: uuid_list' to the filters dictionary, instead of passing it in as another argument.
Updated the ID to UUID mapping code to return a dictionary, which allows the caller to be more efficient... It removes an extra loop there.
A couple of typo fixes.

1594. By Jason Kölker on 2011-09-19

* Remove the foreign key and backrefs tying vif<->instance
* Update instance filtering to pass ip related filters to the network manager
* move/update tests

1593. By Vish Ishaya on 2011-09-19

Adds an optional flag to force dhcp releases on instance termination. This allows ips to be reused without having to wait for the lease to timeout.

1592. By Brian Waldon on 2011-09-19

Fixing case where OSAPI server create would return 500 on malformed body.

1591. By Vish Ishaya on 2011-09-19

Fix the issue with the new dnsmasq where it tries and fails to bind to ipv6 addresses.

1590. By Édouard Thuleau on 2011-09-19

Fixes the handling of snapshotting in libvirt driver to actually use the proper image type instead of using raw for everything. Also cleans up an unneeded flag. Based on doude's initial work.

1589. By Jason Kölker on 2011-09-18

Remove vestigial db call for fixed_ips.