From abee5037695a03ea80c2595269e613fc8756f8c0 Mon Sep 17 00:00:00 2001 From: Serge Simard Date: Sun, 24 May 2020 17:14:08 -0400 Subject: REST endpoint for fetching templates resolution results does not expose occurence parameter Issue-ID: CCSDK-2384 Change-Id: I8a6abfea32c7aacade1e9b3140eeed22fa58b4a9 Signed-off-by: Serge Simard --- .../cds/blueprintsprocessor/resource/api/TemplateController.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'ms/blueprintsprocessor/modules/inbounds') diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/resource/api/TemplateController.kt b/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/resource/api/TemplateController.kt index 80000d5fc..bd52bfee6 100644 --- a/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/resource/api/TemplateController.kt +++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/resource/api/TemplateController.kt @@ -94,7 +94,9 @@ open class TemplateController(private val templateResolutionService: TemplateRes defaultValue = MediaType.TEXT_PLAIN_VALUE, required = true ) - @RequestParam(value = "format", required = false, defaultValue = MediaType.TEXT_PLAIN_VALUE) format: String + @RequestParam(value = "format", required = false, defaultValue = MediaType.TEXT_PLAIN_VALUE) format: String, + @ApiParam(value = "Occurrence of the template resolution (1-n).", required = false) + @RequestParam(value = "occurrence", required = false, defaultValue = "1") occurrence: Int = 1 ): ResponseEntity = runBlocking { @@ -108,7 +110,8 @@ open class TemplateController(private val templateResolutionService: TemplateRes bpName, bpVersion, artifactName, - resolutionKey + resolutionKey, + occurrence ) } else if (resourceType.isNotEmpty() && resourceId.isNotEmpty()) { result = @@ -117,7 +120,8 @@ open class TemplateController(private val templateResolutionService: TemplateRes bpVersion, artifactName, resourceId, - resourceType + resourceType, + occurrence ) } else { throw httpProcessorException(ErrorCatalogCodes.REQUEST_NOT_FOUND, ResourceApiDomains.RESOURCE_API, -- cgit 1.2.3-korg