summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-09-01 21:06:22 +0000
committerTarmac <>2011-09-01 21:06:22 +0000
commitce6f55b4bd889d9e873598bb23ed37327d75252e (patch)
treeff1d1f4d9b5e6ad854c33c081553e8799c2c55ea /nova/tests
parentdbd5acd2ba6bc9853f165d457eaf6abe7559a92e (diff)
parent59be9be68c0fd9b33b72257b8a1eb8c357ce9217 (diff)
Fix a few references to state_description that slipped through.
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_libvirt.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 6a213b4f0..8c6775b29 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -34,6 +34,7 @@ from nova import test
from nova import utils
from nova.api.ec2 import cloud
from nova.compute import power_state
+from nova.compute import vm_states
from nova.virt.libvirt import connection
from nova.virt.libvirt import firewall
@@ -674,8 +675,9 @@ class LibvirtConnTestCase(test.TestCase):
# Preparing data
self.compute = utils.import_object(FLAGS.compute_manager)
- instance_dict = {'host': 'fake', 'state': power_state.RUNNING,
- 'state_description': 'running'}
+ instance_dict = {'host': 'fake',
+ 'power_state': power_state.RUNNING,
+ 'vm_state': vm_states.ACTIVE}
instance_ref = db.instance_create(self.context, self.test_instance)
instance_ref = db.instance_update(self.context, instance_ref['id'],
instance_dict)
@@ -713,8 +715,8 @@ class LibvirtConnTestCase(test.TestCase):
self.compute.rollback_live_migration)
instance_ref = db.instance_get(self.context, instance_ref['id'])
- self.assertTrue(instance_ref['state_description'] == 'running')
- self.assertTrue(instance_ref['state'] == power_state.RUNNING)
+ self.assertTrue(instance_ref['vm_state'] == vm_states.ACTIVE)
+ self.assertTrue(instance_ref['power_state'] == power_state.RUNNING)
volume_ref = db.volume_get(self.context, volume_ref['id'])
self.assertTrue(volume_ref['status'] == 'in-use')