Comment 14 for bug 1570748

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to nova (stable/kilo)

Reviewed: https://review.openstack.org/309168
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=7e3d3abf50732a8dd9350a1ab65376780e7ee0bd
Submitter: Jenkins
Branch: stable/kilo

commit 7e3d3abf50732a8dd9350a1ab65376780e7ee0bd
Author: Dan Smith <email address hidden>
Date: Mon Apr 18 12:40:54 2016 -0700

    Fix reverse_upsize_quota_delta attempt to look up deleted flavors

    When we did the "great flavor migration of 2015" we missed a quota method
    which still looks up flavors by id from the migration. Now that flavors
    are moved to the api database and actually removed when deleted, this no
    longer works. The problem manifests itself as a failure when trying to
    revert a migration or resize operation when the original flavor has been
    deleted.

    Conflicts:
            nova/compute/api.py
            nova/compute/utils.py
            nova/tests/unit/compute/test_compute_api.py
            nova/tests/unit/compute/test_compute_utils.py

    NOTE(mriedem): The conflicts are due to _reverse_upsize_quota_delta
    being moved from nova.compute.api to nova.compute.utils in liberty
    in commit 60411ddf1bada3629f0588de8726c63b5ab00357. So the
    nova.compute.utils changes are omitted here. Also, there was no direct
    testing of _reverse_upsize_quota_delta until that change in liberty
    so as part of this cherry pick we pull back the test_reverse_quota_delta
    test. It's modified slightly since it's in a NoDBTestCase.

    Change-Id: I5f95021410a309ac07fe9f474cbcd0214d1af208
    Closes-Bug: #1570748
    (cherry picked from commit a46e847aad4ee7edbb63eb08f97f6635e6c9ccb0)
    (cherry picked from commit 30aad1e796778a94da7719b1d4586bd3cdecb821)
    (cherry picked from commit 5374568fadebf639886febe6073baf352c2a9d83)