ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 21:30:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
commit ef391a11ec
99 changed files with 251 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/network/cumulus/cl_bond.py
View file

@ -459,7 +459,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]

2
lib/ansible/modules/network/cumulus/cl_bridge.py
View file

@ -385,7 +385,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]

2
lib/ansible/modules/network/cumulus/cl_interface.py
View file

@ -421,7 +421,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]

2
lib/ansible/modules/network/dellos10/dellos10_facts.py
View file

@ -443,7 +443,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

4
lib/ansible/modules/network/dellos6/dellos6_facts.py
View file

@ -240,7 +240,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)
@ -433,7 +433,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

6
lib/ansible/modules/network/dellos9/dellos9_facts.py
View file

@ -286,7 +286,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)
@ -307,7 +307,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)
@ -556,7 +556,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

2
lib/ansible/modules/network/eos/eos_eapi.py
View file

@ -220,7 +220,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:

6
lib/ansible/modules/network/f5/bigip_gtm_facts.py
View file

@ -227,7 +227,7 @@ class BigIpGtmFactsCommon(object):
result = dict()
for attribute in self.attributes_to_remove:
parameters.pop(attribute, None)
for key, val in parameters.iteritems():
for key, val in parameters.items():
result[key] = str(val)
return result
@ -276,7 +276,7 @@ class BigIpGtmFactsPools(BigIpGtmFactsCommon):
def get_facts_with_types(self):
result = []
for key, type in self.gtm_types.iteritems():
for key, type in self.gtm_types.items():
facts = self.get_all_facts_by_type(key, type)
if facts:
result.append(facts)
@ -330,7 +330,7 @@ class BigIpGtmFactsWideIps(BigIpGtmFactsCommon):
def get_facts_with_types(self):
result = []
for key, type in self.gtm_types.iteritems():
for key, type in self.gtm_types.items():
facts = self.get_all_facts_by_type(key, type)
if facts:
result.append(facts)

9
lib/ansible/modules/network/nxos/nxos_aaa_server.py
View file

@ -164,6 +164,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
@ -508,7 +509,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
@ -531,15 +532,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"'

6
lib/ansible/modules/network/nxos/nxos_aaa_server_host.py
View file

@ -513,7 +513,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:
@ -543,7 +543,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)
@ -553,7 +553,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'))

18
lib/ansible/modules/network/nxos/nxos_acl.py
View file

@ -525,13 +525,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
@ -600,7 +600,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
@ -733,11 +733,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)
@ -759,12 +759,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':

8
lib/ansible/modules/network/nxos/nxos_bgp.py
View file

@ -755,7 +755,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:
@ -951,7 +951,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.',
@ -968,10 +968,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)

8
lib/ansible/modules/network/nxos/nxos_bgp_af.py
View file

@ -736,7 +736,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(
@ -874,7 +874,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'])
@ -1060,7 +1060,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'):
@ -1071,7 +1071,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)

6
lib/ansible/modules/network/nxos/nxos_bgp_neighbor.py
View file

@ -576,7 +576,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)
@ -725,11 +725,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)

6
lib/ansible/modules/network/nxos/nxos_bgp_neighbor_af.py
View file

@ -895,7 +895,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))
@ -1070,11 +1070,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':

2
lib/ansible/modules/network/nxos/nxos_evpn_global.py
View file

@ -269,7 +269,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:

8
lib/ansible/modules/network/nxos/nxos_evpn_vni.py
View file

@ -330,7 +330,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:
@ -358,7 +358,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)
@ -434,11 +434,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

6
lib/ansible/modules/network/nxos/nxos_hsrp.py
View file

@ -512,7 +512,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':
@ -664,7 +664,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)
@ -685,7 +685,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)

6
lib/ansible/modules/network/nxos/nxos_igmp.py
View file

@ -301,11 +301,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:
@ -361,7 +361,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()

10
lib/ansible/modules/network/nxos/nxos_igmp_interface.py
View file

@ -624,7 +624,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':
@ -669,7 +669,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
@ -678,7 +678,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)
@ -816,7 +816,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',
@ -833,7 +833,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

10
lib/ansible/modules/network/nxos/nxos_igmp_snooping.py
View file

@ -449,7 +449,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):
@ -477,7 +477,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
@ -506,7 +506,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)
@ -516,7 +516,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)
@ -525,7 +525,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)

4
lib/ansible/modules/network/nxos/nxos_interface.py
View file

@ -907,8 +907,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,

8
lib/ansible/modules/network/nxos/nxos_interface_ospf.py
View file

@ -507,7 +507,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:
@ -536,7 +536,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:
@ -632,11 +632,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

2
lib/ansible/modules/network/nxos/nxos_ip_interface.py
View file

@ -660,7 +660,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

10
lib/ansible/modules/network/nxos/nxos_mtu.py
View file

@ -411,7 +411,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)
@ -428,7 +428,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)
@ -552,8 +552,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
@ -565,7 +565,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)

6
lib/ansible/modules/network/nxos/nxos_ntp.py
View file

@ -439,7 +439,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 = []
@ -573,7 +573,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)
@ -582,7 +582,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:

6
lib/ansible/modules/network/nxos/nxos_ntp_auth.py
View file

@ -518,12 +518,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':
@ -553,7 +553,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
if 'configure' in cmds:

8
lib/ansible/modules/network/nxos/nxos_ntp_options.py
View file

@ -468,13 +468,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:
@ -488,8 +488,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)

2
lib/ansible/modules/network/nxos/nxos_nxapi.py
View file

@ -177,7 +177,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)

8
lib/ansible/modules/network/nxos/nxos_ospf_vrf.py
View file

@ -427,7 +427,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)
@ -481,7 +481,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(
@ -548,11 +548,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

4
lib/ansible/modules/network/nxos/nxos_overlay_global.py
View file

@ -309,7 +309,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:
@ -385,7 +385,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 = {}

4
lib/ansible/modules/network/nxos/nxos_pim.py
View file

@ -275,7 +275,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)
@ -305,7 +305,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 = {}

14
lib/ansible/modules/network/nxos/nxos_pim_interface.py
View file

@ -661,7 +661,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:
@ -726,7 +726,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
@ -746,7 +746,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':
@ -783,8 +783,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,
@ -866,7 +866,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)
'''
@ -879,7 +879,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:

4
lib/ansible/modules/network/nxos/nxos_pim_rp_address.py
View file

@ -375,11 +375,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':

2
lib/ansible/modules/network/nxos/nxos_ping.py
View file

@ -412,7 +412,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)

6
lib/ansible/modules/network/nxos/nxos_portchannel.py
View file

@ -475,7 +475,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']
@ -597,7 +597,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:
@ -683,7 +683,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 = {}

8
lib/ansible/modules/network/nxos/nxos_snmp_community.py
View file

@ -405,7 +405,7 @@ def get_snmp_community(module, find_filter=None):
return {}
else:
fix_find = {}
for (key, value) in find.iteritems():
for (key, value) in find.items():
if isinstance(value, str):
fix_find[key] = value.strip()
else:
@ -419,7 +419,7 @@ def config_snmp_community(delta, community):
'acl': 'snmp-server community {0} use-acl {acl}'
}
commands = []
for k, v in delta.iteritems():
for k, v in delta.items():
cmd = CMDS.get(k).format(community, **delta)
if cmd:
commands.append(cmd)
@ -461,8 +461,8 @@ def main():
existing = get_snmp_community(module, community)
args = dict(group=group, acl=acl)
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

8
lib/ansible/modules/network/nxos/nxos_snmp_host.py
View file

@ -432,7 +432,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:
@ -507,7 +507,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:
@ -597,9 +597,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 = []

4
lib/ansible/modules/network/nxos/nxos_snmp_user.py
View file

@ -506,7 +506,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:
@ -522,7 +522,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

2
lib/ansible/modules/network/nxos/nxos_static_route.py
View file

@ -442,7 +442,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)

2
lib/ansible/modules/network/nxos/nxos_switchport.py
View file

@ -729,7 +729,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()

10
lib/ansible/modules/network/nxos/nxos_udld.py
View file

@ -380,7 +380,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'
@ -404,7 +404,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)
@ -460,12 +460,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 = []
@ -475,7 +475,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)

4
lib/ansible/modules/network/nxos/nxos_udld_interface.py
View file

@ -477,7 +477,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 = []
@ -487,7 +487,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

6
lib/ansible/modules/network/nxos/nxos_vlan.py
View file

@ -381,7 +381,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:
@ -589,7 +589,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))
@ -620,7 +620,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)

6
lib/ansible/modules/network/nxos/nxos_vpc.py
View file

@ -542,7 +542,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())
@ -614,14 +614,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)

8
lib/ansible/modules/network/nxos/nxos_vpc_interface.py
View file

@ -446,7 +446,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
@ -511,7 +511,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 "
@ -538,13 +538,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,

6
lib/ansible/modules/network/nxos/nxos_vrf.py
View file

@ -367,7 +367,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)
@ -479,7 +479,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
@ -488,7 +488,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 = []

6
lib/ansible/modules/network/nxos/nxos_vrf_af.py
View file

@ -335,7 +335,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)
@ -392,11 +392,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)

4
lib/ansible/modules/network/nxos/nxos_vrrp.py
View file

@ -622,7 +622,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
@ -631,7 +631,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)

4
lib/ansible/modules/network/nxos/nxos_vtp_domain.py
View file

@ -391,8 +391,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:

4
lib/ansible/modules/network/nxos/nxos_vtp_password.py
View file

@ -424,8 +424,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':

4
lib/ansible/modules/network/nxos/nxos_vtp_version.py
View file

@ -386,8 +386,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:

6
lib/ansible/modules/network/nxos/nxos_vxlan_vtep.py
View file

@ -409,7 +409,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)
@ -475,11 +475,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

6
lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py
View file

@ -417,7 +417,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)
@ -532,11 +532,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)

2
lib/ansible/modules/network/sros/sros_rollback.py
View file

@ -125,7 +125,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: