Comment 4 for bug 1572246

Reviewed: https://review.openstack.org/308137
Committed: https://git.openstack.org/cgit/openstack/horizon/commit/?id=e9b83684d2ff19afb1bceefc78b6461d51f437e9
Submitter: Jenkins
Branch: stable/mitaka

commit e9b83684d2ff19afb1bceefc78b6461d51f437e9
Author: David Lyle <email address hidden>
Date: Tue Apr 19 14:20:17 2016 -0600

    Fix tests broken by novaclient 4.0.0 release

    The release of python-novaclient 4.0.0 removed both volume_types
    and volume_snapshots from the v2 namespace. Both of these data types
    are supplied by cinder, but the Horizon test data was still populating
    them in nova test data and the tests were using the nova values.

    This patch removes the missing namespace references and replaces
    the mocked test data with those mocked for cinder.

    Additionally, the change exposed a rather broken test in the QoS
    for volume_types test suite. This test has been fixed and improved
    to exercise more branches.

    This fix will unblock the gate for Horizon.

    Closes-Bug: #1572246
    (cherry picked from commit 5d6003971f1c41abecd19c40b1384f9efa5210de)

    A merge conflict was resolved when cherry picking this change from the
    master branch due to commit fd92d8ec59c2f4d91f4a1c5463d95d1237f07b21.

    Conflicts:
     openstack_dashboard/dashboards/project/volumes/volumes/tests.py

    Change-Id: I9604cd4046a5ab1486373d0572ddf504d4691196