openstack/cinder
Code Issues Proposed changes

Merge "Port IBM driver to Python 3"

Browse Source
This commit is contained in:
Jenkins 2015-08-10 01:03:28 +00:00 committed by Gerrit Code Review
commit cf3859bb87
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/volume/drivers/ibm/flashsystem_common.py
View File

@ -388,7 +388,7 @@ class FlashSystemDriver(san.SanDriver):
(_('_get_hdr_dic: attribute headers and values do not match.\n ' (_('_get_hdr_dic: attribute headers and values do not match.\n '
'Headers: %(header)s\n Values: %(row)s.') 'Headers: %(header)s\n Values: %(row)s.')
% {'header': six.text_type(header), 'row': six.text_type(row)})) % {'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 return dic
def _get_host_from_connector(self, connector): def _get_host_from_connector(self, connector):

2
tox.ini
View File

@ -67,6 +67,8 @@ commands =
cinder.tests.unit.test_hplefthand \ cinder.tests.unit.test_hplefthand \
cinder.tests.unit.test_huawei_drivers \ cinder.tests.unit.test_huawei_drivers \
cinder.tests.unit.test_huawei_drivers_compatibility \ 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_ibm_xiv_ds8k \
cinder.tests.unit.test_infortrend_cli \ cinder.tests.unit.test_infortrend_cli \
cinder.tests.unit.test_netapp_nfs \ cinder.tests.unit.test_netapp_nfs \