From: Eric Harney Date: Thu, 20 Aug 2015 19:11:48 +0000 (-0400) Subject: Small cleanups in BaseVD/VolumeDriver X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5b0a3196e726cbbab1828e99976d677866f4d5d5;p=openstack-build%2Fcinder-build.git Small cleanups in BaseVD/VolumeDriver self._throttle is defined outside of __init__. VolumeDriver's initialize_connection signature doesn't match the method it overrides from BaseVD. Change-Id: Ie9f741ad331a79e3a85fd586f6393f8f80aa2932 --- diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index ba2fe0563..79cc69152 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -294,6 +294,7 @@ class BaseVD(object): utils.setup_tracing(self.configuration.safe_get('trace_flags')) self.set_execute(execute) self._stats = {} + self._throttle = None self.pools = [] @@ -1543,7 +1544,7 @@ class VolumeDriver(ConsistencyGroupVD, TransferVD, ManageableVD, ExtendVD, def remove_export_snapshot(self, context, snapshot): raise NotImplementedError() - def initialize_connection(self, volume, connector): + def initialize_connection(self, volume, connector, **kwargs): raise NotImplementedError() def initialize_connection_snapshot(self, snapshot, connector, **kwargs):