diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-09 02:36:08 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-09 02:36:08 -0700 |
| commit | 37a876c5bcbf5b90b91c406d0b42629bf607c032 (patch) | |
| tree | 460e3158fa9d10d5899d8a4faf87c6acd7a77beb | |
| parent | 010a1d2b49f50d7cd763b3789bfd2d6789e2279b (diff) | |
| parent | 20656789e919f36733ac9fd0766a56a1c96d1e34 (diff) | |
merged orm
| -rw-r--r-- | nova/compute/manager.py | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 7f6b49f90..4b29add2d 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -60,7 +60,7 @@ class ComputeManager(manager.Manager): # FIXME(ja): include other fields from state? instance_ref = self.db.instance_get(context, instance_id) state = self.driver.get_info(instance_ref.name)['state'] - self.db.instance_state(context, instance_id, state) + self.db.instance_set_state(context, instance_id, state) @defer.inlineCallbacks @exception.wrap_exception @@ -77,10 +77,10 @@ class ComputeManager(manager.Manager): {'host': self.host}) # TODO(vish) check to make sure the availability zone matches - self.db.instance_state(context, - instance_id, - power_state.NOSTATE, - 'spawning') + self.db.instance_set_state(context, + instance_id, + power_state.NOSTATE, + 'spawning') try: yield self.driver.spawn(instance_ref) @@ -89,7 +89,9 @@ class ComputeManager(manager.Manager): except Exception: # pylint: disable-msg=W0702 logging.exception("instance %s: Failed to spawn", instance_ref['name']) - self.db.instance_state(context, instance_id, power_state.SHUTDOWN) + self.db.instance_set_state(context, + instance_id, + power_state.SHUTDOWN) self._update_state(context, instance_id) @@ -105,10 +107,10 @@ class ComputeManager(manager.Manager): raise exception.Error('trying to destroy already destroyed' ' instance: %s' % instance_id) - self.db.instance_state(context, - instance_id, - power_state.NOSTATE, - 'shutting_down') + self.db.instance_set_state(context, + instance_id, + power_state.NOSTATE, + 'shutting_down') yield self.driver.destroy(instance_ref) now = datetime.datetime.now() self.db.instance_update(None, instance_id, {'terminated_at': now}) @@ -132,10 +134,10 @@ class ComputeManager(manager.Manager): power_state.RUNNING)) logging.debug('instance %s: rebooting', instance_ref['name']) - self.db.instance_state(context, - instance_id, - power_state.NOSTATE, - 'rebooting') + self.db.instance_set_state(context, + instance_id, + power_state.NOSTATE, + 'rebooting') yield self.driver.reboot(instance_ref) self._update_state(context, instance_id) |