Needs passing the right project/user id to rollback methods in conductor.manager

[Liyingjun]

The project/user id of the user is not passed to the quotas.rollback methods in conductor/manager.py if the instance is migrated by admin.
See:
http://git.openstack.org/cgit/openstack/nova/tree/nova/conductor/manager.py#n711
http://git.openstack.org/cgit/openstack/nova/tree/nova/conductor/manager.py#n741

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/82437
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=184399cc864d45df99f1dd50c8aa7c069e526fa6
Submitter: Jenkins
Branch: master

commit 184399cc864d45df99f1dd50c8aa7c069e526fa6
Author: liyingjun <email address hidden>
Date: Sat Mar 22 18:26:08 2014 +0800

    Use correct project/user id in conductor.manager

    The project/user id of the user is not passed to the quotas.rollback
    methods in conductor/manager.py if the instance is migrated by admin.
    This fixes the issue by using the new quotas object to ensure the
    right project/user id.

    Change-Id: Ifdcfb62ed7eb0710bfdd921b0213be240a00345c
    Closes-bug: 1296502

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/83206
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=84e353c48edd6860cc13a45d0663165ba271e1e0
Submitter: Jenkins
Branch: master

commit 84e353c48edd6860cc13a45d0663165ba271e1e0
Author: Matt Riedemann <email address hidden>
Date: Tue Mar 25 22:28:10 2014 -0700

    Make quota rollback checks more robust in conductor tests

    The existing cold migrate tests in conductor were mocking out the quota
    object's rollback method but not actually validating that the quota
    object is constructed properly or that the quota.QUOTAS.rollback static
    method was called with the correct project_id and user_id given the
    context and instance being used. This patches makes the tests more
    robust by not just making sure a method is called but that it's called
    correctly.

    Related-Bug: #1296502

    Change-Id: Ib367d728b6bd50998db32d235f41212d0f94a8f7