Merge "Fixes typos in the files in the nova folder"
Merge "Xenapi: set hostname when performing a network reset"
Merge "Remove instance_info_cache_update() from conductor"
Merge "VMware tests: replace assertEquals with assertEqual"
xenapi: make _migrate_disk_resizing_up use @step

Make use of the step decorator into _migrate_disk_resizing_up to make it
more consistent with _migrate_disk_resizing_up.

Also add some extra unit tests to help lock down this process with unit
tests.

Part of blueprint xenapi-migrate-ephemeral-disks
Change-Id: I395b8e27380649c667bb8d891802532ee3ab746b
xenapi: revert on _migrate_disk_resizing_up error

_migrate_disk_resizing_up now follows similar pattern to
_migrate_disk_resizing_down.

This involves using the @step decorator to report progress and rolling
back if any errors occur while migrating the disks to the destination
host.

Part of blueprint xenapi-migrate-ephemeral-disks
Change-Id: I2557357a4f3502f991a5d187c2ecf7ffeb22286e
xenapi: simplify _migrate_disk_resizing_up

Previously it called get_vdi_for_vm_safely but there was no need,
because we already get all the VDI information we need from
snapshot_attached_here.

This will make it easer to expand the method to include the migration of
ephemeral disks.

Part of blueprint xenapi-migrate-ephemeral-disks
Change-Id: I4e0dd1a875ee7e194d38016ff49296a360627aea
Remove unnecessary "LOG.error()" statement

Removes apparent debug statement left in from
Ifd41886b9bc7dff01cdf741a833946bed1bdddc

Fixes-Bug: #1239603
Change-Id: I9c5b9a6b2349a6c62bef2974ab3b0bb986533741
Sanitize passwords when logging payload in wsgi

adminPass (or admin_pass) can be either part of a json object or
an xml element or xml attribute. The patch includes
regexps to support all these cases and adds tests
as well

Change-Id: Ic119f986a03863c1d13b566b4c005f3bc77d83d0
Closes-Bug: 1231263
Handle MarkerNotFound better in Flavor API

When the specified marker is not found, we should catch the
MarkerNotFound exception and respond with a HTTP 400 Bad
Request with sufficient information back to the user. This
will avoid spilling unwanted tracebacks in the logs as well.

Change-Id: I90a658384f8814096271a193a0f3abd028062b5d
Partial-Bug: 1238519
Harden version checking for boto

Simple string comparison is not effective for version checking.
Let's switch to using pkg_resources.parse_version and compare
the tuples. Per review feedback, enabling the code path for
2.13 as well. Originally we had handled this by excluding
2.13 from requirements. With this we should be able to removing
the exclusion for 2.13 from global requirements.

Change-Id: Ie047f7201d8e6a9a9641000d387c4312506f49b1
Closes-Bug: #1239220
populate local-ipv4 address in config drive

Currently the ec2 metadata in config drive does not include the
local-ipv4 address, because the address is not passed in when using
config drive.

This change uses the fixed_ips in network_info to populate the address
if the address was not passed in.

Fixes bug 1221664
Change-Id: I1b289bbbd7ebe103342909079d2488cf1dfbf472
xenapi: stop using get_all_vdis_in_sr in spawn

Currently when trying to find a cached image, the very expensive call to
get_all_vdis_in_sr is used, where we could instead fetch the VDI
directly using a more targeted query.

Now we are fetching the VDI by name_label we must ensure to clear the
name_label on newly created VDIs to ensure they do not get picked up by
later calls to _find_cached_image().

Fixes bug 1221292

The above code that checks for _find_cached_images has race conditions
where its possible to end up with two VDIs returned. To stop this
happening the code to create the cached images is now synchronized on
the image being fetched.

Fixes bug 1226073

Change-Id: I534fb8f42b00b5d39dc17dd5fee297144b5f379a
xenapi: removes sleep after final upload retry

This change removes the sleep that happens after the final retry of
uploading an image.

This change also ensures the unit tests do not take too long by stubbing
out time.sleep.

Closes bug 1239707
Change-Id: I16b6639e3231d41fa476218f406fa5b3abdfaf71
Fix NovaObject versioning attribute usage

A typo made early in the object prototyping process has meant that
all objects thus far have been exposing a version of '1.0' because
the base object has been using an attribute of 'version'. The
object implementations have been exposing a 'VERSION' attribute
with their desired version advertisement.

Since we are still relatively early in the process of deploying
objects, the impact from this should be relatively minor, although
it is important to get this fixed ASAP before any incompatible
object changes are made.

Change-Id: If9154dc663111f304f72ef7f6f37c465e84ff504
Closes-bug: #1239709
Merge "Use the oslo fixture module"
Merge "Harden version checking for boto"
xenapi: stop agent errors stopping build

We should still report agent errors, but they should not stop a server
from building, because that server still may be ready to use.

Once this change is in place, we can look to selectively add back in
certain errors that fail the build, as we decide what makes sense on a
case by case basis.

Fixes bug 1233548
Change-Id: I32b9e8dbc6e28a045ac8ef159afe1cf74b7ac6fb
Improve logging messages in libvirt driver

This is a trivial change to correct an uninformative log message.
There are two checks in get_instance_disk_info that look at a disk.
One checks for the type of a disk and logs its path if it is not a file.
The other checks for the path and logs the instance name it belongs to
if it does not exist. The first will log None if the path does not exist,
so reverse the order of the checks.

Closes-Bug: #1239747
Change-Id: Ieb52ba0584ad789dc55f40e0172cf5ed41e86fbe
Merge "Fix NovaObject versioning attribute usage"