Port IBM driver to Python 3

* Replace map(None, it1, it2) with zip(it1, it2)
* tox.ini: add the following tests to Python 3.4

  - cinder.tests.unit.test_ibm_flashsystem_iscsi
  - cinder.tests.unit.test_ibmnas

This patch requires Python 3 fixes in os-brick.

Blueprint cinder-python3
Change-Id: I735c39e08cf6e4edd06cf07243fe798b65e8c1a5
This commit is contained in:
Victor Stinner 2015-06-29 22:37:29 +02:00
parent c2dd9655e5
commit 3c93229c0d
2 changed files with 3 additions and 1 deletions
cinder/volume/drivers/ibm
tox.ini

@ -386,7 +386,7 @@ class FlashSystemDriver(san.SanDriver):
(_('_get_hdr_dic: attribute headers and values do not match.\n '
'Headers: %(header)s\n Values: %(row)s.')
% {'header': six.text_type(header), 'row': six.text_type(row)}))
dic = {a: v for a, v in map(None, attributes, values)}
dic = {a: v for a, v in zip(attributes, values)}
return dic
def _get_host_from_connector(self, connector):

@ -68,6 +68,8 @@ commands =
cinder.tests.unit.test_hplefthand \
cinder.tests.unit.test_huawei_drivers \
cinder.tests.unit.test_huawei_drivers_compatibility \
cinder.tests.unit.test_ibm_flashsystem_iscsi \
cinder.tests.unit.test_ibmnas \
cinder.tests.unit.test_ibm_xiv_ds8k \
cinder.tests.unit.test_infortrend_cli \
cinder.tests.unit.test_netapp_nfs \