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 902c3a8e8e1d96fe9e7f3c7179db2df4307ed76d..f4029c738cd00ca4be43b9e2f1aba31587dd6615 100644 (file)
--- 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)