diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-06 22:29:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-06 22:29:03 +0000 |
| commit | eeffd582f77db0160a075d84c34b82e5403f9ab2 (patch) | |
| tree | e4c32bd6f81ab604148a6844b57b13159cd7a4c6 /nova/tests | |
| parent | f1243fb1e2e2d088b10d3776839c627665977e3e (diff) | |
| parent | 53cb7ea71409dc7ecfe36f92df63e11231022455 (diff) | |
Merge "Make live_migration a first-class compute API."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_admin_actions.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py index cc48b7c66..ebab28472 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py +++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py @@ -19,6 +19,7 @@ import webob from nova.api.openstack import compute as compute_api from nova import compute +from nova.compute import vm_states from nova import context from nova import exception from nova import flags @@ -56,7 +57,7 @@ def fake_compute_api_raises_invalid_state(*args, **kwargs): def fake_compute_api_get(self, context, instance_id): - return {'id': 1, 'uuid': instance_id} + return {'id': 1, 'uuid': instance_id, 'vm_state': vm_states.ACTIVE} def fake_scheduler_api_live_migration(self, context, block_migration, |