diff options
| author | Andrea Tartaglia <me@andreatartaglia.com> | 2016-11-22 19:26:17 +0000 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2016-11-22 11:26:55 -0800 |
| commit | e2f6d249fa2a404212d91ef5771411e55d4139ed (patch) | |
| tree | cf3f9b1fbf7c1b4a95b2f6c842eb7c71142f6076 | |
| parent | c71b4aad22c4a7e35a7a065d776d020521f24ae5 (diff) | |
| download | ansible-modules-core-e2f6d249fa2a404212d91ef5771411e55d4139ed.tar.gz | |
ported iterkeys to py3 syntax (#5657)
* ported iterkeys to py3 syntax
Addresses ansible/ansible#18507
* Use ansible.module_utils.six.moves iterkeys instead of dict.keys()
* Removed 'iterkeys'
(cherry picked from commit ff9bf54891945b90d1a1008274774b6eeeb06bf2)
| -rw-r--r-- | cloud/vmware/vsphere_guest.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index b3d186eb..01a75c34 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -19,6 +19,7 @@ # TODO: # Ability to set CPU/Memory reservations + try: import json except ImportError: @@ -986,7 +987,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name disk_num = 0 dev_changes = [] disks_changed = {} - for disk in sorted(vm_disk.iterkeys()): + for disk in sorted(vm_disk): try: disksize = int(vm_disk[disk]['size_gb']) # Convert the disk size to kilobytes @@ -1342,7 +1343,7 @@ def create_vm(vsphere_client, module, esxi, resource_pool, cluster_name, guest, if vm_disk: disk_num = 0 disk_key = 0 - for disk in sorted(vm_disk.iterkeys()): + for disk in sorted(vm_disk): try: datastore = vm_disk[disk]['datastore'] except KeyError: @@ -1398,7 +1399,7 @@ def create_vm(vsphere_client, module, esxi, resource_pool, cluster_name, guest, add_floppy(module, vsphere_client, config_target, config, devices, default_devs, floppy_type, floppy_image_path) if vm_nic: - for nic in sorted(vm_nic.iterkeys()): + for nic in sorted(vm_nic): try: nictype = vm_nic[nic]['type'] except KeyError: |