Fixes inconsistency in flavors list with marker

Flavors list with marker is supposed to use flavorid as the marker since this is
the only id attribute the users can see, but it was using id (the confusion was
probably caused by the fact that flavorid attribute shows up to the user as id).

The change on db unit test shows makes the bug evident, and justify the changes
on the filter_by criteria.

Fixes bug 1226698

Change-Id: I3ffa636febb63be796fffc94be6486bf74e8239b
Move `utils.hash_file` -> `imagecache._hash_file`

`hash_file` is only used by `imagecache` so it doesn't make sense (yet) for it
to be included in utils.

Change-Id: I2f4d1deb03e4afceb911ef4b6d6ae6760ddca225
Fixes typos in the files in the nova folder

blueprint fix-nova-typos

Change-Id: I0971b98999381183c0c77fff1d569180606e338b
Fixes typos in nova/db code

blueprint fix-nova-typos

Change-Id: Ie2e9447790468aee14c6baee679c53d183c69f62
Fixes typo in ListTargets CLI in hyperv driver

Closes-bug: 1237432
Change-Id: Ie7b4cd744e2a4869a84ab42ad1a434628e39a3e6
VMware tests: replace assertEquals with assertEqual

In Python 2.6, both assertEqual and assertEquals are
convenience aliases to failUnlessEqual.

In Python 3, failUnlessEqual is explicitly deprecated.

This is part of blueprint assertequal

Change-Id: I4121817277c11e82e0ed63ef8bd1c1e4c951a018
hyperv tests: replace assertEquals with assertEqual

In Python 2.6, both assertEqual and assertEquals are
convenience aliases to failUnlessEqual.

In Python 3, failUnlessEqual is explicitly deprecated.

This is part of blueprint assertequal

Change-Id: I9c61bb5b3b6bd40018371aa5f17a3a96cff41a55
Log which filter failed when on log level INFO

If log level is set to INFO,only see a log message about nova-schedule
attempting to build n instances then a log message about setting the
state to error when the scheduler fails to schedule an instance due to
a filter returning 0 hosts.It may be useful to see which filterreturns 0
host for operator.

Close-bug: #1226334

Change-Id: I7564a8ab093895d1f9db357009aac294783a808b
VMware: fix regression attaching iscsi cinder volumes

VMware drivers fail to attach a iSCSI backed cinder volume with an
error 'unable to find iscsi targets' because the underlying
retrieval api was updated to a newer version but not it's usage in
volume_util (see commit e331287cdd1300878bfb9bbb3630889370e5fa72).
This is a regression over Grizzly release.

Fixes: bug #1193980

Change-Id: Ic2d1dc800fa10295a4d7312fbeeaa0e16d792755
Xenapi: set hostname when performing a network reset

The hostname is removed from the metadata on Xen to address an
issue where windows instances get renamed on reboot. This
becomes a problem when a network reset is called for instances
using the agent communication mechanism. In that case the
agent will incorrectly rename the host. Thus the
hostname needs to be set prior and cleared after a network reset.

The setting of the metadata params also need to be atomic so
locking was added that matches to the locking provided by
other data (network metadata).

Fixes bug 1236877

Change-Id: I473870994c826f85a7c6ec1448171c4e4ee40ff0
Add test_instance_get_active_by_window_joined

This adds a unit test for previous untested method
nova.db.sqlalchemy.instance_get_active_by_window_joined

Change-Id: Ib5826b34bba8e93d2966963c696a20df29501771
compute api should throw exception if soft reboot invalid state VM

When user perform soft reboot to a VM which in suspended/paused/
stopped/error state, nova compute api should throw exception for
such state.

Change-Id: Ic365c6360f6b7407d9de0dac6ff1093484692cf4
Closes-Bug: #1236930
Remove instance_info_cache_update() from conductor

After network api was converted to use InfoCache object it no longer
depends on the conductor instance_info_cache_update() method.

This change removes this method from conductor and in addition removes
conductor parameter in calls to network api from within compute manager,
previously needed by the @refrech_cache() decorator in network api for
its calls to this same conductor method.

Change-Id: I5bb535062b5f5948e2b6ba1daa089f3d93471394
Fix vmwareapi driver get_diagnostics calls

The vmware driver is calling vmops.get_info for both the get_info and
get_diagnostics APIs which is wrong since they should be returning
different information.  Given the hypervisor support matrix doesn't list
the vmware driver as supporting the nova diagnostics API, it seems this
was just an oversight.

This patch changes the driver code to call the vmops.get_diagnostics
method which raises NotImplementedError.  It also fixes the tests to
actually ensure covers get_diagnostics for both the ESX driver and the
VC driver.

Closes-Bug: #1237622

Change-Id: I0c9015f1f7d5dd219548196de479e87e878ea0fd
Imported Translations from Transifex

Change-Id: Ic8c3db69dde877030740a0a0df8e2f341addde34
Merge "Add test_instance_get_active_by_window_joined"
Merge "Imported Translations from Transifex"
Merge "VMware: fix regression attaching iscsi cinder volumes"
Merge "compute api should throw exception if soft reboot invalid state VM"
Merge "Fix vmwareapi driver get_diagnostics calls"