From b98b3e2cd55fb3c40ec0f0c699a168ea3747043d Mon Sep 17 00:00:00 2001
From: yanghuichan <yanghc@fiberhome.com>
Date: Thu, 20 Jul 2017 19:14:57 +0800
Subject: [PATCH] Replace six.itervalues with dict.values() in cinder

1.As mentioned in [1], we should avoid using six.iteritems
to achieve iterators. We can use dict.items instead, as it will
return iterators in PY3 as well. And dict.items/keys will more
readable.
2.In py2, the performance about list should be negligible,
see the link [2].
[1] https://wiki.openstack.org/wiki/Python3

[2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html

Change-Id: I0e9add1821eee29cf0a087f59d57416a83e269ec
---
 cinder/volume/drivers/nec/volume_common.py |  3 +--
 cinder/volume/drivers/nec/volume_helper.py | 15 +++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cinder/volume/drivers/nec/volume_common.py b/cinder/volume/drivers/nec/volume_common.py
index fbd0658a733..edf8e61b6d2 100644
--- a/cinder/volume/drivers/nec/volume_common.py
+++ b/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.',
diff --git a/cinder/volume/drivers/nec/volume_helper.py b/cinder/volume/drivers/nec/volume_helper.py
index a3251ed8527..68854ad6045 100644
--- a/cinder/volume/drivers/nec/volume_helper.py
+++ b/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