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 327d5bf4dc4a806997d49f63b1dba7801ae5a94c..4a074f00ef256ecd533157b2779898086093e0a6 100644 (file)
--- 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 0357bc95d3a70505ec4a31e86bd6a6b11abbcada..19d0a500c8376e3aa83bad39061ed43547ec4bf4 100644 (file)
--- 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."""