Fix EC2 instance bdm response

Make the bdm response respect Amazon EC2 spec:
 * use ec2 volume id instead of uuid
 * use volume attach_status instead of status

References:
http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-ItemType-EbsInstanceBlockDeviceMappingResponseType.html

Resolves bug 1165973.

Change-Id: Ib68397b79f63e01e92ed4bebbc245ba5e0a3ad11
vmwareapi: Add supported_instances to host state

The VMWareVCDriver uses the VCState class to report host state,
but VCState.update_status() does not include supported_instances.
Add supported_instances to the data returned by update_status(),
similar to HostState.update_status().

Change-Id: I15c0f930dd9e540f6fdb0d7246661a0c98e35ed4
Update oslo-incubator import.

These are all minor changes bringing nova up to commit
90e83530d4dc49d570fa05ea63a93805717dcfa0 in oslo-incubator.

Change-Id: I0291eed31b1e650da211fe2a8b65fad0c35c9053
Update our import of oslo's processutils.

I've just synced nova's processutils back to oslo and this is now
the sync back in the other direction.

Change-Id: I8389bdd85ed3dacbb02aec043dfd0f84ef07b18b
Adds --addn-hosts to the dnsmasq arg list

When using multi_host=True and update_dns_entries=True, dns records from
other compute hosts were not able to be resolved.  The --addn-host arg was
constructed but not appended to the cmd list.

Change-Id: I9cafb59256e92bdad0df3e9166e0afd079ae0c09
Fixes: bug #1170529
Add missing tests for db.floating_ip_* methods

There was no tests in test_db_api for db.floating_ip_*
methods.

Add tests to ensure that all works.

Remove tests for db.flating_ip_* from DbApiTestCase.

Change return value of db.floating_ip_create()
This method is used only for tests. To simplify testing we
should return floating_ip_ref (all columns) instead of address.

blueprint db-api-tests

Change-Id: I37ee93c1d054ad736aa02a43be867f809448b172
Remove race condition (in FloatingIps)

Soft delete all duplicate rows with the same address except one with
the biggest value in `id` column.

Create UC on columns (address, deleted)

Fix floating_ip_create
  Replace Select then Insert -> Try to Insert.

Fix floating_ip_bulk_create
  Replace get all and locally compare -> Try to Insert

Fix floating_ip_update
  If we update floating_ip with existing address, raise
  rollback and raise FloatingIpExists

Add missing test for floating_ip_update to duplicate

Fixes bug 1145216

blueprint db-enforce-unique-keys

Change-Id: Idd0c8305ca348700235f757a29fc7998edca576b
fix broken WSDL logic

vSphere driver incorrectly assumes that a WSDL is locally required.
A local WSDL is only needed as a work-around for certain situations.

Fixes bug 1171215

Change-Id: Id8c5fc104c244ba768c58b97afdc26703c5c42ac
nova coverage creates lots of empty folders

With nova coverage extension disabled as a default behaviour,
nova will create lots of empty folders under /tmp folder. And also
with each time the nova service reboot, it will create a new
directory with name like nova_coverage_*. There will be number of
the empty folders accumulated.

Patch-Set 3: Rebase for merging code
Fixes: bug 1169005

Change-Id: I26d1037eb66d781ac6ef6b600cca04a709bff3f7
Make nova-network support requested nic ordering

The nova-network did not honor nic ordering, so nics were attached in db
natural order. This patch sorts the networks honor requested nic
ordering when Nova calls the nova-network API.

Fixes bug: #1170725

Change-Id: I7dd04ac7bdda95c626cbb0fe35be0aadacb4bd2a
Signed-off-by: zhiyanl-cn <zhiyanl@cn.ibm.com>
Merge "Add missing tests for db.floating_ip_* methods"
Merge "Remove race condition (in FloatingIps)"
Merge "nova coverage creates lots of empty folders"
Merge "fix broken WSDL logic"
Update hypervisor_hostname after live migration

After a live migration, the OS-EXT-SRV-ATTR:hypervisor_hostname
attribute of the instance is not updated correctly.  This change
adds a parameter to the call to _instance_update that fixes the
problem.

Fixes bug 1173376

Change-Id: I40f1ead2d93c7a9979a914e0fb96e3e5bb287b48
Merge "Update oslo-incubator import."
Merge "Update our import of oslo's processutils."
Being more defensive around the use_ipv6 config option

fixes bug 1175725

Will allow for the flag to be set to filter out ipv6 if
configured but will not add ipv6 to template if ipv6 is not
configured in quantum. This will allow spwan to continue
working in the case where ipv6 is not configured but flag
use_ipv6 is set in nova.

Change-Id: I26ebdff81efcdeff827521cec247d2c443a5e0ad
Merge "Adds --addn-hosts to the dnsmasq arg list"
Import latest log module from oslo

Deprecates log_format in favor of the formatting options used by the
context aware formatter, such as logging_default_format_string.

Changes the default logging formatter back to a colorful and context
aware formatter.  The default was inadvertently changed in the great
oslo sync at the start of Havana, this returns it to what was in at the
end of Grizzly.

Adds support for lazy instantiation of the logger.

Bug 1167081
Bug 1165211

Change-Id: Ibe41afc6e9d7b432453785819821b3c8f0078613