From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 5 Jul 2018 15:20:56 +0000 (+0200)
Subject: mgr: replace iteritems with six.iteritems (influx)
X-Git-Tag: v14.0.1~929^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a62ab8ae8c91b91bb6c5367a6af197e5d85fe10a;p=ceph.git

mgr: replace iteritems with six.iteritems (influx)

Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/pybind/mgr/influx/module.py b/src/pybind/mgr/influx/module.py
index 4d111e57af186..e077b04ffc4d9 100644
--- a/src/pybind/mgr/influx/module.py
+++ b/src/pybind/mgr/influx/module.py
@@ -2,6 +2,7 @@ from datetime import datetime
 from threading import Event
 import json
 import errno
+import six
 import time
 
 from mgr_module import MgrModule
@@ -149,7 +150,7 @@ class Module(MgrModule):
         osd_sum = pg_sum['by_osd']
         pool_sum = pg_sum['by_pool']
         data = []
-        for osd_id, stats in osd_sum.iteritems():
+        for osd_id, stats in six.iteritems(osd_sum):
             metadata = self.get_metadata('osd', "%s" % osd_id)
             for stat in stats:
                 point_1 = {
@@ -165,7 +166,7 @@ class Module(MgrModule):
                     }
                 }
                 data.append(point_1)
-        for pool_id, stats in pool_sum.iteritems():
+        for pool_id, stats in six.iteritems(pool_sum):
             for stat in stats:
                 point_2 = {
                     "measurement": "ceph_pg_summary_pool",
@@ -188,7 +189,7 @@ class Module(MgrModule):
 
         now = datetime.utcnow().isoformat() + 'Z'
 
-        for daemon, counters in self.get_all_perf_counters().iteritems():
+        for daemon, counters in six.iteritems(self.get_all_perf_counters()):
             svc_type, svc_id = daemon.split(".", 1)
             metadata = self.get_metadata(svc_type, svc_id)