aboutsummaryrefslogtreecommitdiffstats
path: root/runtime-acm/src/main
diff options
context:
space:
mode:
authorFrancescoFioraEst <francesco.fiora@est.tech>2024-04-02 17:15:27 +0100
committerFrancesco Fiora <francesco.fiora@est.tech>2024-04-03 09:10:42 +0000
commit878fccc643294a4bbd974cda5dd71a61562c4c9f (patch)
tree34fe5b0d16e342d6c9c054b4c0376e6311f837ab /runtime-acm/src/main
parent9e19b46da3955940e980d2504ffee99aa9c023d1 (diff)
Merge properties in migrate in ACM
Issue-ID: POLICY-4954 Change-Id: If11b55e215512b7893ed62fa60d97570d3c4f5fc Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
Diffstat (limited to 'runtime-acm/src/main')
-rw-r--r--runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java2
1 files changed, 1 insertions, 1 deletions
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());