diff options
Diffstat (limited to 'ms')
16 files changed, 150 insertions, 97 deletions
diff --git a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile index bd1b3804a..e9c4c5895 100755 --- a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile +++ b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile @@ -9,7 +9,7 @@ FROM omahoco1/alpine-java-python # add entrypoint COPY startService.sh /startService.sh -RUN addgroup -S onap && adduser -S onap -G onap +RUN addgroup -S -g 1000 onap && adduser -u 1000 -S onap -G onap RUN chown onap:onap /startService.sh RUN touch /velocity.log && chmod 777 /velocity.log RUN chown onap:onap /velocity.log diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponent.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponent.kt index 3c95ea7bb..e15705a7e 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponent.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponent.kt @@ -51,6 +51,7 @@ open class ResourceResolutionComponent(private val resourceResolutionService: Re const val ATTRIBUTE_STATUS = "status" const val OUTPUT_RESOURCE_ASSIGNMENT_PARAMS = "resource-assignment-params" + const val OUTPUT_RESOURCE_ASSIGNMENT_MAP = "resource-assignment-map" const val OUTPUT_STATUS = "status" } diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponentDSL.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponentDSL.kt index fd104d3ad..8c854b840 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponentDSL.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponentDSL.kt @@ -116,6 +116,10 @@ fun BluePrintTypes.nodeTypeComponentResourceResolution(): NodeType { true, "Output Response" ) property( + ResourceResolutionComponent.OUTPUT_RESOURCE_ASSIGNMENT_MAP, BluePrintConstants.DATA_TYPE_MAP, + true, "Output Resolved Values" + ) + property( ResourceResolutionComponent.OUTPUT_STATUS, BluePrintConstants.DATA_TYPE_STRING, true, "Status of the Component Execution ( success or failure )" ) @@ -229,6 +233,13 @@ class ComponentResourceResolutionNodeTemplateBuilder(id: String, description: St property(ResourceResolutionComponent.OUTPUT_STATUS, status) } + fun resourceAssignmentMap(resourceAssignmentMap: String) = + resourceAssignmentMap(resourceAssignmentMap.asJsonType()) + + fun resourceAssignmentMap(resourceAssignmentMap: JsonNode) { + property(ResourceResolutionComponent.OUTPUT_RESOURCE_ASSIGNMENT_MAP, resourceAssignmentMap) + } + fun resourceAssignmentParams(resourceAssignmentParams: String) = resourceAssignmentParams(resourceAssignmentParams.asJsonType()) diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionConstants.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionConstants.kt index b934940b1..e2a8920f5 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionConstants.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionConstants.kt @@ -23,6 +23,7 @@ object ResourceResolutionConstants { const val PREFIX_RESOURCE_RESOLUTION_PROCESSOR = "rr-processor-" const val INPUT_ARTIFACT_PREFIX_NAMES = "artifact-prefix-names" const val OUTPUT_ASSIGNMENT_PARAMS = "assignment-params" + const val OUTPUT_ASSIGNMENT_MAP = "assignment-map" const val FILE_NAME_RESOURCE_DEFINITION_TYPES = "resources_definition_types.json" const val RESOURCE_RESOLUTION_INPUT_RESOLUTION_KEY = "resolution-key" const val RESOURCE_RESOLUTION_INPUT_STORE_RESULT = "store-result" 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 15fd1d673..4ad86b4ad 100644 --- 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 @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.coroutineScope +import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.ResourceResolutionConstants.OUTPUT_ASSIGNMENT_MAP import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.db.ResourceResolution import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.db.ResourceResolutionDBService import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.db.TemplateResolutionService @@ -185,6 +186,12 @@ open class ResourceResolutionServiceImpl( properties ) + bluePrintRuntimeService.setNodeTemplateAttributeValue( + nodeTemplateName, + OUTPUT_ASSIGNMENT_MAP, + ResourceAssignmentUtils.generateAssignmentMap(artifactPrefix, resourceAssignments) + ) + val resolutionSummary = properties.getOrDefault( ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_RESOLUTION_SUMMARY, false diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt index 1be9649b9..f97c669d6 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt @@ -274,6 +274,13 @@ class ResourceAssignmentUtils { return JacksonUtils.getJson(data, includeNull = true) } + fun generateAssignmentMap( + artifactPrefix: String, + resourceAssignments: List<ResourceAssignment> + ): ObjectNode = resourceAssignments.associateBy({ it.name }, { it.property?.value }) + .let { mutableMapOf(artifactPrefix to it) } + .let { JacksonUtils.objectNodeFromObject(it) } + private fun useDefaultValueIfNull( resourceAssignment: ResourceAssignment, resourceAssignmentName: String diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt index b4befc26d..6734613fc 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt @@ -22,6 +22,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.utils import com.fasterxml.jackson.databind.JsonNode +import com.fasterxml.jackson.databind.node.ObjectNode import com.fasterxml.jackson.databind.node.TextNode import io.mockk.every import io.mockk.spyk @@ -167,7 +168,7 @@ class ResourceAssignmentUtilsTest { } @Test - fun generate() { + fun generateResolutionSummaryDataTest() { val resourceAssignment = createResourceAssignmentForTest(null) val resourceDefinition = ResourceDefinition() val nodeTemplate = NodeTemplate().apply { @@ -206,6 +207,20 @@ class ResourceAssignmentUtilsTest { """.replace("\n|\\s".toRegex(), ""), result) } + @Test + fun generateAssignmentMapTest() { + val artifactPrefix = "vdns" + val resourceAssignments = mutableListOf( + createResourceAssignmentForTest("abc-123", "vnf-id"), + createResourceAssignmentForTest(null, "vf-module-name") + ) + + val result: ObjectNode = ResourceAssignmentUtils.generateAssignmentMap(artifactPrefix, resourceAssignments) + + assertEquals("abc-123", result["vdns"]["vnf-id"].textValue()) + assertEquals(JacksonUtils.getJsonNode(null), result["vdns"]["vf-module-name"]) + } + private fun createResourceAssignmentForTest(resourceValue: String?, resourceName: String = "pnf-id"): ResourceAssignment { val valueForTest = if (resourceValue == null) null else TextNode(resourceValue) val resourceAssignmentForTest = ResourceAssignment().apply { 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<String> = 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, diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml index cfc03e7dc..41bdacf96 100644 --- a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml @@ -41,7 +41,8 @@ </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-provider</artifactId> + <artifactId>sli-provider-base</artifactId> + <version>${ccsdk.sli.core.version}</version> </dependency> </dependencies> </project> diff --git a/ms/command-executor/src/main/docker/Dockerfile b/ms/command-executor/src/main/docker/Dockerfile index e84d5531b..610e10cc2 100644 --- a/ms/command-executor/src/main/docker/Dockerfile +++ b/ms/command-executor/src/main/docker/Dockerfile @@ -5,7 +5,7 @@ RUN python -m pip install --upgrade pip RUN pip install grpcio==${GRPC_PYTHON_VERSION} grpcio-tools==${GRPC_PYTHON_VERSION} RUN pip install virtualenv==16.7.9 pympler==0.8 -RUN groupadd -r onap && useradd -r -g onap onap +RUN groupadd -r -g 1000 onap && useradd -r -u 1000 -g onap onap COPY start.sh /opt/app/onap/start.sh RUN chmod u+x /opt/app/onap/start.sh diff --git a/ms/py-executor/certs/py-executor/py-executor-chain.pem b/ms/py-executor/certs/py-executor/py-executor-chain.pem index 98c4f39ba..d81ef6acc 100644 --- a/ms/py-executor/certs/py-executor/py-executor-chain.pem +++ b/ms/py-executor/certs/py-executor/py-executor-chain.pem @@ -1,37 +1,37 @@ -----BEGIN CERTIFICATE----- -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 -3w== +MIIGbjCCBFagAwIBAgIUKMfxNPHDvw7rVeY9PeFQHKKgMdswDQYJKoZIhvcNAQEL +BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCk5ldyBKZXJzZXkxEzARBgNVBAcM +Ck1pZGRsZXRvd24xFzAVBgNVBAoMDk9OQVAgQ29tbXVuaXR5MQ4wDAYDVQQDDAVD +Q1NESzEdMBsGCSqGSIb3DQEJARYOYnMyNzk2QGF0dC5jb20wHhcNMjAwNTI4MTM1 +NzEyWhcNMzAwNTI2MTM1NzEyWjB/MQswCQYDVQQGEwJVUzETMBEGA1UECAwKTmV3 +IEplcnNleTETMBEGA1UEBwwKTWlkZGxldG93bjEXMBUGA1UECgwOT05BUCBDb21t +dW5pdHkxDjAMBgNVBAMMBUNDU0RLMR0wGwYJKoZIhvcNAQkBFg5iczI3OTZAYXR0 +LmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALThw26eB1Z11R2A +1gcjXESRjnItFrIc1xpigokDp8m+yfk8KgsyYJMDBdqYRjo+3USHzv1UbOEYge3R +YVF3MJkbpcxgpfqQS6ilKKgrjxDSwSiSPQWUm3YAdFCaIKpZQ4xJ7uuNqDpsucGS +vB7NWJtHcT3TUWQSiku89dUeeTwNvtrhwg8Vn3zT8kbu8okriyc+jYcJnPb7Qo6g +1+pM+PSJahldtNa0dDjYAgX0C5nsISWSN/VpHNVNcl8bLz3ieI+GpT/7Q0puhQ0K +dMJB+A8DF3E1KDZW39KhSihj++VdU+Xd2n33OoRHk3EJS9eb+Qej81G+Mzmhkylv +j4brluXI7lYD7JZPCtznrRaSakbC3gAqVDJ74FLGfA5jkGoxo0BTLMpF3pmjAUEI +3YiMf0jEd53xwDEnot7ZK9k4ySUTuL9BZrtH6KKihKom5YIyysk1ZMEfg/0Zw3hj +cv+krVla44fIfxvgZfVREG5C5vcFyu3GCjIuhtJ0+IP+u566y8h//3GyygXcn6JG +1IgoTzvj6zuLmupPvf6oYi6ibjEKYOFTKVLuFPQak7oKrBiGdtLLE8S7LrH74a+V +Ka1V3io7SAmccdglJrwlVebbD7VQCBpjdxfBbXb2WjXQnXH1Xu+bb35zDnZlbkQE +Ra0gGAGiR5cQJqrm1+0TXTR/R0U3AgMBAAGjgeEwgd4wHQYDVR0OBBYEFCThQjjN +anO/1ZmtV4INXKnIpZtcMB8GA1UdIwQYMBaAFCThQjjNanO/1ZmtV4INXKnIpZtc +MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMEEG +A1UdEQQ6MDiCESpjZHMtY29udHJvbGxlci0qghIqY2RzLXB5LWV4ZWN1dG9yLSqC +CWxvY2FsaG9zdIcEfwAAATAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0 +ZWQgQ2VydGlmaWNhdGUwDQYJKoZIhvcNAQELBQADggIBABMo7Ohc3jcFWAq9QOPh +Q8xrAk9tC8snb9yzCZTtW7rHhPxvsUtLJhIIbP/irffcHnunowivixMUSeowoHGk +vgyWSLnuRJ02zSheeaAuJ0WVG7iofMPLq6/FMeGq5efjD4JXVkfykAEu0yFVLwUN +06Nx+qTcMfyFmMkUe4a3AHouDT1LtitDxwBcYBQQTINLDJccncStHmBG8gNALSMG +jVXzW9MH7SNkR0GYIJMbsLgAdNn8XpoqFooTOLLNMGKQfgIgJ9PSIk7yMKxBRZvJ ++VXqCrn0Tn8+HYlwOPpc6ZYLDkaYGL0uYRinA5RFhbvOxbq7/ZnmBYw90vDdCOH2 +Snx1QW4I/qwuEbKxcPEM+JtilprKrF7gAUfRxo9/exJc8GRNHr03XqbgdfjItbsE +3uYUKn04I6DTQkaebLzVHtbYh+yt9Wd49E92UCpO+leGOteKGpIH4BEYTXscYYb5 +tuemF+wb2+JaqCKyXpqRuG8yh4+Lp1NCA6t2DjC230tBzVqrj3f5ouwjGq4LCOHm +ydSrqpM6RUw2DF8CDtCMFTbxDtAn7h+3Xn7hz5iRRdejWcJ4sqNvqJnqrXurgy4M +t9q/Yb/z1yis2Q6IlgfOJd1oo6VF4ARmUngoeFF8DM1Dg4LJB+LQT1q62r5CsULC +1mKz2BJEmP/+wyeXGjPEhD0/ -----END CERTIFICATE----- diff --git a/ms/py-executor/certs/py-executor/py-executor-key.pem b/ms/py-executor/certs/py-executor/py-executor-key.pem index 9407765b5..6530428e7 100644 --- a/ms/py-executor/certs/py-executor/py-executor-key.pem +++ b/ms/py-executor/certs/py-executor/py-executor-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -lZqnHGyRAFqP6UxZgtwu30KuKIZBlg== +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 +1LBaUfGNzPhtYriDYv5R+ahemGdY -----END PRIVATE KEY----- diff --git a/ms/py-executor/certs/py-executor/py-executor.conf b/ms/py-executor/certs/py-executor/py-executor.conf index a74b39fdc..336a52a65 100644 --- a/ms/py-executor/certs/py-executor/py-executor.conf +++ b/ms/py-executor/certs/py-executor/py-executor.conf @@ -37,7 +37,7 @@ subjectAltName = @alt_names nsComment = "OpenSSL Generated Certificate" [alt_names] -DNS.1 = cds-controller-* -DNS.2 = py-executor-* +DNS.1 = *cds-controller-* +DNS.2 = *cds-py-executor-* DNS.3 = localhost IP.1 = 127.0.0.1 diff --git a/ms/py-executor/docker/Dockerfile b/ms/py-executor/docker/Dockerfile index 638b09f39..eb43b7320 100644 --- a/ms/py-executor/docker/Dockerfile +++ b/ms/py-executor/docker/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.7-slim -RUN groupadd -r onap && useradd -r -g onap onap +RUN groupadd -r -g 1000 onap && useradd -u 1000 -r -g onap onap RUN mkdir -p /opt/app/onap/logs/ && touch /opt/app/onap/logs/application.log diff --git a/ms/py-executor/docker/start.sh b/ms/py-executor/docker/start.sh index 6868ba0e7..2fe1267b5 100755 --- a/ms/py-executor/docker/start.sh +++ b/ms/py-executor/docker/start.sh @@ -28,6 +28,12 @@ then export ARTIFACT_MANAGER_PORT=50053 fi +if [ -z "${AUTH_TOKEN}" ] +then + echo "AUTH_TOKEN environment variable is not set, using default." + export AUTH_TOKEN="Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==" +fi + if [ -z "${LOG_FILE}" ] then echo "LOG_FILE environment variable is not set, using default." @@ -58,4 +64,4 @@ fi cd /opt/app/onap/python/ -python server.py
\ No newline at end of file +python server.py diff --git a/ms/sdclistener/distribution/src/main/docker/Dockerfile b/ms/sdclistener/distribution/src/main/docker/Dockerfile index e9ecb8d66..41622fae1 100755 --- a/ms/sdclistener/distribution/src/main/docker/Dockerfile +++ b/ms/sdclistener/distribution/src/main/docker/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8-jdk-alpine -RUN addgroup -S onap && adduser -S onap -G onap +RUN addgroup -S -g 1000 onap && adduser -S onap -u 1000 -G onap # add entrypoint COPY startService.sh /startService.sh RUN chown onap:onap /startService.sh |