openstack/cinder
Code Issues Proposed changes

Merge "Port hitachi driver to Python 3"

Browse Source
This commit is contained in:
Jenkins 2015-07-06 18:44:23 +00:00 committed by Gerrit Code Review
commit d9a0f6cbb6
3 changed files with 3 additions and 2 deletions
cinder/volume/drivers/hitachi
hbsd_basiclib.pyhbsd_horcm.py
tox.ini

2
cinder/volume/drivers/hitachi/hbsd_basiclib.py

@ -244,7 +244,7 @@ class HBSDBasicLib(object):
cmd = [cmd]
if args:
if isinstance(args, six.text_type):
if six.PY2 and isinstance(args, six.text_type):
cmd += shlex.split(args.encode())
else:
cmd += shlex.split(args)

2
cinder/volume/drivers/hitachi/hbsd_horcm.py

@ -167,7 +167,7 @@ class HBSDHORCM(basic_lib.HBSDBasicLib):
if not i.isdigit():
msg = basic_lib.output_err(601, param='hitachi_horcm_numbers')
raise exception.HBSDError(message=msg)
self.conf.hitachi_horcm_numbers = map(int, numbers)
self.conf.hitachi_horcm_numbers = [int(num) for num in numbers]
inst = self.conf.hitachi_horcm_numbers[0]
pair_inst = self.conf.hitachi_horcm_numbers[1]
if inst == pair_inst:

1
tox.ini

@ -61,6 +61,7 @@ commands =
cinder.tests.unit.test_evaluator \
cinder.tests.unit.test_exception \
cinder.tests.unit.test_gpfs \
cinder.tests.unit.test_hitachi_hbsd_horcm_fc \
cinder.tests.unit.test_hitachi_hbsd_snm2_fc \
cinder.tests.unit.test_hitachi_hbsd_snm2_iscsi \
cinder.tests.unit.test_hp_xp_fc \