Updated openstack/openstack
Project: openstack/keystone  76ef2a87db593d5ecc74ed41cd8578ca1f318bfb
null
revert deprecation of v2 API

For more info, see the openstack-dev mailing list:

    http://lists.openstack.org/pipermail/openstack-dev/2014-March/031016.html

Related Blueprint:

    https://blueprints.launchpad.net/keystone/+spec/deprecate-v2-api

Change-Id: Ic160da00f1c2fbcf0589b3e1c6c93f53a4e67b72
Updated openstack/openstack
Project: openstack/nova  78ae54825521fef2246914afb1772a023d2abded
null
Don't attempt to fill faults for instance_list if FlavorNotFound

When getting a list of servers with details, if a FlavorNotFound is
raised from the compute API the local instance_list variable is set to
an empty list, but later instance_list.fill_faults() is called on it
assuming it is an InstanceList object, which will cause an
AttributeError.

This patch just checks to see if instance_list is empty before calling
fill_faults since InstanceList.fill_faults assumes the list is not empty
when called, so it's not trivial to simply create an empty InstanceList
here and set it to the instance_list variable.

The new test cases use testtools.matchers.HasLength and while seeing
if testtools was imported I noticed it (along with mox) was in the
wrong import group, so also fixed the order there.

This patch also fixes the test_get_server_details_empty unit test to
actually call the detail method rather than index.

Closes-Bug: #1296940

Change-Id: I9f85c2a0b70f41e5bba2da05a2339caf2a8efc3e