From: Mark Sturdevant Date: Fri, 30 May 2014 20:19:04 +0000 (-0700) Subject: hp_lefthand_rest_proxy no handler for logger during tests X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=759b3dcefc708aade88fd9c5906f86de9c7c67a8;p=openstack-build%2Fcinder-build.git hp_lefthand_rest_proxy no handler for logger during tests Create the proxy during do_setup() instead of __init__() so that the logger is ready for an import error during tests. Closes-Bug: #1325116 Change-Id: I88145d97df5d746e92bc8302bf516ca9eaa05d00 --- diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py b/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py index f60c54d29..ca92f65ca 100644 --- a/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py +++ b/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py @@ -48,13 +48,16 @@ class HPLeftHandISCSIDriver(VolumeDriver): 1.0.0 - Initial driver 1.0.1 - Added support for retype 1.0.2 - Added support for volume migrate + 1.0.3 - Fix for no handler for logger during tests """ - VERSION = "1.0.2" + VERSION = "1.0.3" def __init__(self, *args, **kwargs): super(HPLeftHandISCSIDriver, self).__init__(*args, **kwargs) - self.proxy = self._create_proxy(*args, **kwargs) + self.proxy = None + self.args = args + self.kwargs = kwargs def _create_proxy(self, *args, **kwargs): try: @@ -70,6 +73,7 @@ class HPLeftHandISCSIDriver(VolumeDriver): @utils.synchronized('lefthand', external=True) def do_setup(self, context): + self.proxy = self._create_proxy(*self.args, **self.kwargs) self.proxy.do_setup(context) LOG.info(_("HPLeftHand driver %(driver_ver)s, proxy %(proxy_ver)s") % {