From 310a3eb650038e67d83f007ec412c550a3e7faad Mon Sep 17 00:00:00 2001 From: Andrea Tartaglia Date: Mon, 12 Dec 2016 16:09:34 -0800 Subject: This is for py3 compatibility, addressed in #18506 (cherry picked from ef391a11ec536d0efb1b59e8139735b27b67c67f) --- cloud/amazon/ec2_asg.py | 2 +- cloud/amazon/ec2_elb_lb.py | 4 ++-- cloud/amazon/ec2_facts.py | 2 +- cloud/amazon/elasticache.py | 4 ++-- cloud/digital_ocean/digital_ocean.py | 2 +- cloud/docker/_docker.py | 20 ++++++++++---------- cloud/docker/docker_container.py | 24 ++++++++++++------------ cloud/docker/docker_image.py | 2 +- cloud/docker/docker_network.py | 4 ++-- cloud/rackspace/rax.py | 2 +- cloud/rackspace/rax_cbs_attachments.py | 2 +- cloud/rackspace/rax_cdb.py | 2 +- cloud/rackspace/rax_cdb_user.py | 4 ++-- cloud/rackspace/rax_clb.py | 2 +- cloud/vmware/vsphere_guest.py | 12 ++++++------ network/cumulus/cl_bond.py | 2 +- network/cumulus/cl_bridge.py | 2 +- network/cumulus/cl_interface.py | 2 +- network/dellos10/dellos10_facts.py | 2 +- network/dellos6/dellos6_facts.py | 4 ++-- network/dellos9/dellos9_facts.py | 6 +++--- network/eos/eos_eapi.py | 2 +- network/nxos/nxos_aaa_server.py | 9 +++++---- network/nxos/nxos_aaa_server_host.py | 6 +++--- network/nxos/nxos_acl.py | 18 +++++++++--------- network/nxos/nxos_bgp.py | 8 ++++---- network/nxos/nxos_bgp_af.py | 8 ++++---- network/nxos/nxos_bgp_neighbor.py | 6 +++--- network/nxos/nxos_bgp_neighbor_af.py | 6 +++--- network/nxos/nxos_evpn_global.py | 2 +- network/nxos/nxos_evpn_vni.py | 8 ++++---- network/nxos/nxos_hsrp.py | 6 +++--- network/nxos/nxos_igmp.py | 6 +++--- network/nxos/nxos_igmp_interface.py | 10 +++++----- network/nxos/nxos_igmp_snooping.py | 10 +++++----- network/nxos/nxos_interface.py | 4 ++-- network/nxos/nxos_interface_ospf.py | 8 ++++---- network/nxos/nxos_ip_interface.py | 2 +- network/nxos/nxos_mtu.py | 10 +++++----- network/nxos/nxos_ntp.py | 6 +++--- network/nxos/nxos_ntp_auth.py | 6 +++--- network/nxos/nxos_ntp_options.py | 8 ++++---- network/nxos/nxos_nxapi.py | 2 +- network/nxos/nxos_ospf_vrf.py | 8 ++++---- network/nxos/nxos_overlay_global.py | 4 ++-- network/nxos/nxos_pim.py | 4 ++-- network/nxos/nxos_pim_interface.py | 14 +++++++------- network/nxos/nxos_pim_rp_address.py | 4 ++-- network/nxos/nxos_ping.py | 2 +- network/nxos/nxos_portchannel.py | 6 +++--- network/nxos/nxos_snmp_community.py | 4 ++-- network/nxos/nxos_snmp_host.py | 8 ++++---- network/nxos/nxos_snmp_user.py | 4 ++-- network/nxos/nxos_static_route.py | 2 +- network/nxos/nxos_switchport.py | 2 +- network/nxos/nxos_udld.py | 10 +++++----- network/nxos/nxos_udld_interface.py | 4 ++-- network/nxos/nxos_vlan.py | 6 +++--- network/nxos/nxos_vpc.py | 6 +++--- network/nxos/nxos_vpc_interface.py | 8 ++++---- network/nxos/nxos_vrf.py | 6 +++--- network/nxos/nxos_vrf_af.py | 6 +++--- network/nxos/nxos_vrrp.py | 4 ++-- network/nxos/nxos_vtp_domain.py | 4 ++-- network/nxos/nxos_vtp_password.py | 4 ++-- network/nxos/nxos_vtp_version.py | 4 ++-- network/nxos/nxos_vxlan_vtep.py | 6 +++--- network/nxos/nxos_vxlan_vtep_vni.py | 6 +++--- network/sros/sros_rollback.py | 2 +- 69 files changed, 198 insertions(+), 197 deletions(-) diff --git a/cloud/amazon/ec2_asg.py b/cloud/amazon/ec2_asg.py index 0c22bc76..7a794d91 100644 --- a/cloud/amazon/ec2_asg.py +++ b/cloud/amazon/ec2_asg.py @@ -418,7 +418,7 @@ def create_autoscaling_group(connection, module): asg_tags = [] for tag in set_tags: - for k,v in tag.iteritems(): + for k,v in tag.items(): if k !='propagate_at_launch': asg_tags.append(Tag(key=k, value=v, diff --git a/cloud/amazon/ec2_elb_lb.py b/cloud/amazon/ec2_elb_lb.py index ec2bcd73..f7efb95c 100644 --- a/cloud/amazon/ec2_elb_lb.py +++ b/cloud/amazon/ec2_elb_lb.py @@ -907,7 +907,7 @@ class ElbManager(object): if not self.elb.health_check: self.elb.health_check = HealthCheck() - for attr, desired_value in health_check_config.iteritems(): + for attr, desired_value in health_check_config.items(): if getattr(self.elb.health_check, attr) != desired_value: setattr(self.elb.health_check, attr, desired_value) update_health_check = True @@ -946,7 +946,7 @@ class ElbManager(object): } update_access_logs_config = False - for attr, desired_value in access_logs_config.iteritems(): + for attr, desired_value in access_logs_config.items(): if getattr(attributes.access_log, attr) != desired_value: setattr(attributes.access_log, attr, desired_value) update_access_logs_config = True diff --git a/cloud/amazon/ec2_facts.py b/cloud/amazon/ec2_facts.py index bcda99f1..9836831c 100644 --- a/cloud/amazon/ec2_facts.py +++ b/cloud/amazon/ec2_facts.py @@ -92,7 +92,7 @@ class Ec2Metadata(object): def _mangle_fields(self, fields, uri, filter_patterns=['public-keys-0']): new_fields = {} - for key, value in fields.iteritems(): + for key, value in fields.items(): split_fields = key[len(uri):].split('/') if len(split_fields) > 1 and split_fields[1]: new_key = "-".join(split_fields) diff --git a/cloud/amazon/elasticache.py b/cloud/amazon/elasticache.py index 5a3a60c0..63246ccc 100644 --- a/cloud/amazon/elasticache.py +++ b/cloud/amazon/elasticache.py @@ -381,7 +381,7 @@ class ElastiCacheManager(object): 'NumCacheNodes': self.num_nodes, 'EngineVersion': self.cache_engine_version } - for key, value in modifiable_data.iteritems(): + for key, value in modifiable_data.items(): if value is not None and self.data[key] != value: return True @@ -414,7 +414,7 @@ class ElastiCacheManager(object): # Only check for modifications if zone is specified if self.zone is not None: unmodifiable_data['zone'] = self.data['PreferredAvailabilityZone'] - for key, value in unmodifiable_data.iteritems(): + for key, value in unmodifiable_data.items(): if getattr(self, key) is not None and getattr(self, key) != value: return True return False diff --git a/cloud/digital_ocean/digital_ocean.py b/cloud/digital_ocean/digital_ocean.py index a90f27f7..e7e9aead 100644 --- a/cloud/digital_ocean/digital_ocean.py +++ b/cloud/digital_ocean/digital_ocean.py @@ -225,7 +225,7 @@ class Droplet(JsonfyMixIn): def update_attr(self, attrs=None): if attrs: - for k, v in attrs.iteritems(): + for k, v in attrs.items(): setattr(self, k, v) else: json = self.manager.show_droplet(self.id) diff --git a/cloud/docker/_docker.py b/cloud/docker/_docker.py index bab50fcb..8f675a20 100644 --- a/cloud/docker/_docker.py +++ b/cloud/docker/_docker.py @@ -898,11 +898,11 @@ class DockerManager(object): self.ensure_capability('env_file') parsed_env_file = docker.utils.parse_env_file(env_file) - for name, value in parsed_env_file.iteritems(): + for name, value in parsed_env_file.items(): final_env[name] = str(value) if env: - for name, value in env.iteritems(): + for name, value in env.items(): final_env[name] = str(value) return final_env @@ -994,7 +994,7 @@ class DockerManager(object): self.ensure_capability('log_driver') log_config = docker.utils.LogConfig(type=docker.utils.LogConfig.types.JSON) if optionals['log_opt'] is not None: - for k, v in optionals['log_opt'].iteritems(): + for k, v in optionals['log_opt'].items(): log_config.set_config_value(k, v) log_config.type = optionals['log_driver'] params['log_config'] = log_config @@ -1069,7 +1069,7 @@ class DockerManager(object): ''' parts = [] - for k, v in self.counters.iteritems(): + for k, v in self.counters.items(): if v == 0: continue @@ -1096,7 +1096,7 @@ class DockerManager(object): def get_summary_counters_msg(self): msg = "" - for k, v in self.counters.iteritems(): + for k, v in self.counters.items(): msg = msg + "%s %d " % (k, v) return msg @@ -1105,7 +1105,7 @@ class DockerManager(object): self.counters[name] = self.counters[name] + 1 def has_changed(self): - for k, v in self.counters.iteritems(): + for k, v in self.counters.items(): if v > 0: return True @@ -1283,7 +1283,7 @@ class DockerManager(object): expected_env[name] = value if self.environment: - for name, value in self.environment.iteritems(): + for name, value in self.environment.items(): expected_env[name] = str(value) actual_env = {} @@ -1300,7 +1300,7 @@ class DockerManager(object): # LABELS expected_labels = {} - for name, value in self.module.params.get('labels').iteritems(): + for name, value in self.module.params.get('labels').items(): expected_labels[name] = str(value) if type(container['Config']['Labels']) is dict: @@ -1397,7 +1397,7 @@ class DockerManager(object): expected_bound_ports = {} if self.port_bindings: - for container_port, config in self.port_bindings.iteritems(): + for container_port, config in self.port_bindings.items(): if isinstance(container_port, int): container_port = "{0}/tcp".format(container_port) if len(config) == 1: @@ -1433,7 +1433,7 @@ class DockerManager(object): # LINKS expected_links = set() - for link, alias in (self.links or {}).iteritems(): + for link, alias in (self.links or {}).items(): expected_links.add("/{0}:{1}/{2}".format(link, container["Name"], alias)) actual_links = set(container['HostConfig']['Links'] or []) diff --git a/cloud/docker/docker_container.py b/cloud/docker/docker_container.py index a1a595ed..9140dddf 100644 --- a/cloud/docker/docker_container.py +++ b/cloud/docker/docker_container.py @@ -812,7 +812,7 @@ class TaskParameters(DockerBaseClass): kernel_memory='kernel_memory' ) result = dict() - for key, value in update_parameters.iteritems(): + for key, value in update_parameters.items(): if getattr(self, value, None) is not None: result[key] = getattr(self, value) return result @@ -924,7 +924,7 @@ class TaskParameters(DockerBaseClass): pid_mode='pid_mode' ) params = dict() - for key, value in host_config_params.iteritems(): + for key, value in host_config_params.items(): if getattr(self, value, None) is not None: params[key] = getattr(self, value) @@ -1113,10 +1113,10 @@ class TaskParameters(DockerBaseClass): final_env = {} if self.env_file: parsed_env_file = utils.parse_env_file(self.env_file) - for name, value in parsed_env_file.iteritems(): + for name, value in parsed_env_file.items(): final_env[name] = str(value) if self.env: - for name, value in self.env.iteritems(): + for name, value in self.env.items(): final_env[name] = str(value) return final_env @@ -1249,7 +1249,7 @@ class Container(DockerBaseClass): ) differences = [] - for key, value in config_mapping.iteritems(): + for key, value in config_mapping.items(): self.log('check differences %s %s vs %s' % (key, getattr(self.parameters, key), str(value))) if getattr(self.parameters, key, None) is not None: if isinstance(getattr(self.parameters, key), list) and isinstance(value, list): @@ -1305,7 +1305,7 @@ class Container(DockerBaseClass): ''' if not isinstance(dict_a, dict) or not isinstance(dict_b, dict): return False - for key, value in dict_a.iteritems(): + for key, value in dict_a.items(): if isinstance(value, dict): match = self._compare_dicts(value, dict_b.get(key)) elif isinstance(value, list): @@ -1344,7 +1344,7 @@ class Container(DockerBaseClass): ) differences = [] - for key, value in config_mapping.iteritems(): + for key, value in config_mapping.items(): if getattr(self.parameters, key, None) and getattr(self.parameters, key) != value: # no match. record the differences item = dict() @@ -1393,7 +1393,7 @@ class Container(DockerBaseClass): diff = True if network.get('links') and connected_networks[network['name']].get('Links'): expected_links = [] - for link, alias in network['links'].iteritems(): + for link, alias in network['links'].items(): expected_links.append("%s:%s" % (link, alias)) for link in expected_links: if link not in connected_networks[network['name']].get('Links', []): @@ -1424,7 +1424,7 @@ class Container(DockerBaseClass): connected_networks = self.container['NetworkSettings'].get('Networks') if connected_networks: - for network, network_config in connected_networks.iteritems(): + for network, network_config in connected_networks.items(): keep = False if self.parameters.networks: for expected_network in self.parameters.networks: @@ -1476,7 +1476,7 @@ class Container(DockerBaseClass): if not self.parameters.published_ports: return None expected_bound_ports = {} - for container_port, config in self.parameters.published_ports.iteritems(): + for container_port, config in self.parameters.published_ports.items(): if isinstance(container_port, int): container_port = "%s/tcp" % container_port if len(config) == 1: @@ -1495,7 +1495,7 @@ class Container(DockerBaseClass): self.log('parameter links:') self.log(self.parameters.links, pretty_print=True) exp_links = [] - for link, alias in self.parameters.links.iteritems(): + for link, alias in self.parameters.links.items(): exp_links.append("/%s:%s/%s" % (link, ('/' + self.parameters.name), alias)) return exp_links @@ -1626,7 +1626,7 @@ class Container(DockerBaseClass): if getattr(self.parameters, param_name, None) is None: return None results = [] - for key, value in getattr(self.parameters, param_name).iteritems(): + for key, value in getattr(self.parameters, param_name).items(): results.append("%s%s%s" % (key, join_with, value)) return results diff --git a/cloud/docker/docker_image.py b/cloud/docker/docker_image.py index 7d97d984..63f5827e 100644 --- a/cloud/docker/docker_image.py +++ b/cloud/docker/docker_image.py @@ -506,7 +506,7 @@ class ImageManager(DockerBaseClass): if self.container_limits: params['container_limits'] = self.container_limits if self.buildargs: - for key, value in self.buildargs.iteritems(): + for key, value in self.buildargs.items(): if not isinstance(value, basestring): self.buildargs[key] = str(value) params['buildargs'] = self.buildargs diff --git a/cloud/docker/docker_network.py b/cloud/docker/docker_network.py index 6b8056aa..8bca6901 100644 --- a/cloud/docker/docker_network.py +++ b/cloud/docker/docker_network.py @@ -238,7 +238,7 @@ class DockerNetworkManager(object): different = True differences.append('driver_options') else: - for key, value in self.parameters.driver_options.iteritems(): + for key, value in self.parameters.driver_options.items(): if not net['Options'].get(key) or value != net['Options'][key]: different = True differences.append('driver_options.%s' % key) @@ -251,7 +251,7 @@ class DockerNetworkManager(object): different = True differences.append('ipam_options') else: - for key, value in self.parameters.ipam_options.iteritems(): + for key, value in self.parameters.ipam_options.items(): camelkey = None for net_key in net['IPAM']['Config'][0]: if key == net_key.lower(): diff --git a/cloud/rackspace/rax.py b/cloud/rackspace/rax.py index 64105d32..186babc4 100644 --- a/cloud/rackspace/rax.py +++ b/cloud/rackspace/rax.py @@ -480,7 +480,7 @@ def cloudservers(module, state=None, name=None, flavor=None, image=None, if not boot_from_volume and not boot_volume and not image: module.fail_json(msg='image is required for the "rax" module') - for arg, value in dict(name=name, flavor=flavor).iteritems(): + for arg, value in dict(name=name, flavor=flavor).items(): if not value: module.fail_json(msg='%s is required for the "rax" module' % arg) diff --git a/cloud/rackspace/rax_cbs_attachments.py b/cloud/rackspace/rax_cbs_attachments.py index 3b014d46..1b330bdd 100644 --- a/cloud/rackspace/rax_cbs_attachments.py +++ b/cloud/rackspace/rax_cbs_attachments.py @@ -125,7 +125,7 @@ def cloud_block_storage_attachments(module, state, volume, server, device, volume.get() - for key, value in vars(volume).iteritems(): + for key, value in vars(volume).items(): if (isinstance(value, NON_CALLABLES) and not key.startswith('_')): instance[key] = value diff --git a/cloud/rackspace/rax_cdb.py b/cloud/rackspace/rax_cdb.py index ec659222..2f2fd53c 100644 --- a/cloud/rackspace/rax_cdb.py +++ b/cloud/rackspace/rax_cdb.py @@ -110,7 +110,7 @@ def save_instance(module, name, flavor, volume, cdb_type, cdb_version, wait, for arg, value in dict(name=name, flavor=flavor, volume=volume, type=cdb_type, version=cdb_version - ).iteritems(): + ).items(): if not value: module.fail_json(msg='%s is required for the "rax_cdb"' ' module' % arg) diff --git a/cloud/rackspace/rax_cdb_user.py b/cloud/rackspace/rax_cdb_user.py index ff54365e..833c00d4 100644 --- a/cloud/rackspace/rax_cdb_user.py +++ b/cloud/rackspace/rax_cdb_user.py @@ -89,7 +89,7 @@ def find_user(instance, name): def save_user(module, cdb_id, name, password, databases, host): - for arg, value in dict(cdb_id=cdb_id, name=name).iteritems(): + for arg, value in dict(cdb_id=cdb_id, name=name).items(): if not value: module.fail_json(msg='%s is required for the "rax_cdb_user" ' 'module' % arg) @@ -144,7 +144,7 @@ def save_user(module, cdb_id, name, password, databases, host): def delete_user(module, cdb_id, name): - for arg, value in dict(cdb_id=cdb_id, name=name).iteritems(): + for arg, value in dict(cdb_id=cdb_id, name=name).items(): if not value: module.fail_json(msg='%s is required for the "rax_cdb_user"' ' module' % arg) diff --git a/cloud/rackspace/rax_clb.py b/cloud/rackspace/rax_clb.py index f02d6488..8c37f2eb 100644 --- a/cloud/rackspace/rax_clb.py +++ b/cloud/rackspace/rax_clb.py @@ -196,7 +196,7 @@ def cloud_load_balancer(module, state, name, meta, algorithm, port, protocol, 'protocol': protocol, 'timeout': timeout } - for att, value in atts.iteritems(): + for att, value in atts.items(): current = getattr(balancer, att) if current != value: changed = True diff --git a/cloud/vmware/vsphere_guest.py b/cloud/vmware/vsphere_guest.py index 01a75c34..8f826eb1 100644 --- a/cloud/vmware/vsphere_guest.py +++ b/cloud/vmware/vsphere_guest.py @@ -859,7 +859,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)) @@ -1081,7 +1081,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']) @@ -1112,7 +1112,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 @@ -1141,7 +1141,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() @@ -1174,7 +1174,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 @@ -1227,7 +1227,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 diff --git a/network/cumulus/cl_bond.py b/network/cumulus/cl_bond.py index 52da0bed..cdcf2aaf 100644 --- a/network/cumulus/cl_bond.py +++ b/network/cumulus/cl_bond.py @@ -445,7 +445,7 @@ def main(): # checks all lists and removes it, so that functions expecting # an empty list, get this result. May upstream this fix into # the AnsibleModule code to have it check for this. - for k, _param in module.params.iteritems(): + for k, _param in module.params.items(): if isinstance(_param, list): module.params[k] = [x for x in _param if x] diff --git a/network/cumulus/cl_bridge.py b/network/cumulus/cl_bridge.py index 256fa427..0e685af6 100644 --- a/network/cumulus/cl_bridge.py +++ b/network/cumulus/cl_bridge.py @@ -374,7 +374,7 @@ def main(): # checks all lists and removes it, so that functions expecting # an empty list, get this result. May upstream this fix into # the AnsibleModule code to have it check for this. - for k, _param in module.params.iteritems(): + for k, _param in module.params.items(): if isinstance(_param, list): module.params[k] = [x for x in _param if x] diff --git a/network/cumulus/cl_interface.py b/network/cumulus/cl_interface.py index 3fd87bf9..93c14dbd 100644 --- a/network/cumulus/cl_interface.py +++ b/network/cumulus/cl_interface.py @@ -408,7 +408,7 @@ def main(): # checks all lists and removes it, so that functions expecting # an empty list, get this result. May upstream this fix into # the AnsibleModule code to have it check for this. - for k, _param in module.params.iteritems(): + for k, _param in module.params.items(): if isinstance(_param, list): module.params[k] = [x for x in _param if x] diff --git a/network/dellos10/dellos10_facts.py b/network/dellos10/dellos10_facts.py index 2d516f55..1ff516bf 100644 --- a/network/dellos10/dellos10_facts.py +++ b/network/dellos10/dellos10_facts.py @@ -439,7 +439,7 @@ def main(): module.exit_json(out=module.from_json(runner.items)) ansible_facts = dict() - for key, value in facts.iteritems(): + for key, value in facts.items(): key = 'ansible_net_%s' % key ansible_facts[key] = value diff --git a/network/dellos6/dellos6_facts.py b/network/dellos6/dellos6_facts.py index 224ff2e3..c7147569 100644 --- a/network/dellos6/dellos6_facts.py +++ b/network/dellos6/dellos6_facts.py @@ -236,7 +236,7 @@ class Interfaces(FactsBase): def populate_interfaces(self, interfaces, desc, properties): facts = dict() - for key, value in interfaces.iteritems(): + for key, value in interfaces.items(): intf = dict() intf['description'] = self.parse_description(key,desc) intf['macaddress'] = self.parse_macaddress(value) @@ -429,7 +429,7 @@ def main(): module.exit_json(out=module.from_json(runner.items)) ansible_facts = dict() - for key, value in facts.iteritems(): + for key, value in facts.items(): key = 'ansible_net_%s' % key ansible_facts[key] = value diff --git a/network/dellos9/dellos9_facts.py b/network/dellos9/dellos9_facts.py index 2e033acf..f5d17858 100644 --- a/network/dellos9/dellos9_facts.py +++ b/network/dellos9/dellos9_facts.py @@ -282,7 +282,7 @@ class Interfaces(FactsBase): def populate_interfaces(self, interfaces): facts = dict() - for key, value in interfaces.iteritems(): + for key, value in interfaces.items(): intf = dict() intf['description'] = self.parse_description(value) intf['macaddress'] = self.parse_macaddress(value) @@ -303,7 +303,7 @@ class Interfaces(FactsBase): return facts def populate_ipv6_interfaces(self, data): - for key, value in data.iteritems(): + for key, value in data.items(): self.facts['interfaces'][key]['ipv6'] = list() addresses = re.findall(r'\s+(.+), subnet', value, re.M) subnets = re.findall(r', subnet is (\S+)', value, re.M) @@ -552,7 +552,7 @@ def main(): module.exit_json(out=module.from_json(runner.items)) ansible_facts = dict() - for key, value in facts.iteritems(): + for key, value in facts.items(): key = 'ansible_net_%s' % key ansible_facts[key] = value diff --git a/network/eos/eos_eapi.py b/network/eos/eos_eapi.py index 8087a8d0..2d477c03 100644 --- a/network/eos/eos_eapi.py +++ b/network/eos/eos_eapi.py @@ -216,7 +216,7 @@ def get_instance(module): def started(module, instance, commands): commands.append('no shutdown') setters = set() - for key, value in module.argument_spec.iteritems(): + for key, value in module.argument_spec.items(): if module.params[key] is not None: setter = value.get('setter') or 'set_%s' % key if setter not in setters: diff --git a/network/nxos/nxos_aaa_server.py b/network/nxos/nxos_aaa_server.py index 2ba0ac28..60be1c99 100644 --- a/network/nxos/nxos_aaa_server.py +++ b/network/nxos/nxos_aaa_server.py @@ -160,6 +160,7 @@ import re from ansible.module_utils.basic import get_exception from ansible.module_utils.netcfg import NetworkConfig, ConfigLine from ansible.module_utils.shell import ShellError +from ansible.module_utils.six import iteritems try: from ansible.module_utils.nxos import get_module @@ -502,7 +503,7 @@ def main(): server_timeout=server_timeout, directed_request=directed_request) changed = False - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) existing = get_aaa_server_info(server_type, module) end_state = existing @@ -525,15 +526,15 @@ def main(): module.fail_json( msg='server_timeout must be an integer between 1 and 60') - delta = dict(set(proposed.iteritems()).difference( - existing.iteritems())) + delta = dict(set(proposed.items()).difference( + existing.items())) if delta: command = config_aaa_server(delta, server_type) if command: commands.append(command) elif state == 'default': - for key, value in proposed.iteritems(): + for key, value in proposed.items(): if key != 'server_type' and value != 'default': module.fail_json( msg='Parameters must be set to "default"' diff --git a/network/nxos/nxos_aaa_server_host.py b/network/nxos/nxos_aaa_server_host.py index 1c86f691..9a0fdd50 100644 --- a/network/nxos/nxos_aaa_server_host.py +++ b/network/nxos/nxos_aaa_server_host.py @@ -507,7 +507,7 @@ def main(): auth_port=auth_port, acct_port=acct_port, tacacs_port=tacacs_port) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) changed = False if encrypt_type and not key: @@ -536,7 +536,7 @@ def main(): msg='host_timeout must be an integer between 1 and 60') delta = dict( - set(proposed.iteritems()).difference(existing.iteritems())) + set(proposed.items()).difference(existing.items())) if delta: union = existing.copy() union.update(delta) @@ -546,7 +546,7 @@ def main(): elif state == 'absent': intersect = dict( - set(proposed.iteritems()).intersection(existing.iteritems())) + set(proposed.items()).intersection(existing.items())) if intersect.get('address') and intersect.get('server_type'): command = 'no {0}-server host {1}'.format( intersect.get('server_type'), intersect.get('address')) diff --git a/network/nxos/nxos_acl.py b/network/nxos/nxos_acl.py index d5cf3afb..279f2bfa 100644 --- a/network/nxos/nxos_acl.py +++ b/network/nxos/nxos_acl.py @@ -521,13 +521,13 @@ def get_acl(module, acl_name, seq_number): options['time_range'] = each.get('timerange') options_no_null = {} - for key, value in options.iteritems(): + for key, value in options.items(): if value is not None: options_no_null[key] = value keep['options'] = options_no_null - for key, value in temp.iteritems(): + for key, value in temp.items(): if value: keep[key] = value # ensure options is always in the dict @@ -596,7 +596,7 @@ def config_acl_options(options): options.pop('time_range') command = '' - for option, value in options.iteritems(): + for option, value in options.items(): if option in ENABLE_ONLY: if value == 'enable': command += ' ' + option @@ -727,11 +727,11 @@ def main(): 'dest_port1', 'dest_port2', 'remark'] proposed_core = dict((param, value) for (param, value) in - module.params.iteritems() + module.params.items() if param in CORE and value is not None) proposed_options = dict((param, value) for (param, value) in - module.params.iteritems() + module.params.items() if param in OPTIONS_NAMES and value is not None) proposed = {} proposed.update(proposed_core) @@ -753,12 +753,12 @@ def main(): if not existing_core.get('remark'): delta_core = dict( - set(proposed_core.iteritems()).difference( - existing_core.iteritems()) + set(proposed_core.items()).difference( + existing_core.items()) ) delta_options = dict( - set(proposed_options.iteritems()).difference( - existing_options.iteritems()) + set(proposed_options.items()).difference( + existing_options.items()) ) if state == 'present': diff --git a/network/nxos/nxos_bgp.py b/network/nxos/nxos_bgp.py index 7e117873..e271cbf9 100644 --- a/network/nxos/nxos_bgp.py +++ b/network/nxos/nxos_bgp.py @@ -754,7 +754,7 @@ def state_present(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if value is True: commands.append(key) elif value is False: @@ -950,7 +950,7 @@ def main(): ] if module.params['vrf'] != 'default': - for param, inserted_value in module.params.iteritems(): + for param, inserted_value in module.params.items(): if param in GLOBAL_PARAMS and inserted_value: module.fail_json(msg='Global params can be modified only' ' under "default" VRF.', @@ -967,10 +967,10 @@ def main(): existing_asn=existing.get('asn')) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key != 'asn' and key != 'vrf': if str(value).lower() == 'default': value = PARAM_TO_DEFAULT_KEYMAP.get(key) diff --git a/network/nxos/nxos_bgp_af.py b/network/nxos/nxos_bgp_af.py index a5fca942..0159e051 100644 --- a/network/nxos/nxos_bgp_af.py +++ b/network/nxos/nxos_bgp_af.py @@ -734,7 +734,7 @@ def fix_proposed(module, proposed, existing): commands = list() command = '' fixed_proposed = {} - for key, value in proposed.iteritems(): + for key, value in proposed.items(): if key in DAMPENING_PARAMS: if value != 'default': command = 'dampening {0} {1} {2} {3}'.format( @@ -872,7 +872,7 @@ def state_present(module, existing, proposed, candidate): fixed_proposed, commands = fix_proposed(module, proposed, existing) proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, fixed_proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if key == 'address-family': addr_family_command = "address-family {0} {1}".format( module.params['afi'], module.params['safi']) @@ -1058,7 +1058,7 @@ def main(): existing_asn=existing.get('asn')) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) if proposed_args.get('networks'): @@ -1069,7 +1069,7 @@ def main(): proposed_args['inject_map'] = 'default' proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key not in ['asn', 'vrf']: if str(value).lower() == 'default': value = PARAM_TO_DEFAULT_KEYMAP.get(key) diff --git a/network/nxos/nxos_bgp_neighbor.py b/network/nxos/nxos_bgp_neighbor.py index e809ae4a..e7b3d41b 100644 --- a/network/nxos/nxos_bgp_neighbor.py +++ b/network/nxos/nxos_bgp_neighbor.py @@ -575,7 +575,7 @@ def state_present(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if value is True: commands.append(key) @@ -724,11 +724,11 @@ def main(): existing_asn=existing.get('asn')) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key not in ['asn', 'vrf', 'neighbor', 'pwd_type']: if str(value).lower() == 'default': value = PARAM_TO_DEFAULT_KEYMAP.get(key) diff --git a/network/nxos/nxos_bgp_neighbor_af.py b/network/nxos/nxos_bgp_neighbor_af.py index 7524a2a8..1679fc90 100644 --- a/network/nxos/nxos_bgp_neighbor_af.py +++ b/network/nxos/nxos_bgp_neighbor_af.py @@ -894,7 +894,7 @@ def state_present(module, existing, proposed, candidate): 'route-map out', 'soft-reconfiguration inbound' ] - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if key == 'send-community' and value == 'none': commands.append('{0}'.format(key)) @@ -1069,11 +1069,11 @@ def main(): module.params['advertise_map_non_exist'] = 'default' end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key not in ['asn', 'vrf', 'neighbor']: if not isinstance(value, list): if str(value).lower() == 'true': diff --git a/network/nxos/nxos_evpn_global.py b/network/nxos/nxos_evpn_global.py index dbe03429..4c03649f 100644 --- a/network/nxos/nxos_evpn_global.py +++ b/network/nxos/nxos_evpn_global.py @@ -268,7 +268,7 @@ def get_commands(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if value is True: commands.append(key) elif value is False: diff --git a/network/nxos/nxos_evpn_vni.py b/network/nxos/nxos_evpn_vni.py index a9216e29..04c0c60d 100644 --- a/network/nxos/nxos_evpn_vni.py +++ b/network/nxos/nxos_evpn_vni.py @@ -329,7 +329,7 @@ def get_existing(module, args): else: existing[arg] = get_route_target_value(arg, config, module) - existing_fix = dict((k, v) for k, v in existing.iteritems() if v) + existing_fix = dict((k, v) for k, v in existing.items() if v) if existing_fix: existing['vni'] = module.params['vni'] else: @@ -357,7 +357,7 @@ def state_present(module, existing, proposed): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if key.startswith('route-target'): if value == ['default']: existing_value = existing_commands.get(key) @@ -433,11 +433,11 @@ def main(): existing = invoke('get_existing', module, args) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key != 'vni': if value == 'true': value = True diff --git a/network/nxos/nxos_hsrp.py b/network/nxos/nxos_hsrp.py index 66d24495..407d1d07 100644 --- a/network/nxos/nxos_hsrp.py +++ b/network/nxos/nxos_hsrp.py @@ -491,7 +491,7 @@ def get_commands_config_hsrp(delta, interface, args): elif preempt == 'disabled': delta['preempt'] = 'no preempt' - for key, value in delta.iteritems(): + for key, value in delta.items(): command = config_args.get(key, 'DNE').format(**delta) if command and command != 'DNE': if key == 'group': @@ -645,7 +645,7 @@ def main(): preempt=preempt, vip=vip, auth_type=auth_type, auth_string=auth_string) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) existing = get_hsrp_group(group, interface, module) @@ -666,7 +666,7 @@ def main(): commands = [] if state == 'present': delta = dict( - set(proposed.iteritems()).difference(existing.iteritems())) + set(proposed.items()).difference(existing.items())) if delta: command = get_commands_config_hsrp(delta, interface, args) commands.extend(command) diff --git a/network/nxos/nxos_igmp.py b/network/nxos/nxos_igmp.py index 58e2ca5c..0385877b 100644 --- a/network/nxos/nxos_igmp.py +++ b/network/nxos/nxos_igmp.py @@ -289,11 +289,11 @@ def get_commands(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) if module.params['state'] == 'default': - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if existing_commands.get(key): commands.append('no {0}'.format(key)) else: - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if value is True: commands.append(key) else: @@ -349,7 +349,7 @@ def main(): existing = invoke('get_existing', module, args) end_state = existing - proposed = dict((k, v) for k, v in module.params.iteritems() + proposed = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed_args = proposed.copy() diff --git a/network/nxos/nxos_igmp_interface.py b/network/nxos/nxos_igmp_interface.py index b9c2846f..f2ee6da1 100644 --- a/network/nxos/nxos_igmp_interface.py +++ b/network/nxos/nxos_igmp_interface.py @@ -620,7 +620,7 @@ def config_igmp_interface(delta, found_both, found_prefix): commands = [] command = None - for key, value in delta.iteritems(): + for key, value in delta.items(): if key == 'oif_source' or found_both or found_prefix: pass elif key == 'oif_prefix': @@ -665,7 +665,7 @@ def get_igmp_interface_defaults(): group_timeout=group_timeout, report_llg=report_llg, immediate_leave=immediate_leave) - default = dict((param, value) for (param, value) in args.iteritems() + default = dict((param, value) for (param, value) in args.items() if value is not None) return default @@ -674,7 +674,7 @@ def get_igmp_interface_defaults(): def config_default_igmp_interface(existing, delta, found_both, found_prefix): commands = [] proposed = get_igmp_interface_defaults() - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) if delta: command = config_igmp_interface(delta, found_both, found_prefix) @@ -810,7 +810,7 @@ def main(): changed = False commands = [] - proposed = dict((k, v) for k, v in module.params.iteritems() + proposed = dict((k, v) for k, v in module.params.items() if v is not None and k in args) CANNOT_ABSENT = ['version', 'startup_query_interval', @@ -827,7 +827,7 @@ def main(): 'state=absent') # delta check for all params except oif_prefix and oif_source - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) # now check to see there is a delta for prefix and source command option found_both = False diff --git a/network/nxos/nxos_igmp_snooping.py b/network/nxos/nxos_igmp_snooping.py index 43a53562..4b56ef1c 100644 --- a/network/nxos/nxos_igmp_snooping.py +++ b/network/nxos/nxos_igmp_snooping.py @@ -440,7 +440,7 @@ def config_igmp_snooping(delta, existing, default=False): commands = [] command = None - for key, value in delta.iteritems(): + for key, value in delta.items(): if value: if default and key == 'group_timeout': if existing.get(key): @@ -468,7 +468,7 @@ def get_igmp_snooping_defaults(): report_supp=report_supp, v3_report_supp=v3_report_supp, group_timeout=group_timeout) - default = dict((param, value) for (param, value) in args.iteritems() + default = dict((param, value) for (param, value) in args.items() if value is not None) return default @@ -497,7 +497,7 @@ def main(): report_supp=report_supp, v3_report_supp=v3_report_supp, group_timeout=group_timeout) - proposed = dict((param, value) for (param, value) in args.iteritems() + proposed = dict((param, value) for (param, value) in args.items() if value is not None) existing = get_igmp_snooping(module) @@ -507,7 +507,7 @@ def main(): commands = [] if state == 'present': delta = dict( - set(proposed.iteritems()).difference(existing.iteritems()) + set(proposed.items()).difference(existing.items()) ) if delta: command = config_igmp_snooping(delta, existing) @@ -516,7 +516,7 @@ def main(): elif state == 'default': proposed = get_igmp_snooping_defaults() delta = dict( - set(proposed.iteritems()).difference(existing.iteritems()) + set(proposed.items()).difference(existing.items()) ) if delta: command = config_igmp_snooping(delta, existing, default=True) diff --git a/network/nxos/nxos_interface.py b/network/nxos/nxos_interface.py index 31c01811..7d666e13 100644 --- a/network/nxos/nxos_interface.py +++ b/network/nxos/nxos_interface.py @@ -882,8 +882,8 @@ def main(): existing) commands.append(cmds) else: - delta = dict(set(proposed.iteritems()).difference( - existing.iteritems())) + delta = dict(set(proposed.items()).difference( + existing.items())) if delta: cmds = get_interface_config_commands(delta, normalized_interface, diff --git a/network/nxos/nxos_interface_ospf.py b/network/nxos/nxos_interface_ospf.py index 34ec566c..cb1fa6c0 100644 --- a/network/nxos/nxos_interface_ospf.py +++ b/network/nxos/nxos_interface_ospf.py @@ -506,7 +506,7 @@ def state_present(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if value is True: commands.append(key) elif value is False: @@ -535,7 +535,7 @@ def state_absent(module, existing, proposed, candidate): parents = ['interface {0}'.format(module.params['interface'].capitalize())] existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in existing_commands.iteritems(): + for key, value in existing_commands.items(): if value: if key.startswith('ip ospf message-digest-key'): if 'options' not in key: @@ -631,11 +631,11 @@ def main(): existing = invoke('get_existing', module, args) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key != 'interface': if str(value).lower() == 'true': value = True diff --git a/network/nxos/nxos_ip_interface.py b/network/nxos/nxos_ip_interface.py index 1e49a9d2..c9f2246b 100644 --- a/network/nxos/nxos_ip_interface.py +++ b/network/nxos/nxos_ip_interface.py @@ -641,7 +641,7 @@ def main(): existing, address_list = get_ip_interface(interface, version, module) args = dict(addr=addr, mask=mask, interface=interface) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) commands = [] changed = False end_state = existing diff --git a/network/nxos/nxos_mtu.py b/network/nxos/nxos_mtu.py index dbcc09f0..6c9595bb 100644 --- a/network/nxos/nxos_mtu.py +++ b/network/nxos/nxos_mtu.py @@ -405,7 +405,7 @@ def get_commands_config_mtu(delta, interface): } commands = [] - for param, value in delta.iteritems(): + for param, value in delta.items(): command = CONFIG_ARGS.get(param, 'DNE').format(**delta) if command and command != 'DNE': commands.append(command) @@ -422,7 +422,7 @@ def get_commands_remove_mtu(delta, interface): 'sysmtu': 'no system jumbomtu {sysmtu}', } commands = [] - for param, value in delta.iteritems(): + for param, value in delta.items(): command = CONFIG_ARGS.get(param, 'DNE').format(**delta) if command and command != 'DNE': commands.append(command) @@ -546,8 +546,8 @@ def main(): 'number between 576 and 9216') args = dict(mtu=mtu, sysmtu=sysmtu) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + proposed = dict((k, v) for k, v in args.items() if v is not None) + delta = dict(set(proposed.items()).difference(existing.items())) changed = False end_state = existing @@ -559,7 +559,7 @@ def main(): commands.append(command) elif state == 'absent': - common = set(proposed.iteritems()).intersection(existing.iteritems()) + common = set(proposed.items()).intersection(existing.items()) if common: command = get_commands_remove_mtu(dict(common), interface) commands.append(command) diff --git a/network/nxos/nxos_ntp.py b/network/nxos/nxos_ntp.py index 6310b593..f06d3b6d 100644 --- a/network/nxos/nxos_ntp.py +++ b/network/nxos/nxos_ntp.py @@ -433,7 +433,7 @@ def get_ntp_peer(module): args = dict(peer_type=peer_type, address=address, prefer=prefer, vrf_name=vrf_name, key_id=key_id) - ntp_peer = dict((k, v) for k, v in args.iteritems()) + ntp_peer = dict((k, v) for k, v in args.items()) ntp_peer_list.append(ntp_peer) except AttributeError: ntp_peer_list = [] @@ -567,7 +567,7 @@ def main(): prefer=prefer, vrf_name=vrf_name, source_type=source_type, source=source) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) existing, peer_server_list = get_ntp_existing(address, peer_type, module) @@ -576,7 +576,7 @@ def main(): commands = [] if state == 'present': - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) if delta: command = config_ntp(delta, existing) if command: diff --git a/network/nxos/nxos_ntp_auth.py b/network/nxos/nxos_ntp_auth.py index 00b2ef32..283d87e5 100644 --- a/network/nxos/nxos_ntp_auth.py +++ b/network/nxos/nxos_ntp_auth.py @@ -512,12 +512,12 @@ def main(): authentication=authentication) changed = False - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) existing = get_ntp_auth_info(key_id, module) end_state = existing - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) commands = [] if state == 'present': @@ -547,7 +547,7 @@ def main(): clie = get_exception() module.fail_json(msg=str(clie) + ": " + cmds) end_state = get_ntp_auth_info(key_id, module) - delta = dict(set(end_state.iteritems()).difference(existing.iteritems())) + delta = dict(set(end_state.items()).difference(existing.items())) if delta or (len(existing) != len(end_state)): changed = True diff --git a/network/nxos/nxos_ntp_options.py b/network/nxos/nxos_ntp_options.py index 471d20d0..b5b1e57d 100644 --- a/network/nxos/nxos_ntp_options.py +++ b/network/nxos/nxos_ntp_options.py @@ -462,13 +462,13 @@ def main(): args = dict(master=master, stratum=stratum, logging=logging) changed = False - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) if master is False: proposed['stratum'] = None stratum = None - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) delta_stratum = delta.get('stratum') if delta_stratum: @@ -482,8 +482,8 @@ def main(): commands.append(command) elif state == 'absent': if existing: - isection = dict(set(proposed.iteritems()).intersection( - existing.iteritems())) + isection = dict(set(proposed.items()).intersection( + existing.items())) command = config_ntp_options(isection, flip=True) if command: commands.append(command) diff --git a/network/nxos/nxos_nxapi.py b/network/nxos/nxos_nxapi.py index 3324130b..e4b6839d 100644 --- a/network/nxos/nxos_nxapi.py +++ b/network/nxos/nxos_nxapi.py @@ -173,7 +173,7 @@ def get_instance(module): def present(module, instance, commands): commands.append('feature nxapi') setters = set() - for key, value in module.argument_spec.iteritems(): + for key, value in module.argument_spec.items(): setter = value.get('setter') or 'set_%s' % key if setter not in setters: setters.add(setter) diff --git a/network/nxos/nxos_ospf_vrf.py b/network/nxos/nxos_ospf_vrf.py index 6e946d11..872dbd13 100644 --- a/network/nxos/nxos_ospf_vrf.py +++ b/network/nxos/nxos_ospf_vrf.py @@ -426,7 +426,7 @@ def state_present(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if value is True: commands.append(key) @@ -480,7 +480,7 @@ def state_absent(module, existing, proposed, candidate): parents = ['router ospf {0}'.format(module.params['ospf'])] if module.params['vrf'] == 'default': existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in existing_commands.iteritems(): + for key, value in existing_commands.items(): if value: if key == 'timers throttle lsa': command = 'no {0} {1} {2} {3}'.format( @@ -547,11 +547,11 @@ def main(): existing = invoke('get_existing', module, args) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key != 'interface': if str(value).lower() == 'true': value = True diff --git a/network/nxos/nxos_overlay_global.py b/network/nxos/nxos_overlay_global.py index 710e02e2..04b4e010 100644 --- a/network/nxos/nxos_overlay_global.py +++ b/network/nxos/nxos_overlay_global.py @@ -305,7 +305,7 @@ def get_commands(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if value == 'default': existing_value = existing_commands.get(key) if existing_value: @@ -381,7 +381,7 @@ def main(): existing = invoke('get_existing', module, args) end_state = existing - proposed = dict((k, v) for k, v in module.params.iteritems() + proposed = dict((k, v) for k, v in module.params.items() if v is not None and k in args) result = {} diff --git a/network/nxos/nxos_pim.py b/network/nxos/nxos_pim.py index da5b49a8..5ccd7319 100644 --- a/network/nxos/nxos_pim.py +++ b/network/nxos/nxos_pim.py @@ -271,7 +271,7 @@ def get_commands(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): command = '{0} {1}'.format(key, value) commands.append(command) @@ -301,7 +301,7 @@ def main(): existing = invoke('get_existing', module, args) end_state = existing - proposed = dict((k, v) for k, v in module.params.iteritems() + proposed = dict((k, v) for k, v in module.params.items() if v is not None and k in args) result = {} diff --git a/network/nxos/nxos_pim_interface.py b/network/nxos/nxos_pim_interface.py index 8a013e4d..c0a95d42 100644 --- a/network/nxos/nxos_pim_interface.py +++ b/network/nxos/nxos_pim_interface.py @@ -655,7 +655,7 @@ def config_pim_interface(delta, existing, jp_bidir, isauth): if command: commands.append(command) - for k, v in delta.iteritems(): + for k, v in delta.items(): if k in ['dr_prio', 'hello_interval', 'hello_auth_key', 'border', 'sparse']: if v: @@ -720,7 +720,7 @@ def get_pim_interface_defaults(): hello_interval=hello_interval, hello_auth_key=hello_auth_key) - default = dict((param, value) for (param, value) in args.iteritems() + default = dict((param, value) for (param, value) in args.items() if value is not None) return default @@ -740,7 +740,7 @@ def default_pim_interface_policies(existing, jp_bidir): elif not jp_bidir: command = None - for k, v in existing.iteritems(): + for k, v in existing.items(): if k == 'jp_policy_in': if existing.get('jp_policy_in'): if existing.get('jp_type_in') == 'prefix': @@ -777,8 +777,8 @@ def config_pim_interface_defaults(existing, jp_bidir, isauth): # returns a dict defaults = get_pim_interface_defaults() - delta = dict(set(defaults.iteritems()).difference( - existing.iteritems())) + delta = dict(set(defaults.items()).difference( + existing.items())) if delta: # returns a list command = config_pim_interface(delta, existing, @@ -860,7 +860,7 @@ def main(): 'neighbor_type', 'neighbor_policy' ] - proposed = dict((k, v) for k, v in module.params.iteritems() + proposed = dict((k, v) for k, v in module.params.items() if v is not None and k in args) ''' @@ -873,7 +873,7 @@ def main(): if hello_interval: proposed['hello_interval'] = str(proposed['hello_interval'] * 1000) - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) if state == 'present': if delta: diff --git a/network/nxos/nxos_pim_rp_address.py b/network/nxos/nxos_pim_rp_address.py index bdb3c46f..136189ce 100644 --- a/network/nxos/nxos_pim_rp_address.py +++ b/network/nxos/nxos_pim_rp_address.py @@ -371,11 +371,11 @@ def main(): existing = invoke('get_existing', module, args) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if str(value).lower() == 'true': value = True elif str(value).lower() == 'false': diff --git a/network/nxos/nxos_ping.py b/network/nxos/nxos_ping.py index b4778d5f..c11c5080 100644 --- a/network/nxos/nxos_ping.py +++ b/network/nxos/nxos_ping.py @@ -401,7 +401,7 @@ def main(): } ping_command = 'ping {0}'.format(destination) - for command, arg in OPTIONS.iteritems(): + for command, arg in OPTIONS.items(): if arg: ping_command += ' {0} {1}'.format(command, arg) diff --git a/network/nxos/nxos_portchannel.py b/network/nxos/nxos_portchannel.py index c1f1ee10..aebc4219 100644 --- a/network/nxos/nxos_portchannel.py +++ b/network/nxos/nxos_portchannel.py @@ -469,7 +469,7 @@ def get_portchannel(module, netcfg=None): # Ensure each member have the same mode. modes = set() - for each, value in member_dictionary.iteritems(): + for each, value in member_dictionary.items(): modes.update([value['mode']]) if len(modes) == 1: portchannel['mode'] = value['mode'] @@ -591,7 +591,7 @@ def get_commands_if_mode_change(proposed, existing, group, mode, module): members_to_remove = set(existing_members).difference(proposed_members) members_with_mode_change = [] if members_dict: - for interface, values in members_dict.iteritems(): + for interface, values in members_dict.items(): if (interface in proposed_members and (interface not in members_to_remove)): if values['mode'] != mode: @@ -677,7 +677,7 @@ def main(): existing, interface_exist = invoke('get_existing', module, args) end_state = existing - proposed = dict((k, v) for k, v in module.params.iteritems() + proposed = dict((k, v) for k, v in module.params.items() if v is not None and k in args) result = {} diff --git a/network/nxos/nxos_snmp_community.py b/network/nxos/nxos_snmp_community.py index fa42d3df..1c705b4f 100644 --- a/network/nxos/nxos_snmp_community.py +++ b/network/nxos/nxos_snmp_community.py @@ -304,7 +304,7 @@ def get_existing(module): if existing.get('group') or existing.get('acl'): existing['community'] = module.params['community'] existing = dict((key, value) for key, value in - existing.iteritems() if value) + existing.items() if value) return existing @@ -363,7 +363,7 @@ def main(): group = 'network-admin' args = ['community', 'acl'] - proposed = dict((k, v) for k, v in module.params.iteritems() + proposed = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed['group'] = group existing = get_existing(module) diff --git a/network/nxos/nxos_snmp_host.py b/network/nxos/nxos_snmp_host.py index 9ee884eb..5a4f300a 100644 --- a/network/nxos/nxos_snmp_host.py +++ b/network/nxos/nxos_snmp_host.py @@ -426,7 +426,7 @@ def get_snmp_host(host, module): if find: fix_find = {} - for (key, value) in find.iteritems(): + for (key, value) in find.items(): if isinstance(value, str): fix_find[key] = value.strip() else: @@ -501,7 +501,7 @@ def config_snmp_host(delta, proposed, existing, module): 'src_intf': 'snmp-server host {0} source-interface {src_intf}' } - for key, value in delta.iteritems(): + for key, value in delta.items(): if key in ['vrf_filter', 'vrf', 'udp', 'src_intf']: command = CMDS.get(key, None) if command: @@ -591,9 +591,9 @@ def main(): snmp_type=snmp_type ) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) changed = False commands = [] diff --git a/network/nxos/nxos_snmp_user.py b/network/nxos/nxos_snmp_user.py index 6c84b09f..750140fe 100644 --- a/network/nxos/nxos_snmp_user.py +++ b/network/nxos/nxos_snmp_user.py @@ -500,7 +500,7 @@ def main(): args = dict(user=user, pwd=pwd, group=group, privacy=privacy, encrypt=encrypt, authentication=authentication) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) if not existing: if encrypt: @@ -516,7 +516,7 @@ def main(): proposed['encrypt'] = 'aes-128' delta = dict( - set(proposed.iteritems()).difference(existing.iteritems())) + set(proposed.items()).difference(existing.items())) if delta.get('pwd'): delta['authentication'] = authentication diff --git a/network/nxos/nxos_static_route.py b/network/nxos/nxos_static_route.py index 6726b3ba..2654dbb2 100644 --- a/network/nxos/nxos_static_route.py +++ b/network/nxos/nxos_static_route.py @@ -439,7 +439,7 @@ def main(): end_state = existing args = ['route_name', 'vrf', 'pref', 'tag', 'next_hop', 'prefix'] - proposed = dict((k, v) for k, v in module.params.iteritems() if v is not None and k in args) + proposed = dict((k, v) for k, v in module.params.items() if v is not None and k in args) if state == 'present' or (state == 'absent' and existing): candidate = CustomNetworkConfig(indent=3) diff --git a/network/nxos/nxos_switchport.py b/network/nxos/nxos_switchport.py index 032b3a32..55363065 100644 --- a/network/nxos/nxos_switchport.py +++ b/network/nxos/nxos_switchport.py @@ -697,7 +697,7 @@ def main(): native_vlan=native_vlan, trunk_vlans=trunk_vlans, trunk_allowed_vlans=trunk_allowed_vlans) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) interface = interface.lower() diff --git a/network/nxos/nxos_udld.py b/network/nxos/nxos_udld.py index 251cf04c..402a489e 100644 --- a/network/nxos/nxos_udld.py +++ b/network/nxos/nxos_udld.py @@ -374,7 +374,7 @@ def get_commands_config_udld_global(delta, reset): 'msg_time': 'udld message-time {msg_time}' } commands = [] - for param, value in delta.iteritems(): + for param, value in delta.items(): if param == 'aggressive': if value == 'enabled': command = 'udld aggressive' @@ -398,7 +398,7 @@ def get_commands_remove_udld_global(delta): 'msg_time': 'no udld message-time {msg_time}', } commands = [] - for param, value in delta.iteritems(): + for param, value in delta.items(): command = config_args.get(param, 'DNE').format(**delta) if command and command != 'DNE': commands.append(command) @@ -454,12 +454,12 @@ def main(): 'between 7 and 90') args = dict(aggressive=aggressive, msg_time=msg_time, reset=reset) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) existing = get_udld_global(module) end_state = existing - delta = set(proposed.iteritems()).difference(existing.iteritems()) + delta = set(proposed.items()).difference(existing.items()) changed = False commands = [] @@ -469,7 +469,7 @@ def main(): commands.append(command) elif state == 'absent': - common = set(proposed.iteritems()).intersection(existing.iteritems()) + common = set(proposed.items()).intersection(existing.items()) if common: command = get_commands_remove_udld_global(dict(common)) commands.append(command) diff --git a/network/nxos/nxos_udld_interface.py b/network/nxos/nxos_udld_interface.py index 84ecbff2..64b5c205 100644 --- a/network/nxos/nxos_udld_interface.py +++ b/network/nxos/nxos_udld_interface.py @@ -471,7 +471,7 @@ def main(): existing = get_udld_interface(module, interface) end_state = existing - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) changed = False commands = [] @@ -481,7 +481,7 @@ def main(): module, existing) commands.append(command) elif state == 'absent': - common = set(proposed.iteritems()).intersection(existing.iteritems()) + common = set(proposed.items()).intersection(existing.items()) if common: command = get_commands_remove_udld_interface( dict(common), interface, module, existing diff --git a/network/nxos/nxos_vlan.py b/network/nxos/nxos_vlan.py index e30fb8b2..32c0374e 100644 --- a/network/nxos/nxos_vlan.py +++ b/network/nxos/nxos_vlan.py @@ -360,7 +360,7 @@ def get_vlan_config_commands(vlan, vid): commands = [] - for param, value in vlan.iteritems(): + for param, value in vlan.items(): if param == 'mapped_vni' and value == 'default': command = 'no vn-segment' else: @@ -566,7 +566,7 @@ def main(): args = dict(name=name, vlan_state=vlan_state, admin_state=admin_state, mapped_vni=mapped_vni) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) proposed_vlans_list = numerical_sort(vlan_range_to_list( vlan_id or vlan_range)) @@ -597,7 +597,7 @@ def main(): proposed.get('mapped_vni') == 'default'): proposed.pop('mapped_vni') delta = dict(set( - proposed.iteritems()).difference(existing.iteritems())) + proposed.items()).difference(existing.items())) if delta or not existing: commands = get_vlan_config_commands(delta, vlan_id) diff --git a/network/nxos/nxos_vpc.py b/network/nxos/nxos_vpc.py index 0a34ab3a..b062cf8a 100644 --- a/network/nxos/nxos_vpc.py +++ b/network/nxos/nxos_vpc.py @@ -536,7 +536,7 @@ def get_commands_to_config_vpc(module, vpc, domain, existing): 'auto_recovery': '{auto_recovery} auto-recovery', } - for param, value in vpc.iteritems(): + for param, value in vpc.items(): command = CONFIG_ARGS.get(param, 'DNE').format(**vpc) if command and command != 'DNE': commands.append(command.strip()) @@ -608,14 +608,14 @@ def main(): module.fail_json(msg='The VRF you are trying to use for the peer ' 'keepalive link is not on device yet. Add it' ' first, please.') - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) changed = False existing = get_vpc(module) end_state = existing commands = [] if state == 'present': - delta = set(proposed.iteritems()).difference(existing.iteritems()) + delta = set(proposed.items()).difference(existing.items()) if delta: command = get_commands_to_config_vpc(module, delta, domain, existing) commands.append(command) diff --git a/network/nxos/nxos_vpc_interface.py b/network/nxos/nxos_vpc_interface.py index 6cb585b2..c0bde21c 100644 --- a/network/nxos/nxos_vpc_interface.py +++ b/network/nxos/nxos_vpc_interface.py @@ -440,7 +440,7 @@ def get_portchannel_vpc_config(module, portchannel): mapping = get_existing_portchannel_to_vpc_mappings(module) - for existing_vpc, port_channel in mapping.iteritems(): + for existing_vpc, port_channel in mapping.items(): port_ch = str(port_channel[2:]) if port_ch == portchannel: pc = port_ch @@ -505,7 +505,7 @@ def main(): "before trying to assign it here. ", existing_portchannel=mapping[vpc]) - for vpcid, existing_pc in mapping.iteritems(): + for vpcid, existing_pc in mapping.items(): if portchannel == existing_pc.strip('Po') and vpcid != vpc: module.fail_json(msg="This portchannel already has another" " VPC configured. Remove it first " @@ -532,13 +532,13 @@ def main(): config_value = 'peer-link' - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) existing = get_portchannel_vpc_config(module, portchannel) end_state = existing commands = [] if state == 'present': - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) if delta: command = get_commands_to_config_vpc_interface( portchannel, diff --git a/network/nxos/nxos_vrf.py b/network/nxos/nxos_vrf.py index 083eee74..0135e02f 100644 --- a/network/nxos/nxos_vrf.py +++ b/network/nxos/nxos_vrf.py @@ -361,7 +361,7 @@ def apply_key_map(key_map, table): def get_commands_to_config_vrf(delta, vrf): commands = [] - for param, value in delta.iteritems(): + for param, value in delta.items(): command = '' if param == 'description': command = 'description {0}'.format(value) @@ -474,7 +474,7 @@ def main(): end_state = existing changed = False - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) """Since 'admin_state' is either 'Up' or 'Down' from outputs, we use the following to make sure right letter case is used so that delta @@ -483,7 +483,7 @@ def main(): if existing['admin_state'].lower() == admin_state: proposed['admin_state'] = existing['admin_state'] - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + delta = dict(set(proposed.items()).difference(existing.items())) changed = False end_state = existing commands = [] diff --git a/network/nxos/nxos_vrf_af.py b/network/nxos/nxos_vrf_af.py index b8706d28..361b4dd3 100644 --- a/network/nxos/nxos_vrf_af.py +++ b/network/nxos/nxos_vrf_af.py @@ -331,7 +331,7 @@ def state_present(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if value is True: commands.append(key) @@ -388,11 +388,11 @@ def main(): existing = invoke('get_existing', module, args) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key != 'interface': if str(value).lower() == 'default': value = PARAM_TO_DEFAULT_KEYMAP.get(key) diff --git a/network/nxos/nxos_vrrp.py b/network/nxos/nxos_vrrp.py index 2edcc5c3..19ad85de 100644 --- a/network/nxos/nxos_vrrp.py +++ b/network/nxos/nxos_vrrp.py @@ -597,7 +597,7 @@ def main(): vip=vip, authentication=authentication, admin_state=admin_state) - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) + proposed = dict((k, v) for k, v in args.items() if v is not None) existing = get_existing_vrrp(interface, group, module, name) changed = False @@ -606,7 +606,7 @@ def main(): if state == 'present': delta = dict( - set(proposed.iteritems()).difference(existing.iteritems())) + set(proposed.items()).difference(existing.items())) if delta: command = get_commands_config_vrrp(delta, group) commands.append(command) diff --git a/network/nxos/nxos_vtp_domain.py b/network/nxos/nxos_vtp_domain.py index 86143e84..d77d1ed9 100644 --- a/network/nxos/nxos_vtp_domain.py +++ b/network/nxos/nxos_vtp_domain.py @@ -385,8 +385,8 @@ def main(): args = dict(domain=domain) changed = False - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + proposed = dict((k, v) for k, v in args.items() if v is not None) + delta = dict(set(proposed.items()).difference(existing.items())) commands = [] if delta: diff --git a/network/nxos/nxos_vtp_password.py b/network/nxos/nxos_vtp_password.py index 30f0abfa..187362da 100644 --- a/network/nxos/nxos_vtp_password.py +++ b/network/nxos/nxos_vtp_password.py @@ -417,8 +417,8 @@ def main(): args = dict(vtp_password=vtp_password) changed = False - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + proposed = dict((k, v) for k, v in args.items() if v is not None) + delta = dict(set(proposed.items()).difference(existing.items())) commands = [] if state == 'absent': diff --git a/network/nxos/nxos_vtp_version.py b/network/nxos/nxos_vtp_version.py index 7a8c8da0..7d93a8dd 100644 --- a/network/nxos/nxos_vtp_version.py +++ b/network/nxos/nxos_vtp_version.py @@ -380,8 +380,8 @@ def main(): args = dict(version=version) changed = False - proposed = dict((k, v) for k, v in args.iteritems() if v is not None) - delta = dict(set(proposed.iteritems()).difference(existing.iteritems())) + proposed = dict((k, v) for k, v in args.items() if v is not None) + delta = dict(set(proposed.items()).difference(existing.items())) commands = [] if delta: diff --git a/network/nxos/nxos_vxlan_vtep.py b/network/nxos/nxos_vxlan_vtep.py index 620d3e24..d1e208ef 100644 --- a/network/nxos/nxos_vxlan_vtep.py +++ b/network/nxos/nxos_vxlan_vtep.py @@ -405,7 +405,7 @@ def state_present(module, existing, proposed, candidate): commands = list() proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if value is True: commands.append(key) @@ -471,11 +471,11 @@ def main(): existing = invoke('get_existing', module, args) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key != 'interface': if str(value).lower() == 'true': value = True diff --git a/network/nxos/nxos_vxlan_vtep_vni.py b/network/nxos/nxos_vxlan_vtep_vni.py index a50c7600..5f5bce2b 100644 --- a/network/nxos/nxos_vxlan_vtep_vni.py +++ b/network/nxos/nxos_vxlan_vtep_vni.py @@ -413,7 +413,7 @@ def state_present(module, existing, proposed, candidate): proposed_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, proposed) existing_commands = apply_key_map(PARAM_TO_COMMAND_KEYMAP, existing) - for key, value in proposed_commands.iteritems(): + for key, value in proposed_commands.items(): if key == 'associate-vrf': command = 'member vni {0} {1}'.format(module.params['vni'], key) @@ -528,11 +528,11 @@ def main(): existing, interface_exist = invoke('get_existing', module, args) end_state = existing - proposed_args = dict((k, v) for k, v in module.params.iteritems() + proposed_args = dict((k, v) for k, v in module.params.items() if v is not None and k in args) proposed = {} - for key, value in proposed_args.iteritems(): + for key, value in proposed_args.items(): if key != 'interface': if str(value).lower() == 'default': value = PARAM_TO_DEFAULT_KEYMAP.get(key) diff --git a/network/sros/sros_rollback.py b/network/sros/sros_rollback.py index f952b092..4ebbc936 100644 --- a/network/sros/sros_rollback.py +++ b/network/sros/sros_rollback.py @@ -121,7 +121,7 @@ def sanitize_config(lines): def present(module, commands): setters = set() - for key, value in module.argument_spec.iteritems(): + for key, value in module.argument_spec.items(): if module.params[key] is not None: setter = value.get('setter') or 'set_%s' % key if setter not in setters: -- cgit v1.2.1