Pass db into driver as constructor's parameter

This will be required when code specific for target admin moves to
brick.

Change-Id: Ia48ea927f2efb2c551c359f7e7f98bf586919ab3

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index 9dbf3778e425cd5f112f6a1d0501958e3440f319..1925cbe61e4b8f3666fca05e655717ad969b3f90 100644 (file)
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -102,7 +102,7 @@ class VolumeDriver(object):
 
     def __init__(self, execute=utils.execute, *args, **kwargs):
         # NOTE(vish): db is set by Manager
-        self.db = None
+        self.db = kwargs.get('db')
         self.configuration = kwargs.get('configuration', None)
         if self.configuration:
             self.configuration.append_config_values(volume_opts)

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index feb78a0215ddc9db4efa8804cea0a6c4aeb71696..a3728597e329959816fd7f49d7ca5fcbe7d20682 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -135,6 +135,9 @@ class VolumeManager(manager.SchedulerDependentManager):
     def __init__(self, volume_driver=None, service_name=None,
                  *args, **kwargs):
         """Load the driver from the one specified in args, or from flags."""
+        # update_service_capabilities needs service_name to be volume
+        super(VolumeManager, self).__init__(service_name='volume',
+                                            *args, **kwargs)
         self.configuration = Configuration(volume_manager_opts,
                                            config_group=service_name)
         if not volume_driver:
@@ -147,13 +150,8 @@ class VolumeManager(manager.SchedulerDependentManager):
             volume_driver = MAPPING[volume_driver]
         self.driver = importutils.import_object(
             volume_driver,
-            configuration=self.configuration)
-        # update_service_capabilities needs service_name to be volume
-        super(VolumeManager, self).__init__(service_name='volume',
-                                            *args, **kwargs)
-        # NOTE(vish): Implementation specific db handling is done
-        #             by the driver.
-        self.driver.db = self.db
+            configuration=self.configuration,
+            db=self.db)
 
     def init_host(self):
         """Do any initialization that needs to be run if this is a