Provide ongoing occurrence value for scripting

This patch fixes this for template https://gerrit.onap.org/r/#/c/ccsdk/cds/+/95081/
but not for script, where the occurrence value might be needed.

In reality, this overall occurrence thing is a mistacke, but
it's solving an issue that I yet don't know how to properly
solve.

Change-Id: I7f8579ad2bde3f96b06aaf09c8b8c67d4b97e7b0
Issue-ID: CCSDK-1693
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com>
(cherry picked from commit d39772eaeb2c6e6665c4a6d41f6af84f63151184)

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt
index 8651e26..7e4d8ef 100644 (file)
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt
@@ -199,6 +199,7 @@ open class ResourceResolutionServiceImpl(private var applicationContext: Applica
             blueprintRuntimeService
         }
 
+        exposeOccurrencePropertyInResourceAssignments(resourceAssignmentRuntimeService, properties)
 
         coroutineScope {
             bulkSequenced.forEach { batchResourceAssignments ->
@@ -353,4 +354,9 @@ open class ResourceResolutionServiceImpl(private var applicationContext: Applica
                 && resourceResolution.dictionaryVersion == resourceAssignment.version)
     }
 
+    private fun exposeOccurrencePropertyInResourceAssignments(raRuntimeService: ResourceAssignmentRuntimeService,
+                                                              properties: Map<String, Any>) {
+        raRuntimeService.putResolutionStore(ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_OCCURRENCE,
+            properties[ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_OCCURRENCE].asJsonPrimitive())
+    }
 }

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionServiceTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionServiceTest.kt
index 775c501..5a5336a 100644 (file)
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionServiceTest.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionServiceTest.kt
@@ -261,6 +261,7 @@ class ResourceResolutionServiceTest {
             every { raRuntimeService.getBluePrintError() } returns BluePrintError()
             every { raRuntimeService.setBluePrintError(any())} returns Unit
             every { raRuntimeService.getInputValue("device-id") } returns "123456".asJsonPrimitive()
+            every { raRuntimeService.putResolutionStore(any(), any()) } returns Unit
 
             val applicationContext = mockk<ApplicationContext>()
             every { applicationContext.getBean("rr-processor-source-capability") } returns MockCapabilityScriptRA()