From 7bdf20c751f290c730a4ec07458fd3c4f0ced874 Mon Sep 17 00:00:00 2001 From: Timur Nizharadze Date: Tue, 18 Jul 2023 22:00:45 +0300 Subject: [PATCH 1/2] network_template.py: add support for multiple shared variables --- plugins/module_utils/network/common/rm_base/network_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/module_utils/network/common/rm_base/network_template.py b/plugins/module_utils/network/common/rm_base/network_template.py index 89f404973..cac64ff12 100644 --- a/plugins/module_utils/network/common/rm_base/network_template.py +++ b/plugins/module_utils/network/common/rm_base/network_template.py @@ -83,7 +83,7 @@ def parse(self): (k, v) for k, v in capdict.items() if v is not None ) if parser.get("shared"): - shared = capdict + shared = dict_merge(capdict, shared) vals = dict_merge(capdict, shared) res = self._deepformat(deepcopy(parser["result"]), vals) result = dict_merge(result, res) From c6553cf753f922c5f976f29c7ecb8210155f3ac7 Mon Sep 17 00:00:00 2001 From: Timur Nizharadze Date: Wed, 19 Jul 2023 09:04:40 +0300 Subject: [PATCH 2/2] =?UTF-8?q?Correcting=20mistake:=20'shared'=20dict=20m?= =?UTF-8?q?ust=20be=20updated=20by=20'capdict'=20and=20not=20vi=D1=81e=20v?= =?UTF-8?q?ersa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/module_utils/network/common/rm_base/network_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/module_utils/network/common/rm_base/network_template.py b/plugins/module_utils/network/common/rm_base/network_template.py index cac64ff12..933a22731 100644 --- a/plugins/module_utils/network/common/rm_base/network_template.py +++ b/plugins/module_utils/network/common/rm_base/network_template.py @@ -83,7 +83,7 @@ def parse(self): (k, v) for k, v in capdict.items() if v is not None ) if parser.get("shared"): - shared = dict_merge(capdict, shared) + shared = dict_merge(shared, capdict) vals = dict_merge(capdict, shared) res = self._deepformat(deepcopy(parser["result"]), vals) result = dict_merge(result, res)