From: Lukasz Rajewski Date: Fri, 30 Sep 2022 21:51:12 +0000 (+0200) Subject: Fix enrichment for multiplicated assignments X-Git-Tag: 1.4.1~6 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F131351%2F4;p=ccsdk%2Fcds.git Fix enrichment for multiplicated assignments When different assignment mappings declare assignments of the same name, only one of the data dictionaries used there is being enriched and others are ignored. This change removes this limitation. Issue-ID: CCSDK-3773 Signed-off-by: Lukasz Rajewski Change-Id: I492b18e01265471f89459c6dd5a28818aa479e5e --- diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/enhancer/ResourceDefinitionEnhancerService.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/enhancer/ResourceDefinitionEnhancerService.kt index bbec8e685..75f171b63 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/enhancer/ResourceDefinitionEnhancerService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/enhancer/ResourceDefinitionEnhancerService.kt @@ -106,9 +106,7 @@ class ResourceDefinitionEnhancerServiceImpl(private val resourceDefinitionRepoSe resourceAssignments.addAll(deferredResourceAssignment.await()) } - val distinctResourceAssignments = resourceAssignments.distinctBy { it.name } - generateResourceDictionary(blueprintBasePath, distinctResourceAssignments) - // log.info("distinct Resource assignment ($distinctResourceAssignments)") + generateResourceDictionary(blueprintBasePath, resourceAssignments) } // Read the Resource Definitions from the Database and write to type file.