Convert x.iteritems() to six.iteritems(x)

Convert x.iteritems() to six.iteritems(x) for
python 3.x compatibility.

Change-Id: I040c1b753012d45e8bf9f3c20c4a39ef143959b9
Closes-bug: #1282888

heat/engine/resources/server.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import copy
+import six
 import uuid
 
 from oslo.config import cfg
@@ -1164,7 +1165,7 @@ class Server(stack_user.StackUser):
         image_id = restore_data['resource_data']['snapshot_image_id']
         props = dict(
             (key, value) for (key, value) in
-            defn.properties(self.properties_schema).iteritems()
+            six.iteritems(defn.properties(self.properties_schema))
             if value is not None)
         props[self.IMAGE] = image_id
         return defn.freeze(properties=props)

heat/engine/resources/volume.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import json
+import six
 
 from heat.common import exception
 from heat.common.i18n import _
@@ -771,7 +772,7 @@ class CinderVolume(Volume):
             self.IMAGE_REF, self.IMAGE, self.SOURCE_VOLID, self.SIZE)
         props = dict(
             (key, value) for (key, value) in
-            defn.properties(self.properties_schema).iteritems()
+            six.iteritems(defn.properties(self.properties_schema))
             if key not in ignore_props and value is not None)
         props[self.BACKUP_ID] = backup_id
         return defn.freeze(properties=props)

heat/engine/stack.py

@@ -1058,7 +1058,7 @@ class Stack(collections.Mapping):
     @profiler.trace('Stack.delete_snapshot', hide_args=False)
     def delete_snapshot(self, snapshot):
         '''Remove a snapshot from the backends.'''
-        for name, rsrc in self.resources.iteritems():
+        for name, rsrc in six.iteritems(self.resources):
             data = snapshot.data['resources'].get(name)
             scheduler.TaskRunner(rsrc.delete_snapshot, data)()
 
@@ -1075,7 +1075,7 @@ class Stack(collections.Mapping):
 
         template = tmpl.Template(snapshot.data['template'])
 
-        for name, defn in template.resource_definitions(self).iteritems():
+        for name, defn in six.iteritems(template.resource_definitions(self)):
             rsrc = resource.Resource(name, defn, self)
             data = snapshot.data['resources'].get(name)
             handle_restore = getattr(rsrc, 'handle_restore', None)

heat/tests/test_parser.py

@@ -4395,7 +4395,7 @@ class StackTest(common.HeatTestCase):
             def handle_restore(self, defn, data):
                 props = dict(
                     (key, value) for (key, value) in
-                    defn.properties(self.properties_schema).iteritems()
+                    six.iteritems(defn.properties(self.properties_schema))
                     if value is not None)
                 value = data['resource_data']['a_string']
                 props['a_string'] = value