Merge "Port cloudpipe extension to v2.1"
Merge "Finish objects conversion in the os-interface API"
Merge "VMware: remove unused argument from _delete_datastore_file()"
Merge "Use database joins for fixed ips to other objects"
Merge "Convert migrate reqeusts to use joins"
Sync with latest oslo-incubator

Changes include:
55ca7c3 Split cliutils
1b44601 Allow dictionary lookup in credentials with dot notation
6c706c5 Delete graduated serialization files
3edbfb3 remove caching param from prettytable call
9ce1d96 Fix i18n import
5d40e14 Remove code that moved to oslo.i18n
a4be4ed Remove graduated config modules
6ff6b4b Switch oslo-incubator to use oslo.utils and remove old modules
70189c9 Remove graduated test and fixtures libraries
8b71f57 Delete graduated db files
6ede600 rpc, notifier: remove deprecated modules
6b65a41 Fix build break - switch from str to hash for lookup
f76f44c Delete the token and endpoint on expiry of token of client
aebb58f Fix typo to show correct log message
1131b56 Enabled mask_password to handle byte code strings
6b048e7 Let oslotest manage the six.move setting for mox

Change-Id: Ic588aec0fc0291440feaac3439836054bd3608cd
Imported Translations from Transifex

Change-Id: Icab01b8cdebf05b9d49f7ec3e619e1f9652aeffb
Port floating_ip_pools extention to v2.1

This patch ports floating_ip_pools extention from v2 to v2.1,
and have v2 unit test cases shared between v2.1 and v2.
Partially implements blueprint v2-on-v3-api

Change-Id: I0b34358db08a29e76a59b22a0992abc88296058d
Use 400 instead of 422 for security_groups v2 API

For any invalid request format we should return 400, not 422,
this patch fixes this case for v2 security_groups API.

This patch follows the rule:
https://wiki.openstack.org/wiki/APIChangeGuidelines

Change-Id: I78f523901918901e55b339d0cbd9cc78dd52044f
Closes-Bug: #1380456
Pass block device info in pre_live_migration

In case of block migration, this adds block device information to the
disk information handled by pre_live_migration, so that at least in the
case of libvirt no spurious files are created corresponding to volumes.

Co-Authored-By: florent.flament@cloudwatt.com
Change-Id: I373001e0ef0e4fe4ab900d399756f27101cfe5c8
Closes-Bug: 1376586
Add supported_hv_specs to ComputeNode object

The compute_nodes table has a field called supported_instances
that is populated with data generated by the virt drivers
and used in the scheduler filter image_props_filter. There is
no corresponding field in the ComputeNode object. This change
adds a field called supported_hv_specs that maps to the
supported_instances database field.

The field is a list of specs for hypervisor properties
(architecture, hypervisor type and vm mode) that the host supports.
The change of name to supported_hv_specs is intended to reflect
this and is made now as a change in the object later on would
require a change in the object version.

Because the field has a defined structure a field type is defined
for supported_hv_specs. The field type is:

    ListOfObjectsField('HVSpec')

where HVSpec is a new object representing the a supported
hypervisor property combination.

Change-Id: I8b41465c4f3b391be38e16260a807d9d3fe60ec2
Merge "Port floating_ip_pools extention to v2.1"
Updated from global requirements

Change-Id: I0143a9659a2dafaacf687f117b77a627e468a106
Add instance_group_get_by_instance to db.api

Add a new method to the db.api that lets you get an instance group by
instance UUID.

Change-Id: I3d2a019c8f97166ec55574c610d12f572afb2bd1
Related-bug: #1379451
add InstanceGroup.get_by_instance_uuid

Add a new method to the InstanceGroup object that lets you get a group
by an instance UUID.  Right now Nova only lets you have an instance in
a single group, so that's why this is a method of InstanceGroup and
not InstanceGroupList.

Change-Id: Ic0181e241471ad817284209e6a1093a438962bf1
Related-bug: #1379451
Minor refactor of _setup_instance_group()

This patch is a minor refactoring of the _setup_instance_group()
method in the filter scheduler.  The majority of the method was inside
of a conditional.  This primarily reverses that and reduces the
nesting depth used.  There should be no functional changes at all in
this patch.

Change-Id: Iab4d63200653a4320c91dc1356091ff9d961cafd
Related-bug: #1379451
VMware: get_all_cluster_refs_by_name default to {}

Currently get_all_cluster_refs_by_name returns None when no cluster
is found.
driver.py is using the keys() method without checking whether the
object returned is None. This can potentially end up throwing an
AttributeError.

This patch fixes the issue by returning an empty dictionary when no
cluster is found.

Change-Id: I3293c916d79aaa4de8913e8ab9c609c9c0bb023e
Closes-Bug: #1372672
Merge "Imported Translations from Transifex"
Merge "Use 400 instead of 422 for security_groups v2 API"
Merge "Updated from global requirements"