From 1d06948666688a4854887a27c39ef969e8e2e3be Mon Sep 17 00:00:00 2001 From: Steve Alphonse Siani Date: Fri, 22 Feb 2019 16:22:59 -0500 Subject: Python lib for RA and component executor Change-Id: Iacec0dbbd3e7c1dc955ac913f346365732248f05 Issue-ID: CCSDK-1091 Signed-off-by: Steve Alphonse Siani --- .../capability_python/Definitions/activation-blueprint.json | 2 +- .../starter-dictionary/service-instance-id.json | 8 ++++++++ .../application/src/test/resources/application.properties | 4 ++-- ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json index 168732c1..b02397e8 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json @@ -119,7 +119,7 @@ "artifacts" : { "component-script" : { "type" : "artifact-script-jython", - "file" : "Scripts/SamplePythonComponentNode.py" + "file" : "Scripts/python/SamplePythonComponentNode.py" } } } diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json index cb970435..737c7577 100755 --- a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json +++ b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json @@ -32,6 +32,14 @@ "service-instance-id": "artifact_name" } } + }, + "capability": { + "type": "source-capability", + "properties": { + "script-type": "jython", + "script-class-reference": "SampleRAProcessor", + "instance-dependencies": [] + } } } } \ No newline at end of file diff --git a/ms/blueprintsprocessor/application/src/test/resources/application.properties b/ms/blueprintsprocessor/application/src/test/resources/application.properties index 39302451..fc6f7290 100644 --- a/ms/blueprintsprocessor/application/src/test/resources/application.properties +++ b/ms/blueprintsprocessor/application/src/test/resources/application.properties @@ -33,8 +33,8 @@ blueprintsprocessor.db.primary.hibernateDDLAuto=update blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect # Python executor -blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython -blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython +blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints +blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython/ccsdk_blueprints security.user.password: {bcrypt}$2a$10$duaUzVUVW0YPQCSIbGEkQOXwafZGwQ/b32/Ys4R1iwSSawFgz7QNu security.user.name: ccsdkapps diff --git a/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile b/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile index d3e10b76..dab0a4c0 100755 --- a/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile +++ b/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM anapsix/alpine-java:8_jdk +FROM omahoco1/alpine-java-python ENV HTTP_PROXY ${HTTP_PROXY} ENV HTTPS_PROXY ${HTTPS_PROXY} -- cgit 1.2.3-korg