openstack/nova
Code Issues Proposed changes

merged orm

Browse Source
This commit is contained in:
Vishvananda Ishaya 2010-09-09 02:17:10 -07:00
commit 68309b148f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/db/api.py
View File

@ -264,9 +264,9 @@ def instance_is_vpn(context, instance_id):
return IMPL.instance_is_vpn(context, instance_id)
def instance_state(context, instance_id, state, description=None):
def instance_set_state(context, instance_id, state, description=None):
"""Set the state of an instance."""
return IMPL.instance_state(context, instance_id, state, description)
return IMPL.instance_set_state(context, instance_id, state, description)
def instance_update(context, instance_id, values):

2
nova/db/sqlalchemy/api.py
View File

@ -378,7 +378,7 @@ def instance_is_vpn(context, instance_id):
return instance_ref['image_id'] == FLAGS.vpn_image_id
def instance_state(context, instance_id, state, description=None):
def instance_set_state(context, instance_id, state, description=None):
# TODO(devcamcar): Move this out of models and into driver
from nova.compute import power_state
if not description: