Merge "remove unused methods in driver.Scheduler"

openstack · Oct 9, 2013 · b00e307 · b00e307
2 parents 60f2eb8 + f330eac
commit b00e307
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/cinder/scheduler/driver.py b/cinder/scheduler/driver.py
@@ -61,15 +61,6 @@ def __init__(self):
             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
@@ -63,14 +63,6 @@ def init_host(self):
         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."""