summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-08-31 10:14:07 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-08-31 10:14:07 -0400
commitc9a6681f484f38778987fbbaa352d07bd8f747c3 (patch)
tree4f6e18c06c7f7d9ee98e2b7101e99e8876939fb1
parentc490b7531edc5f87210c719149d663000e69a0ce (diff)
Removed extraneous import and s/vm_state.STOP/vm_states.STOPPED/
-rw-r--r--nova/db/sqlalchemy/api.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 24e1772f6..631e53ceb 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -28,6 +28,7 @@ from nova import flags
from nova import ipv6
from nova import utils
from nova import log as logging
+from nova.compute import vm_states
from nova.db.sqlalchemy import models
from nova.db.sqlalchemy.session import get_session
from sqlalchemy import or_
@@ -1102,11 +1103,10 @@ def instance_destroy(context, instance_id):
def instance_stop(context, instance_id):
session = get_session()
with session.begin():
- from nova.compute import power_state
session.query(models.Instance).\
filter_by(id=instance_id).\
update({'host': None,
- 'vm_state': vm_state.STOP,
+ 'vm_state': vm_states.STOPPED,
'task_state': None,
'updated_at': literal_column('updated_at')})
session.query(models.SecurityGroupInstanceAssociation).\