From 4a1c4a4925e427c639419e87e912b08fd41d7f74 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 9 Sep 2010 02:16:06 -0700 Subject: consistent naming for instance_set_state --- nova/db/api.py | 4 ++-- 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 391892214..8b94f6036 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -296,7 +296,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: -- cgit