openstack/cinder
Code Issues Proposed changes

Merge "Replace six.itervalues with dict.values() in cinder"

Browse Source
This commit is contained in:
Jenkins 2017-08-03 08:49:56 +00:00 committed by Gerrit Code Review
commit 41815e3e6f
2 changed files with 8 additions and 10 deletions
cinder/volume/drivers/nec
volume_common.pyvolume_helper.py

3
cinder/volume/drivers/nec/volume_common.py

@ -18,7 +18,6 @@ import errno
from lxml import etree
import os
import re
import six
import traceback
from oslo_config import cfg
@ -341,7 +340,7 @@ class MStorageVolumeCommon(object):
if metadata is not None and 'ldset' in metadata:
ldset_meta = metadata['ldset']
LOG.debug('ldset(metadata)=%s.', ldset_meta)
for tldset in six.itervalues(ldsets):
for tldset in ldsets.values():
if tldset['ldsetname'] == ldset_meta:
ldset = ldsets[ldset_meta]
LOG.debug('ldset information(metadata specified)=%s.',

15
cinder/volume/drivers/nec/volume_helper.py

@ -15,7 +15,6 @@
# under the License.
import random
import six
import traceback
from oslo_log import log as logging
@ -225,7 +224,7 @@ class MStorageDriver(volume_common.MStorageVolumeCommon):
def _validate_iscsildset_exist(self, ldsets, connector, metadata=None):
ldset = self.get_ldset(ldsets, metadata)
if ldset is None:
for tldset in six.itervalues(ldsets):
for tldset in ldsets.values():
if 'initiator_list' not in tldset:
continue
n = tldset['initiator_list'].count(connector['initiator'])
@ -249,7 +248,7 @@ class MStorageDriver(volume_common.MStorageVolumeCommon):
findwwpn = '-'.join([conect[i:i + 4]
for i in range(0, length, 4)])
findwwpn = findwwpn.upper()
for tldset in six.itervalues(ldsets):
for tldset in ldsets.values():
if 'wwpn' in tldset and findwwpn in tldset['wwpn']:
ldset = tldset
break
@ -795,7 +794,7 @@ class MStorageDriver(volume_common.MStorageVolumeCommon):
# get free lun.
luns = []
ldsetlds = ldset['lds']
for ld in six.itervalues(ldsetlds):
for ld in ldsetlds.values():
luns.append(ld['lun'])
target_lun = 0
@ -960,7 +959,7 @@ class MStorageDriver(volume_common.MStorageVolumeCommon):
luns = []
ldsetlds = ldset['lds']
for ld in six.itervalues(ldsetlds):
for ld in ldsetlds.values():
luns.append(ld['lun'])
target_lun = 0
for lun in sorted(luns):
@ -1042,7 +1041,7 @@ class MStorageDriver(volume_common.MStorageVolumeCommon):
ldsetlist = []
if ldset is None:
for tldset in six.itervalues(ldsets):
for tldset in ldsets.values():
if ld['ldn'] in tldset['lds']:
ldsetlist.append(tldset)
LOG.debug('ldset=%s.', tldset)
@ -1110,7 +1109,7 @@ class MStorageDriver(volume_common.MStorageVolumeCommon):
if ld is None:
msg = _('Exported snapshot could not be found.')
raise exception.VolumeBackendAPIException(data=msg)
for tldset in six.itervalues(ldsets):
for tldset in ldsets.values():
if ld['ldn'] in tldset['lds']:
ldsetlist.append(tldset)
if len(ldsetlist) == 0:
@ -1335,7 +1334,7 @@ class MStorageDriver(volume_common.MStorageVolumeCommon):
ldn = lds[ldname]['ldn']
lun = None
for ldset in six.itervalues(ldsets):
for ldset in ldsets.values():
if ldn in ldset['lds']:
lun = ldset['lds'][ldn]['lun']
break