← Back to branch summary

~0x44/nova/bug838466

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/db/sqlalchemy/api.py

Committer: Vishvananda Ishaya
Date: 2010-09-09 09:16:06 UTC
mto: (237.7.2 manage_floating_ips) (205.1.39 scheduler) (265.2.8 api)
mto: This revision was merged to the branch mainline in revision 275.
Revision ID: vishvananda@yahoo.com-20100909091606-k9eoyygsz7261ya9

consistent naming for instance_set_state

files modified:
nova/db/api.py

nova/db/sqlalchemy/api.py

Show diffs side-by-side

added added

removed removed

nova/db/sqlalchemy/api.py

296

296

return instance_ref['image_id'] == FLAGS.vpn_image_id

297

297

298

298

299

def instance_state(context, instance_id, state, description=None):

299

def instance_set_state(context, instance_id, state, description=None):

300

300

# TODO(devcamcar): Move this out of models and into driver

301

301

from nova.compute import power_state

302

302

if not description:

Older »