Merge "Make live_migration a first-class compute API."

1 files changed, 2 insertions, 8 deletions

diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py
index 7cda220db..18adf8377 100644
--- a/nova/api/openstack/compute/contrib/admin_actions.py
+++ b/nova/api/openstack/compute/contrib/admin_actions.py
@@ -25,7 +25,6 @@ from nova import compute
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova.scheduler import rpcapi as scheduler_rpcapi
 
 
 FLAGS = flags.FLAGS
@@ -41,7 +40,6 @@ class AdminActionsController(wsgi.Controller):
     def __init__(self, *args, **kwargs):
         super(AdminActionsController, self).__init__(*args, **kwargs)
         self.compute_api = compute.API()
-        self.scheduler_rpcapi = scheduler_rpcapi.SchedulerAPI()
 
     # TODO(bcwaldon): These action names should be prefixed with 'os-'
 
@@ -275,12 +273,8 @@ class AdminActionsController(wsgi.Controller):
 
         try:
             instance = self.compute_api.get(context, id)
-            self.scheduler_rpcapi.live_migration(context,
-                    block_migration,
-                    disk_over_commit,
-                    instance["id"],
-                    host,
-                    topic=FLAGS.compute_topic)
+            self.compute_api.live_migrate(context, instance, block_migration,
+                                          disk_over_commit, host)
         except Exception:
             msg = _("Live migration of instance %(id)s to host %(host)s"
                     " failed") % locals()