diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-06-19 09:43:54 -0700 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-06-20 15:30:48 -0700 |
| commit | ff4194bec79067bf77ab25caec1e40ad3709ea07 (patch) | |
| tree | 12e636d1d482936890c8b28db7c9f3898fdd6972 /nova/tests | |
| parent | d26581d93945c8a44212e98508c26ff71b10f05e (diff) | |
Make _poll_unconfirmed_resizes() use objects
This makes the _poll_unconfirmed_resizes() periodic task use
objects for looking up the instance state information.
This patch also makes compute_confirm_resize() take instance
objects. Although this method will be obsolete after a full
conversion to objects, this makes it send a full instance object
to the conductor manager, which is then converted to a dict for
passing to compute_api (for now). This will allow a more complete
conversion of the use of it to objects, and then the dict hack
will be removed when the method itself goes away.
Related to blueprint unified-object-model
Change-Id: I03c1a28a1bbd9732f803e140e93d214dd5c7792e
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index dc828cef8..928934f61 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -4441,19 +4441,27 @@ class ComputeTestCase(BaseTestCase): self.assertTrue(instance) def test_poll_unconfirmed_resizes(self): - instances = [{'uuid': 'fake_uuid1', 'vm_state': vm_states.RESIZED, - 'task_state': None}, - {'uuid': 'noexist'}, - {'uuid': 'fake_uuid2', 'vm_state': vm_states.ERROR, - 'task_state': None}, - {'uuid': 'fake_uuid3', 'vm_state': vm_states.ACTIVE, - 'task_state': task_states.REBOOTING}, - {'uuid': 'fake_uuid4', 'vm_state': vm_states.RESIZED, - 'task_state': None}, - {'uuid': 'fake_uuid5', 'vm_state': vm_states.ACTIVE, - 'task_state': None}, - {'uuid': 'fake_uuid6', 'vm_state': vm_states.RESIZED, - 'task_state': 'deleting'}] + instances = [ + fake_instance.fake_db_instance(uuid='fake_uuid1', + vm_state=vm_states.RESIZED, + task_state=None), + fake_instance.fake_db_instance(uuid='noexist'), + fake_instance.fake_db_instance(uuid='fake_uuid2', + vm_state=vm_states.ERROR, + task_state=None), + fake_instance.fake_db_instance(uuid='fake_uuid3', + vm_state=vm_states.ACTIVE, + task_state= + task_states.REBOOTING), + fake_instance.fake_db_instance(uuid='fake_uuid4', + vm_state=vm_states.RESIZED, + task_state=None), + fake_instance.fake_db_instance(uuid='fake_uuid5', + vm_state=vm_states.ACTIVE, + task_state=None), + fake_instance.fake_db_instance(uuid='fake_uuid6', + vm_state=vm_states.RESIZED, + task_state='deleting')] expected_migration_status = {'fake_uuid1': 'confirmed', 'noexist': 'error', 'fake_uuid2': 'error', |