From c9158dfcf4efd2cf22df9aed7b1bb01e037e8eb2 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Wed, 16 Mar 2011 19:04:27 -0700
Subject: moved scheduler API check into db.api decorator

---
 nova/compute/api.py     | 10 ++--------
 nova/compute/manager.py |  5 +----
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 215257217..f4bfe720c 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -34,7 +34,6 @@ from nova import rpc
 from nova import utils
 from nova import volume
 from nova.compute import instance_types
-from nova.scheduler import api as scheduler
 from nova.db import base
 
 FLAGS = flags.FLAGS
@@ -51,7 +50,7 @@ class API(base.Base):
 
     def __init__(self, image_service=None, network_api=None,
                  volume_api=None, hostname_factory=generate_default_hostname,
-                 scheduler_api=None, **kwargs):
+                 **kwargs):
         if not image_service:
             image_service = utils.import_object(FLAGS.image_service)
         self.image_service = image_service
@@ -61,9 +60,6 @@ class API(base.Base):
         if not volume_api:
             volume_api = volume.API()
         self.volume_api = volume_api
-        if not scheduler_api:
-            scheduler_api = scheduler.API()
-        self.scheduler_api = scheduler_api
         self.hostname_factory = hostname_factory
         super(API, self).__init__(**kwargs)
 
@@ -347,8 +343,7 @@ class API(base.Base):
 
     def get(self, context, instance_id):
         """Get a single instance with the given ID."""
-        rv = self.scheduler_api.get_instance_or_reroute(context, instance_id)
-        #rv = self.db.instance_get(context, instance_id)
+        rv = self.db.instance_get(context, instance_id)
         return dict(rv.iteritems())
 
     def get_all(self, context, project_id=None, reservation_id=None,
@@ -513,7 +508,6 @@ class API(base.Base):
 
     def get_ajax_console(self, context, instance_id):
         """Get a url to an AJAX Console"""
-        instance = self.get(context, instance_id)
         output = self._call_compute_message('get_ajax_console',
                                             context,
                                             instance_id)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 499b212e2..ce60c6b43 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -48,7 +48,6 @@ from nova import scheduler_manager
 from nova import rpc
 from nova import utils
 from nova.compute import power_state
-from nova.scheduler import api as scheduler_api
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('instances_path', '$state_path/instances',
@@ -523,9 +522,7 @@ class ComputeManager(scheduler_manager.SchedulerDependentManager):
         """Pause an instance on this server."""
         context = context.elevated()
         LOG.debug(_('*** instance %s: starting pause'), instance_id)
-        instance_ref = scheduler_api.get_instance_or_reroute(context,
-                                            instance_id)
-        #instance_ref = self.db.instance_get(context, instance_id)
+        instance_ref = self.db.instance_get(context, instance_id)
         LOG.audit(_('instance %s: pausing'), instance_id, context=context)
         self.db.instance_set_state(context,
                                    instance_id,
-- 
cgit