summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-06-24 04:11:57 +0100
committerandy <github@anarkystic.com>2010-06-24 04:11:57 +0100
commitbb2af5d05e1d5aae3ac643ea110cf51c9702b37c (patch)
treeeb0d03b9c5a9d31a8b89a2495f98c5ec652fc63d
parentf7464875752b60b1c1713d7034478bc5e6b83aac (diff)
downloadnova-bb2af5d05e1d5aae3ac643ea110cf51c9702b37c.tar.gz
nova-bb2af5d05e1d5aae3ac643ea110cf51c9702b37c.tar.xz
nova-bb2af5d05e1d5aae3ac643ea110cf51c9702b37c.zip
fix default state to be 0 instead of pending
-rw-r--r--nova/compute/model.py7
-rw-r--r--nova/datastore.py7
2 files changed, 8 insertions, 6 deletions
diff --git a/nova/compute/model.py b/nova/compute/model.py
index 14f2461da..6477ac571 100644
--- a/nova/compute/model.py
+++ b/nova/compute/model.py
@@ -115,7 +115,8 @@ class Instance(object):
if self.state:
self.initial_state = self.state
else:
- self.state = {'state': 'pending',
+ self.state = {'state': 0,
+ 'state_description': 'pending',
'instance_id': instance_id,
'node_name': 'unassigned',
'project_id': 'unassigned',
@@ -138,13 +139,13 @@ class Instance(object):
for item in self.keys():
copyDict[item] = self[item]
return copyDict
-
+
def get(self, item, default):
return self.state.get(item, default)
def update(self, update_dict):
return self.state.update(update_dict)
-
+
def setdefault(self, item, default):
return self.state.setdefault(item, default)
diff --git a/nova/datastore.py b/nova/datastore.py
index 61e507cd1..ce9a85ef4 100644
--- a/nova/datastore.py
+++ b/nova/datastore.py
@@ -76,19 +76,20 @@ class RedisModel(object):
self.set_default_state()
def set_default_state(self):
- self.state = {'state' : 'pending',
+ self.state = {'state': 0,
+ 'state_description': 'pending',
'node_name': 'unassigned',
'project_id': 'unassigned',
'user_id': 'unassigned'}
self.state[self.object_type+"_id"] = self.object_id
self.state["create_time"] = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())
-
+
@property
def project(self):
if self.state.get('project_id', None):
return self.state['project_id']
return self.state.get('owner_id', 'unassigned')
-
+
@property
def __redis_key(self):
""" Magic string for keys """