From: Yi Chun, Huang <hychuang@cn.ibm.com>
Date: Thu, 29 May 2014 10:10:50 +0000 (-0400)
Subject: Add support for z/VM driver.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a517238af203c3a032298644312628f53004087d;p=openstack-build%2Fcinder-build.git

Add support for z/VM driver.

Add 'FCP' into connection_info in initialize_connection
in order to support IBM z/VM hypervisors. This change only
because z/VM need FCP(fibre channel port) info while other
platform don't need it. It will not have side effect
to other platforms since they can safely ignore it.

Change-Id: Ib2d72969608a84a7a200b96da3eefb3ccc13a096
Closes-Bug: #1323993
---

diff --git a/cinder/volume/drivers/ibm/storwize_svc/__init__.py b/cinder/volume/drivers/ibm/storwize_svc/__init__.py
index e2bd9ea9b..79ee5e269 100644
--- a/cinder/volume/drivers/ibm/storwize_svc/__init__.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/__init__.py
@@ -431,6 +431,10 @@ class StorwizeSVCDriver(san.SanDriver):
                 i_t_map = self._make_initiator_target_map(connector['wwpns'],
                                                           conn_wwpns)
                 properties['initiator_target_map'] = i_t_map
+
+                # specific for z/VM, refer to cinder bug 1323993
+                if "zvm_fcp" in connector:
+                    properties['zvm_fcp'] = connector['zvm_fcp']
         except Exception:
             with excutils.save_and_reraise_exception():
                 self.terminate_connection(volume, connector)