mgr: devicehealth: dont error on dict iteritems

Since iteritems are not a part of py3, avoid health errors like following:

```
Module 'devicehealth' has failed: 'dict' object has no attribute 'iteritems
```

Using six iteritems in devicehealth and restful modules

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

diff --git a/src/pybind/mgr/devicehealth/module.py b/src/pybind/mgr/devicehealth/module.py
index 4c2ce2df0f2e6c20a1f9582652c2a1b9d61a9796..5e45318d6036d9fa494263140200497ab2f0104c 100644 (file)
--- a/src/pybind/mgr/devicehealth/module.py
+++ b/src/pybind/mgr/devicehealth/module.py
@@ -9,6 +9,7 @@ from mgr_module import MgrModule, CommandResult
 import rados
 from threading import Event
 from datetime import datetime, timedelta, date, time
+from six import iteritems
 
 TIME_FORMAT = '%Y%m%d-%H%M%S'
 
@@ -123,7 +124,7 @@ class Module(MgrModule):
 
     def refresh_config(self):
         self.enable_monitoring = self.get_config('enable_monitoring', '') is not '' or 'false'
-        for opt, value in DEFAULTS.iteritems():
+        for opt, value in iteritems(DEFAULTS):
             setattr(self, opt, self.get_config(opt) or value)
 
     def serve(self):

diff --git a/src/pybind/mgr/restful/module.py b/src/pybind/mgr/restful/module.py
index c4683219b3bb5033367d4598801a4c241129dd25..675b7005712a019360421e917c160036c79ab819 100644 (file)
--- a/src/pybind/mgr/restful/module.py
+++ b/src/pybind/mgr/restful/module.py
@@ -20,18 +20,13 @@ from uuid import uuid4
 from pecan import jsonify, make_app
 from OpenSSL import crypto
 from pecan.rest import RestController
+from six import iteritems
 from werkzeug.serving import make_server, make_ssl_devcert
 
 from .hooks import ErrorHook
 from mgr_module import MgrModule, CommandResult
 
 
-try:
-    iteritems = dict.iteritems
-except:
-    iteritems = dict.items
-
-
 class CannotServe(Exception):
     pass