From: FrancescoFioraEst <francesco.fiora@est.tech>
Date: Tue, 2 Apr 2024 16:15:27 +0000 (+0100)
Subject: Merge properties in migrate in ACM
X-Git-Tag: 7.1.2~6^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F137640%2F1;p=policy%2Fclamp.git

Merge properties in migrate in ACM

Issue-ID: POLICY-4954
Change-Id: If11b55e215512b7893ed62fa60d97570d3c4f5fc
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
---

diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java
index ad004427a..220636b9d 100644
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java
@@ -201,7 +201,7 @@ public class AutomationCompositionInstantiationProvider {
             if (dbAcElement == null) {
                 throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, "Element id not present " + elementId);
             }
-            dbAcElement.getProperties().putAll(element.getValue().getProperties());
+            AcmUtils.recursiveMerge(dbAcElement.getProperties(), element.getValue().getProperties());
             var newDefinition = element.getValue().getDefinition();
             var compatibility =
                 newDefinition.asConceptKey().getCompatibility(dbAcElement.getDefinition().asConceptKey());