From e4497c18e9fb39b4e8c022eb0898060005cf6af6 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Fri, 26 Jul 2019 18:33:41 +0200 Subject: [PATCH] ipatopologysegment: Store suffix for commands in command list With adding the domain and ca suffixes with `suffix: domain+ca` only ca has been added as the suffix was only used from the last command. The suffix is now stored together with the command and the argument. This will fix this error. Fixes: #106 (Last suffix adding twice in the list of topology segments) --- plugins/modules/ipatopologysegment.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/modules/ipatopologysegment.py b/plugins/modules/ipatopologysegment.py index d64c7be..e768f72 100644 --- a/plugins/modules/ipatopologysegment.py +++ b/plugins/modules/ipatopologysegment.py @@ -256,12 +256,12 @@ def main(): del args[key] if len(args) > 1: # cn needs to be in args always - commands.append(["topologysegment_mod", args]) + commands.append(["topologysegment_mod", args, suffix]) # else: Nothing to change else: if name is None: args["cn"] = to_text("%s-to-%s" % (left, right)) - commands.append(["topologysegment_add", args]) + commands.append(["topologysegment_add", args, suffix]) elif state in ["absent", "disabled"]: # Make sure topology segment does not exist @@ -274,7 +274,7 @@ def main(): args = { "cn": res_find["cn"][0] } - commands.append(["topologysegment_del", args]) + commands.append(["topologysegment_del", args, suffix]) elif state == "checked": # Check if topology segment does exists @@ -309,14 +309,15 @@ def main(): elif direction == "right-to-left": args["right"] = True - commands.append(["topologysegment_reinitialize", args]) + commands.append(["topologysegment_reinitialize", args, + suffix]) else: ansible_module.fail_json(msg="Unkown state '%s'" % state) # Execute command - for command, args in commands: - api_command(ansible_module, command, to_text(suffix), args) + for command, args, _suffix in commands: + api_command(ansible_module, command, to_text(_suffix), args) changed = True except Exception as e: