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

Return commands instead of command (#24061)

Browse source 
Ok, so for openvswitch_db in particular we just return one command
but in the sake of consistency and code re-use, let's return a list
of "commands", even if it's just one.
This commit is contained in:
Ricardo Carrillo Cruz 2017-04-27 16:36:08 +02:00 • committed by GitHub
commit 2716fad38f
3 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/ansible/modules/network/ovs/openvswitch_db.py
View file

@ -103,26 +103,26 @@ EXAMPLES = '''
'''
def map_obj_to_command(want, have, module):
def map_obj_to_commands(want, have, module):
""" Define ovs-vsctl command to meet desired state """
command = None
commands = list()
if module.params['state'] == 'absent':
if 'key' in have.keys():
templatized_command = "%(ovs-vsctl)s -t %(timeout)s remove %(table)s %(record)s " \
"%(col)s %(key)s=%(value)s"
command = templatized_command % module.params
commands.append(templatized_command % module.params)
else:
if 'key' not in have.keys():
templatized_command = "%(ovs-vsctl)s -t %(timeout)s add %(table)s %(record)s " \
"%(col)s %(key)s=%(value)s"
command = templatized_command % module.params
commands.append(templatized_command % module.params)
elif want['value'] != have['value']:
templatized_command = "%(ovs-vsctl)s -t %(timeout)s set %(table)s %(record)s " \
"%(col)s:%(key)s=%(value)s"
command = templatized_command % module.params
commands.append(templatized_command % module.params)
return command
return commands
def map_config_to_obj(module):
@ -190,12 +190,13 @@ def main():
want = map_params_to_obj(module)
have = map_config_to_obj(module)
command = map_obj_to_command(want, have, module)
result['command'] = command
commands = map_obj_to_commands(want, have, module)
result['commands'] = commands
if command:
if commands:
if not module.check_mode:
module.run_command(command, check_rc=True)
for c in commands:
module.run_command(c, check_rc=True)
result['changed'] = True
module.exit_json(**result)