From: Patrick East Date: Thu, 10 Sep 2015 20:00:27 +0000 (-0700) Subject: Swap the decorator order for PureFCDriver methods X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3474ca236de44bb4ccc11d864554f1922f6c64ae;p=openstack-build%2Fcinder-build.git Swap the decorator order for PureFCDriver methods Right now the debug trace decorator is logging the decorator method from the FCZM helper and not the actual driver methods its supposed to be. Change-Id: If658393e5e9d1b3e068fc7a200998e8033ada48f Closes-Bug: #1494459 --- diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py index 902c3a8e8..f4029c738 100644 --- a/cinder/volume/drivers/pure.py +++ b/cinder/volume/drivers/pure.py @@ -943,8 +943,8 @@ class PureFCDriver(PureBaseVolumeDriver, driver.FibreChannelDriver): ports = self._array.list_ports() return [port["wwn"] for port in ports if port["wwn"]] - @log_debug_trace @fczm_utils.AddFCZone + @log_debug_trace def initialize_connection(self, volume, connector, initiator_data=None): """Allow connection to connector and return connection info.""" @@ -1010,8 +1010,8 @@ class PureFCDriver(PureBaseVolumeDriver, driver.FibreChannelDriver): return init_targ_map - @log_debug_trace @fczm_utils.RemoveFCZone + @log_debug_trace def terminate_connection(self, volume, connector, **kwargs): """Terminate connection.""" no_more_connections = self._disconnect(volume, connector, **kwargs)