Allow confirm_resize action on an instance in 'deleting' status

[Aditi Raveesh]

Deleting an instance in 'resized' state fails with UnexpectedTaskStateError.
Steps to reproduce:
1. Resize an instance - Instance goes to 'resized' state
2. Delete the instance

The failure occurs because the delete method sets the task_state to 'deleting' and then tries to do a confirm_resize on the instance. Here, the task state check fails. (Expected task state is None, but actually is in 'deleting' state)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/32689

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/32689
Committed: http://github.com/openstack/nova/commit/0fed513b695cd15aaca24d24926a1c7d13e63509
Submitter: Jenkins
Branch: master

commit 0fed513b695cd15aaca24d24926a1c7d13e63509
Author: Aditi Raveesh <email address hidden>
Date: Wed Jun 12 11:30:47 2013 +0530

    Allow confirm_resize if instance is in 'deleting' status

    Deleting an instance puts it into 'deleting' task_state.
    If the instance is in 'resized' vm_status, this tries a
    confirm_resize on the instance. confirm_resize currently expects
    the task_state to be None. It should instead expect
    None/deleting task_state.

    Fixes bug: 1189391

    Change-Id: I6a3f82eab9ed2242bfd38bc1ac760dbb4b3d8c4a

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/grizzly
Review: https://review.openstack.org/33825

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/33825
Committed: http://github.com/openstack/nova/commit/f89b19b96bb6dab266c741d39f637dd66eb1c8be
Submitter: Jenkins
Branch: stable/grizzly

commit f89b19b96bb6dab266c741d39f637dd66eb1c8be
Author: Aditi Raveesh <email address hidden>
Date: Wed Jun 12 11:30:47 2013 +0530

    Allow confirm_resize if instance is in 'deleting' status

    Deleting an instance puts it into 'deleting' task_state.
    If the instance is in 'resized' vm_status, this tries a
    confirm_resize on the instance. confirm_resize currently expects
    the task_state to be None. It should instead expect
    None/deleting task_state.

    Fixes bug: 1189391

    Conflicts:
            nova/tests/compute/test_compute.py

    Change-Id: I6a3f82eab9ed2242bfd38bc1ac760dbb4b3d8c4a
    (cherry picked from commit 0fed513b695cd15aaca24d24926a1c7d13e63509)