Merge "Remove redundant tests from Qcow2TestCase"
Add info_cache as expected attribute when evacuate instance

Nova evacuates instance failed with neutron. The reason is
when nova-conductor try to get network info for instance, it
need instance include 'info_cache', but the instance dict which
passed didn't include it. This patch adds 'info_cache' as the
expected attribute for get instance.

Change-Id: I6f110c607e32b0ab536916741605b25d572331dc
Closes-Bug: #1284709
Scheduler: remove test scheduling methods that are not used

The test code no longer uses the following methods:
 - fake_get_group_filtered_hosts
 - fake_get_group_filtered_affinity_hosts

This patch removes those methods.

Change-Id: I0a005fb1301ce78cc2ec365429015c08d58f446e
Fix network-api direct database hits in metadata server

The metadata server was using a couple of methods from the network
api that caused direct-to-database accesses. Those are no longer
necessary with the object modeling of network resources. This patch
converts those to use objects and avoid the direct database
traffic.

Change-Id: Iea48f74387afa35af3889eebdfa1af169a52ad1d
Closes-bug: #1306009
Merge "Allow user to specify image to use during rescue"
Merge "Update user_id length to match Keystone schema in volume_usage_cache"
Merge "Check for None or timestamp in availability zone api sample"
Merge "Avoid the possibility of truncating disk info file"
Merge "compute: using format_message() to convert exception to string"
Merge "Add test cases for validate_extra_spec_keys"
Merge "Check image exists before calling inject_data"
Merge "attach/detach interface should raise exception when instance is locked"
Merge "VMware: remove double import"
Merge "Add exception handling in "nova diagnostics""
Merge "Use instance data instead of flavor in simple_tenant_usage extension"
ec2: Convert instance_get_by_uuid calls to objects

Convert a couple uses of db.instance_get_by_uuid() to use the Instance
object instead.

Change-Id: I6c317c72661643d46ea0577d6efe87a24bf98b74
Merge "Fix network-api direct database hits in metadata server"
Add lock on API layer delete floating IP

There are potential race condition when multiple nova-api
service is running. We need to prevent the concurrent access to
the same floating ip, though db layer function is ok for floating
ip, the quota will be released more than one time and it will
lead to potential problem later

So the solution: check whether the db is *really* updated with the
value we want, which means the second operation will fail and
return None, so network api layer can handle it

Change-Id: I028938a4c387d21a8880ae168b161a763e7361ff
Closes-Bug: #1268569
Make detach_volume() use objects

This changes the detach_volume() method in compute manager to take
objects.

Related to blueprint compute-manager-objects-juno

Change-Id: Ia09415c55dee0d49e8925d6eb23737b55255d7e1
Finish _delete_instance() object conversion

The _delete_instance() helper has been using objects for a while
now, but was still using an old conductor method to actually
destroy the instance. This makes it use instance.destroy(). Since the
same thing happens under the covers, none of the tests need to be
changed.

Related to blueprint compute-manager-objects-juno

Change-Id: I413394bbc931d1011c276454ecb34ddd8d948f07