diff options
| author | Yun Mao <yunmao@gmail.com> | 2012-06-06 15:08:15 -0400 |
|---|---|---|
| committer | Yun Mao <yunmao@gmail.com> | 2012-06-06 16:05:02 -0400 |
| commit | 53cb7ea71409dc7ecfe36f92df63e11231022455 (patch) | |
| tree | ce46ad39541344b3e6f00205cc0169bc386c0004 /nova/tests | |
| parent | 9121fc6b9d6b1a7a9d945cfdad944fa59b648106 (diff) | |
Make live_migration a first-class compute API.
* Move the trivial implementation from admin_actions to compute.api
* Remove the dependency to scheduler from admin_actions
* Add check_instance_state like all other compute APIs to prevent
undesirable behavior
Change-Id: Ib5176718eae624de982f641bf3ec201fc7b4efcc
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, |