From: KIYOHIRO ADACHI <adachi@mxs.nes.nec.co.jp>
Date: Tue, 8 Oct 2013 07:28:25 +0000 (+0900)
Subject: remove unused methods in driver.Scheduler
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f330eac22ad47901ccd3252ffd73c46d7157644e;p=openstack-build%2Fcinder-build.git

remove unused methods in driver.Scheduler

cinder.scheduler.host_manager.HostManager doesn't have get_host_list()
and get_service_capabilities(). But we don't catch the AttributeError
by them. Therefore, get_host_list() and get_service_capabilities() in
cinder.scheduler.driver.Scheduler have not been used.

Also, get_host_list() and get_service_capabilities() in
cinder.scheduler.manager.SchedulerManager have not been used.

Change-Id: I402cf068612866649cc8645391eff38fca56f634
Closes-Bug: #1236723
---

diff --git a/cinder/scheduler/driver.py b/cinder/scheduler/driver.py
index 327d5bf4d..4a074f00e 100644
--- a/cinder/scheduler/driver.py
+++ b/cinder/scheduler/driver.py
@@ -61,15 +61,6 @@ class Scheduler(object):
             CONF.scheduler_host_manager)
         self.volume_rpcapi = volume_rpcapi.VolumeAPI()
 
-    def get_host_list(self):
-        """Get a list of hosts from the HostManager."""
-        return self.host_manager.get_host_list()
-
-    def get_service_capabilities(self):
-        """Get the normalized set of capabilities for the services.
-        """
-        return self.host_manager.get_service_capabilities()
-
     def update_service_capabilities(self, service_name, host, capabilities):
         """Process a capability update from a service node."""
         self.host_manager.update_service_capabilities(service_name,
diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py
index 0357bc95d..19d0a500c 100644
--- a/cinder/scheduler/manager.py
+++ b/cinder/scheduler/manager.py
@@ -63,14 +63,6 @@ class SchedulerManager(manager.Manager):
         ctxt = context.get_admin_context()
         self.request_service_capabilities(ctxt)
 
-    def get_host_list(self, context):
-        """Get a list of hosts from the HostManager."""
-        return self.driver.get_host_list()
-
-    def get_service_capabilities(self, context):
-        """Get the normalized set of capabilities for this zone."""
-        return self.driver.get_service_capabilities()
-
     def update_service_capabilities(self, context, service_name=None,
                                     host=None, capabilities=None, **kwargs):
         """Process a capability update from a service node."""