From: Shay Halsband <shay.halsband@emc.com>
Date: Tue, 1 Sep 2015 05:35:21 +0000 (+0300)
Subject: XtremIO fix remapping bug
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=401657acc48c58a9b91a15edd2a6d4ecaca729af;p=openstack-build%2Fcinder-build.git

XtremIO fix remapping bug

1. formatting error
2. pass initiator group name(at index 1) instead of
   index(at index 2) to create_lun_map

Change-Id: I05b6468261fe352c80f6f8e115b8e69eea551089
Closes-bug: #1499207
---

diff --git a/cinder/volume/drivers/emc/xtremio.py b/cinder/volume/drivers/emc/xtremio.py
index 5c55e437d..21fd2a151 100644
--- a/cinder/volume/drivers/emc/xtremio.py
+++ b/cinder/volume/drivers/emc/xtremio.py
@@ -530,7 +530,7 @@ class XtremIOVolumeDriver(san.SanDriver):
             lunmap = self._obj_from_result(res)
             LOG.info(_LI('Created lun-map:\n%s'), lunmap)
         except exception.XtremIOAlreadyMappedError:
-            LOG.info(_LI('Volume already mapped, retrieving %(ig)s, %(vol)d'),
+            LOG.info(_LI('Volume already mapped, retrieving %(ig)s, %(vol)s'),
                      {'ig': ig, 'vol': volume['id']})
             lunmap = self.client.find_lunmap(ig, volume['id'])
         return lunmap
@@ -748,7 +748,7 @@ class XtremIOISCSIDriver(XtremIOVolumeDriver, driver.ISCSIDriver):
             self.client.req('initiators', 'PUT', data, idx=initiator['index'])
 
         # lun mappping
-        lunmap = self.create_lun_map(volume, ig['ig-id'][2])
+        lunmap = self.create_lun_map(volume, ig['ig-id'][1])
 
         properties = self._get_iscsi_properties(lunmap)