Removed dict.iteritems() in several other files.

This is for py3 compatibility #18506

contrib/inventory/azure_rm.py

@@ -309,7 +309,7 @@ class AzureRM(object):
 
     def _get_env_credentials(self):
         env_credentials = dict()
-        for attribute, env_variable in AZURE_CREDENTIAL_ENV_MAPPING.iteritems():
+        for attribute, env_variable in AZURE_CREDENTIAL_ENV_MAPPING.items():
             env_credentials[attribute] = os.environ.get(env_variable, None)
 
         if env_credentials['profile'] is not None:
@@ -328,7 +328,7 @@ class AzureRM(object):
         self.log('Getting credentials')
 
         arg_credentials = dict()
-        for attribute, env_variable in AZURE_CREDENTIAL_ENV_MAPPING.iteritems():
+        for attribute, env_variable in AZURE_CREDENTIAL_ENV_MAPPING.items():
             arg_credentials[attribute] = getattr(params, attribute)
 
         # try module params
@@ -664,7 +664,7 @@ class AzureInventory(object):
         self._inventory['azure'].append(host_name)
 
         if self.group_by_tag and vars.get('tags'):
-            for key, value in vars['tags'].iteritems():
+            for key, value in vars['tags'].items():
                 safe_key = self._to_safe(key)
                 safe_value = safe_key + '_' + self._to_safe(value)
                 if not self._inventory.get(safe_key):
@@ -724,7 +724,7 @@ class AzureInventory(object):
 
     def _get_env_settings(self):
         env_settings = dict()
-        for attribute, env_variable in AZURE_CONFIG_SETTINGS.iteritems():
+        for attribute, env_variable in AZURE_CONFIG_SETTINGS.items():
             env_settings[attribute] = os.environ.get(env_variable, None)
         return env_settings
 

contrib/inventory/nsot.py

@@ -201,7 +201,7 @@ class NSoTInventory(object):
         _inventory_group()
         '''
         inventory = dict()
-        for group, contents in self.config.iteritems():
+        for group, contents in self.config.items():
             group_response = self._inventory_group(group, contents)
             inventory.update(group_response)
         inventory.update({'_meta': self._meta})

contrib/inventory/rackhd.py

@@ -14,7 +14,7 @@ class RackhdInventory(object):
         for nodeid in nodeids:
             self._load_inventory_data(nodeid)
         inventory = {}
-        for nodeid,info in self._inventory.iteritems():
+        for nodeid,info in self._inventory.items():
             inventory[nodeid]= (self._format_output(nodeid, info))
         print(json.dumps(inventory))
 
@@ -24,7 +24,7 @@ class RackhdInventory(object):
         info['lookup'] = RACKHD_URL + '/api/common/lookups/?q={0}'.format(nodeid)
 
         results = {}
-        for key,url in info.iteritems():
+        for key,url in info.items():
             r = requests.get( url, verify=False)
             results[key] = r.text
         self._inventory[nodeid] = results
@@ -36,7 +36,7 @@ class RackhdInventory(object):
             if len(node_info) > 0:
                 ipaddress = node_info[0]['ipAddress']
             output = { 'hosts':[ipaddress],'vars':{}}
-            for key,result in info.iteritems():
+            for key,result in info.items():
                 output['vars'][key] = json.loads(result)
             output['vars']['ansible_ssh_user'] = 'monorail'
         except KeyError:

contrib/inventory/vmware_inventory.py

@@ -230,7 +230,7 @@ class VMWareInventory(object):
         config.read(vmware_ini_path)
 
         # apply defaults
-        for k,v in defaults['vmware'].iteritems():
+        for k,v in defaults['vmware'].items():
             if not config.has_option('vmware', k):
                     config.set('vmware', k, str(v))
 
@@ -401,7 +401,7 @@ class VMWareInventory(object):
 
 
         # Reset the inventory keys
-        for k,v in name_mapping.iteritems():
+        for k,v in name_mapping.items():
 
             if not host_mapping or not k in host_mapping:
                 continue
@@ -434,7 +434,7 @@ class VMWareInventory(object):
                 continue
             self.debugl('filter: %s' % hf)
             filter_map = self.create_template_mapping(inventory, hf, dtype='boolean')
-            for k,v in filter_map.iteritems():
+            for k,v in filter_map.items():
                 if not v:
                     # delete this host
                     inventory['all']['hosts'].remove(k)
@@ -447,7 +447,7 @@ class VMWareInventory(object):
         # Create groups
         for gbp in self.groupby_patterns:
             groupby_map = self.create_template_mapping(inventory, gbp)
-            for k,v in groupby_map.iteritems():
+            for k,v in groupby_map.items():
                 if v not in inventory:
                     inventory[v] = {}
                     inventory[v]['hosts'] = []
@@ -462,7 +462,7 @@ class VMWareInventory(object):
         ''' Return a hash of uuid to templated string from pattern '''
 
         mapping = {}
-        for k,v in inventory['_meta']['hostvars'].iteritems():
+        for k,v in inventory['_meta']['hostvars'].items():
             t = jinja2.Template(pattern)
             newkey = None
             try:           
@@ -671,7 +671,7 @@ class VMWareInventory(object):
             # check if the machine has the name requested
             keys = self.inventory['_meta']['hostvars'].keys()
             match = None
-            for k,v in self.inventory['_meta']['hostvars'].iteritems():
+            for k,v in self.inventory['_meta']['hostvars'].items():
                 if self.inventory['_meta']['hostvars'][k]['name'] == self.args.host:
                     match = k
                     break