diff options
| -rw-r--r-- | nova/compute/model.py | 7 | ||||
| -rw-r--r-- | nova/datastore.py | 7 |
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 """ |