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 ad00442..220636b 100644 (file)
--- 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());