diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-09 02:17:43 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-09 02:17:43 -0700 |
| commit | 0054b12397a3962ef019a33264a8fb136f183abb (patch) | |
| tree | 17660d0609722f8a48e8b2612f7567be5f2d8766 | |
| parent | 37ca50b1731a975d3106af05cd46b02d3f7a2a06 (diff) | |
| parent | 4a1c4a4925e427c639419e87e912b08fd41d7f74 (diff) | |
merged orm
| -rw-r--r-- | nova/db/api.py | 4 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index 05fc5b777..59313b0af 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -230,9 +230,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): diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index fa9c77181..f777dcc69 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -306,7 +306,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: |