From 53cb7ea71409dc7ecfe36f92df63e11231022455 Mon Sep 17 00:00:00 2001 From: Yun Mao Date: Wed, 6 Jun 2012 15:08:15 -0400 Subject: 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 --- nova/tests/api/openstack/compute/contrib/test_admin_actions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/tests') 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, -- cgit