summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdheli Tavares <adheli.tavares@est.tech>2024-04-03 15:34:30 +0000
committerGerrit Code Review <gerrit@onap.org>2024-04-03 15:34:30 +0000
commit261ada4c1c7f581e5480434541ff3ee558518e37 (patch)
treeec6a7a9784f24387015a4bac3a79eb0c192686c0
parenta310036db03a1fea8631dc1b0b7451cd492ee137 (diff)
parent878fccc643294a4bbd974cda5dd71a61562c4c9f (diff)
Merge "Merge properties in migrate in ACM"
-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());