This lays the groundwork for ConductorTaskTestCase to run
with two cells which is needed for an upcoming fix.
As a result, some mocks needed to be removed for targeting
a cell context, but we still assert a targeted context is
used where necessary, just in a different way. Some other
DB-hitting operations needed to be mocked out in the unshelve
tests since the instance being worked on isn't actually in
a database, and these should have probably been mocked out
anyway.
Change-Id: I6548548825c00a71f3d317ceb37be26da312be31
Related-Bug: #1715493
(cherry picked from commit bcd1f1d8c833c4c12399ba84934a9a72a2bde122)
Reviewed: https:/ /review. openstack. org/501819 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=72e50bedd65 787ebbfddf41759 babebcb281e7fb
Committed: https:/
Submitter: Jenkins
Branch: stable/pike
commit 72e50bedd65787e bbfddf41759babe bcb281e7fb
Author: Matt Riedemann <email address hidden>
Date: Wed Sep 6 21:29:25 2017 -0400
Make ConductorTaskTe stCase run with 2 cells
This lays the groundwork for ConductorTaskTe stCase to run
with two cells which is needed for an upcoming fix.
As a result, some mocks needed to be removed for targeting
a cell context, but we still assert a targeted context is
used where necessary, just in a different way. Some other
DB-hitting operations needed to be mocked out in the unshelve
tests since the instance being worked on isn't actually in
a database, and these should have probably been mocked out
anyway.
Change-Id: I6548548825c00a 71f3d317ceb37be 26da312be31 12399ba84934a9a 72a2bde122)
Related-Bug: #1715493
(cherry picked from commit bcd1f1d8c833c4c