diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-12-20 18:49:47 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-12-20 20:35:16 +0000 |
| commit | 5895a74c8b90f9b5436d0961d3b2b319f64bc826 (patch) | |
| tree | fa3013ff37aa696b1d7aebea64e50b526cc3d0c2 | |
| parent | 536c6133a3facb56e58b2fe5b5417385d4954ae5 (diff) | |
Consistently use REBUILDING vm_state
There is both a vm_state and task_state called REBUILDING, which was
used inconsistently. This resulted in a rebuild action returning
"ACTIVE" for the status instead of "REBUILD" like the API
documentation states.
This change drops the task_state in favor of making all of the code
use vm_state
Change-Id: I56b4b6fd4d02b75c6270fc91cdec1902e7794cf1
| -rw-r--r-- | nova/compute/api.py | 4 | ||||
| -rw-r--r-- | nova/compute/task_states.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_compute.py | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 2e44c40fa..5a8756fd7 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1210,8 +1210,8 @@ class API(base.Base): metadata=metadata, display_name=name, image_ref=image_href, - vm_state=vm_states.ACTIVE, - task_state=task_states.REBUILDING, + vm_state=vm_states.REBUILDING, + task_state=None, progress=0) rebuild_params = { diff --git a/nova/compute/task_states.py b/nova/compute/task_states.py index c6016b509..795213be0 100644 --- a/nova/compute/task_states.py +++ b/nova/compute/task_states.py @@ -43,8 +43,6 @@ RESIZE_REVERTING = 'resize_reverting' RESIZE_CONFIRMING = 'resize_confirming' RESIZE_VERIFY = 'resize_verify' -REBUILDING = 'rebuilding' - REBOOTING = 'rebooting' REBOOTING_HARD = 'rebooting_hard' PAUSING = 'pausing' diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 8791e009d..efb3f70ed 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1600,7 +1600,7 @@ class ComputeAPITestCase(BaseTestCase): self.compute_api.rebuild(self.context, instance, image_ref, password) instance = db.instance_get_by_uuid(self.context, instance_uuid) - self.assertEqual(instance['task_state'], task_states.REBUILDING) + self.assertEqual(instance['vm_state'], vm_states.REBUILDING) db.instance_destroy(self.context, instance_uuid) |