From 1ecd9b3d00f002799a9eab92f0179dcbea8b8c37 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 31 Mar 2011 14:15:42 -0400
Subject: adding 'building' power state; testing for 409 from OSAPI when
 rebuild requested on server being rebuild

---
 nova/compute/api.py         |  6 ++++++
 nova/compute/power_state.py | 21 ++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 43f972882..32b283d31 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -34,6 +34,7 @@ from nova import rpc
 from nova import utils
 from nova import volume
 from nova.compute import instance_types
+from nova.compute import power_state 
 from nova.scheduler import api as scheduler_api
 from nova.db import base
 
@@ -488,6 +489,11 @@ class API(base.Base):
     def rebuild(self, context, instance_id, image_id, metadata=None):
         """Rebuild the given instance with the provided metadata."""
 
+        instance = db.api.instance_get(context, instance_id)
+        if instance["state"] == power_state.BUILDING:
+            msg = _("Instance already building")
+            raise exception.BuildInProgress(msg)
+
         metadata = metadata or []
         self._check_metadata_quota(context, metadata)
         self._check_metadata_item_length(context, metadata)
diff --git a/nova/compute/power_state.py b/nova/compute/power_state.py
index ef013b2ef..c468fe6b3 100644
--- a/nova/compute/power_state.py
+++ b/nova/compute/power_state.py
@@ -30,20 +30,23 @@ SHUTOFF = 0x05
 CRASHED = 0x06
 SUSPENDED = 0x07
 FAILED = 0x08
+BUILDING = 0x09
 
 # TODO(justinsb): Power state really needs to be a proper class,
 # so that we're not locked into the libvirt status codes and can put mapping
 # logic here rather than spread throughout the code
 _STATE_MAP = {
-        NOSTATE: 'pending',
-        RUNNING: 'running',
-        BLOCKED: 'blocked',
-        PAUSED: 'paused',
-        SHUTDOWN: 'shutdown',
-        SHUTOFF: 'shutdown',
-        CRASHED: 'crashed',
-        SUSPENDED: 'suspended',
-        FAILED: 'failed to spawn'}
+    NOSTATE: 'pending',
+    RUNNING: 'running',
+    BLOCKED: 'blocked',
+    PAUSED: 'paused',
+    SHUTDOWN: 'shutdown',
+    SHUTOFF: 'shutdown',
+    CRASHED: 'crashed',
+    SUSPENDED: 'suspended',
+    FAILED: 'failed to spawn',
+    BUILDING: 'building',
+}
 
 
 def name(code):
-- 
cgit 


From 59e8112994e293fa1155b703abcc3e33d7cfc6c7 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 31 Mar 2011 14:35:25 -0400
Subject: pep8

---
 nova/compute/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 32b283d31..17bec2545 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -34,7 +34,7 @@ from nova import rpc
 from nova import utils
 from nova import volume
 from nova.compute import instance_types
-from nova.compute import power_state 
+from nova.compute import power_state
 from nova.scheduler import api as scheduler_api
 from nova.db import base
 
-- 
cgit