internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed dict.iteritems() in modules. (#18859)

Browse Source 
This is for py3 compatibility, addressed in #18506
This commit is contained in:
Andrea Tartaglia
2016-12-12 23:16:23 +00:00
committed by Toshio Kuratomi
parent 4b27d08643
commit ef391a11ec
99 changed files with 251 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/modules/cloud/vmware/vmware_guest.py
View File

@@ -594,7 +594,7 @@ class PyVmomiHelper(object):
mac = device.macAddress
ips = list(device.ipAddress)
netDict[mac] = ips
for k,v in netDict.iteritems():
for k,v in netDict.items():
for ipaddress in v:
if ipaddress:
if '::' in ipaddress:
@@ -979,7 +979,7 @@ class PyVmomiHelper(object):
timeout=10, headers=None)
# save all of the transfer data
for k,v in info.iteritems():
for k,v in info.items():
result[k] = v
# exit early if xfer failed
@@ -1045,7 +1045,7 @@ class PyVmomiHelper(object):
result['msg'] = str(rsp.read())
# save all of the transfer data
for k,v in info.iteritems():
for k,v in info.items():
result[k] = v
return result

12
lib/ansible/modules/cloud/vmware/vsphere_guest.py
View File

@@ -863,7 +863,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name
if vm_extra_config:
spec = spec_singleton(spec, request, vm)
extra_config = []
for k,v in vm_extra_config.iteritems():
for k,v in vm_extra_config.items():
ec = spec.new_extraConfig()
ec.set_element_key(str(k))
ec.set_element_value(str(v))
@@ -1085,7 +1085,7 @@ def reconfigure_net(vsphere_client, vm, module, esxi, resource_pool, guest, vm_n
module.fail_json(msg="Cannot find datacenter named: %s" % datacenter)
dcprops = VIProperty(vsphere_client, dcmor)
nfmor = dcprops.networkFolder._obj
for k,v in vm_nic.iteritems():
for k,v in vm_nic.items():
nicNum = k[len(k) -1]
if vm_nic[k]['network_type'] == 'dvs':
portgroupKey = find_portgroup_key(module, s, nfmor, vm_nic[k]['network'])
@@ -1116,7 +1116,7 @@ def reconfigure_net(vsphere_client, vm, module, esxi, resource_pool, guest, vm_n
module.exit_json()
if len(nics) > 0:
for nic, obj in nics.iteritems():
for nic, obj in nics.items():
"""
1,2 and 3 are used to mark which action should be taken
1 = from a distributed switch to a distributed switch
@@ -1145,7 +1145,7 @@ def reconfigure_net(vsphere_client, vm, module, esxi, resource_pool, guest, vm_n
"nic_backing").pyclass()
nic_backing.set_element_deviceName(vm_nic[nic]['network'])
dev._obj.set_element_backing(nic_backing)
for nic, obj in nics.iteritems():
for nic, obj in nics.items():
dev = obj[0]
spec = request.new_spec()
nic_change = spec.new_deviceChange()
@@ -1178,7 +1178,7 @@ def _build_folder_tree(nodes, parent):
def _find_path_in_tree(tree, path):
for name, o in tree.iteritems():
for name, o in tree.items():
if name == path[0]:
if len(path) == 1:
return o
@@ -1231,7 +1231,7 @@ def create_vm(vsphere_client, module, esxi, resource_pool, cluster_name, guest,
# try the legacy behaviour of just matching the folder name, so 'lamp' alone matches 'production/customerA/lamp'
if vmfmor is None:
for mor, name in vsphere_client._get_managed_objects(MORTypes.Folder).iteritems():
for mor, name in vsphere_client._get_managed_objects(MORTypes.Folder).items():
if name == vm_extra_config['folder']:
vmfmor = mor