From 3c93229c0d9236458a8f2bac5874c869ab195a0f Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 29 Jun 2015 22:37:29 +0200 Subject: [PATCH] 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 --- cinder/volume/drivers/ibm/flashsystem_common.py | 2 +- tox.ini | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cinder/volume/drivers/ibm/flashsystem_common.py b/cinder/volume/drivers/ibm/flashsystem_common.py index 678eecb8a..3d5044a11 100644 --- a/cinder/volume/drivers/ibm/flashsystem_common.py +++ b/cinder/volume/drivers/ibm/flashsystem_common.py @@ -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): diff --git a/tox.ini b/tox.ini index f5d87a871..248e88d00 100644 --- a/tox.ini +++ b/tox.ini @@ -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 \ -- 2.45.2