diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-28 05:55:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-28 05:55:59 +0000 |
| commit | bad0a496c0e765da3cc879235c988b7cc617f367 (patch) | |
| tree | beecb24d030cf4d67585211028d83337e95cbd2c | |
| parent | cb2bb9f0f60f3fe80ac9cbab832022f925df81b4 (diff) | |
| parent | 2740ef8f31a98a9b1486af344ef8cb3399e68aa0 (diff) | |
Merge "Fix state logic for auto-confirm resizes"
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 9e6407bbf..f41b20a97 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2517,7 +2517,7 @@ class ComputeManager(manager.SchedulerDependentManager): instance=instance) continue if instance['vm_state'] != vm_states.RESIZED \ - and instance['task_state'] != None: + or instance['task_state'] is not None: state = instance['vm_state'] reason = _("In %(state)s vm_state, not RESIZED") _set_migration_to_error(migration_id, reason % locals(), diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index ca595ee6e..40f053cc7 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -1954,16 +1954,19 @@ class ComputeTestCase(BaseTestCase): 'task_state': None}, {'uuid': 'fake_uuid3', 'vm_state': vm_states.ACTIVE, 'task_state': task_states.REBOOTING}, - {'uuid': 'fake_uuid4', 'vm_state': vm_states.ACTIVE, + {'uuid': 'fake_uuid4', 'vm_state': vm_states.RESIZED, 'task_state': None}, {'uuid': 'fake_uuid5', 'vm_state': vm_states.ACTIVE, - 'task_state': None}] + 'task_state': None}, + {'uuid': 'fake_uuid6', 'vm_state': vm_states.RESIZED, + 'task_state': 'deleting'}] expected_migration_status = {'fake_uuid1': 'confirmed', 'noexist': 'error', 'fake_uuid2': 'error', 'fake_uuid3': 'error', 'fake_uuid4': None, - 'fake_uuid5': 'confirmed'} + 'fake_uuid5': 'error', + 'fake_uuid6': 'error'} migrations = [] for i, instance in enumerate(instances, start=1): migrations.append({'id': i, |