Comment 13 for bug 1785339

Reviewed: https://review.openstack.org/605880
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=c4ea58eb867ee90785101663325a92f1d771842a
Submitter: Zuul
Branch: stable/ocata

commit c4ea58eb867ee90785101663325a92f1d771842a
Author: Matt Riedemann <email address hidden>
Date: Fri Aug 3 19:11:37 2018 -0400

    Update RequestSpec.flavor on resize_revert

    Since I8abdf58a6537dd5e15a012ea37a7b48abd726579 in Newton
    we update the RequestSpec.flavor to the new flavor during
    a resize. However, if the resize is reverted, we didn't
    revert the RequestSpec.flavor to the previous flavor
    on the instance, which could cause issues later when
    moving the instance since the scheduler will get a
    RequestSpec with a flavor that doesn't match the actual
    flavor on the instance.

    This fixes the bug by updating the RequestSpec.flavor
    with instance.old_flavor on resize_revert in the API.
    Functional test wrinkles are added.

    This fix was ported from the starlingx-staging/stx-nova
    repo commit 71acfeae0.

    Conflicts:
          nova/compute/api.py
          nova/tests/functional/test_servers.py
          nova/tests/unit/compute/test_compute_api.py

    NOTE(mriedem): The compute API conflict is due to not
    having change I9269ffa2b80e48db96c622d0dc0817738854f602
    in Ocata. The unit test conflict was due to mox->mock
    conversion in Pike. The functional test changes didn't
    even exist in Ocata because they were introduced in Pike
    with change If7b02bcd8d77e94c7fb42b721792c1391bc0e3b7
    and wouldn't apply to Ocata, so they are removed here.

    Change-Id: Ic6e74702f2a5b57b437f4ffdfbc86c1e34cdac7d
    Closes-Bug: #1785339
    (cherry picked from commit ef3849e2da1c94df519debcb14ba15af9bd01a60)
    (cherry picked from commit 9125fc7caf68fcecea47a3f0ac5068cf44a97821)
    (cherry picked from commit f2d2a9a7c538f87775092c6cbf3b03b463cbdc2a)
    (cherry picked from commit 556079a33997958d26fb7f03946998a6b06f488c)