diff options
Diffstat (limited to 'ms/blueprintsprocessor/application')
5 files changed, 22 insertions, 31 deletions
diff --git a/ms/blueprintsprocessor/application/src/main/docker/distribution.xml b/ms/blueprintsprocessor/application/src/main/docker/distribution.xml index 2ff3739df..aed417581 100755 --- a/ms/blueprintsprocessor/application/src/main/docker/distribution.xml +++ b/ms/blueprintsprocessor/application/src/main/docker/distribution.xml @@ -26,7 +26,7 @@ </formats> <dependencySets> <dependencySet> - <outputDirectory>/opt/app/onap/lib</outputDirectory> + <outputDirectory>opt/app/onap/lib</outputDirectory> <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <excludes> <exclude>org.slf4j:slf4j-simple</exclude> @@ -41,21 +41,24 @@ <include>application.properties</include> <include>logback.xml</include> </includes> - <outputDirectory>/opt/app/onap/config</outputDirectory> + <outputDirectory>opt/app/onap/config</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> </fileSet> <fileSet> <directory>${project.basedir}/../../../components/model-catalog</directory> - <outputDirectory>/opt/app/onap/model-catalog</outputDirectory> + <outputDirectory>opt/app/onap/model-catalog</outputDirectory> <includes> <include>blueprint-model/service-blueprint/**</include> <include>definition-type/starter-type/**</include> <include>resource-dictionary/starter-dictionary/**</include> </includes> + <excludes> + <exclude>**/target/**</exclude> + </excludes> </fileSet> <fileSet> <directory>${project.basedir}/../../../components/scripts/python</directory> - <outputDirectory>/opt/app/onap/scripts/jython</outputDirectory> + <outputDirectory>opt/app/onap/scripts/jython</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> </fileSet> </fileSets> diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties index e177c18cf..e40ccba09 100755 --- a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties +++ b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties @@ -95,12 +95,6 @@ blueprints.processor.functions.python.executor.modulePaths=./../../../components # SDN-C's ODL Restconf Connection Details blueprintsprocessor.restconfEnabled=true -blueprintsprocessor.restclient.sdncodl.type=basic-auth -blueprintsprocessor.restclient.sdncodl.url=http://localhost:8282/ -blueprintsprocessor.restclient.sdncodl.username=admin -blueprintsprocessor.restclient.sdncodl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - -# Config Data REST client settings blueprintsprocessor.restclient.sdnc.type=basic-auth blueprintsprocessor.restclient.sdnc.url=http://sdnc:8282 blueprintsprocessor.restclient.sdnc.username=admin @@ -113,13 +107,13 @@ blueprintsprocessor.restclient.aai-data.username=aai@aai.onap.org blueprintsprocessor.restclient.aai-data.password=demo123456! # Executor Options -blueprintprocessor.resourceResolution.enabled=true -blueprintprocessor.netconfExecutor.enabled=true -blueprintprocessor.restConfExecutor.enabled=true +blueprintsprocessor.resourceResolution.enabled=true +blueprintsprocessor.netconfExecutor.enabled=true +blueprintsprocessor.restConfExecutor.enabled=true blueprintsprocessor.cliExecutor.enabled=true ### If enabling remote python executor, set this value to true -### blueprintprocessor.remoteScriptCommand.enabled=true -blueprintprocessor.remoteScriptCommand.enabled=false +### blueprintsprocessor.remoteScriptCommand.enabled=true +blueprintsprocessor.remoteScriptCommand.enabled=false # Kafka-message-lib Configurations blueprintsprocessor.messageconsumer.self-service-api.kafkaEnable=false diff --git a/ms/blueprintsprocessor/application/src/main/resources/application.properties b/ms/blueprintsprocessor/application/src/main/resources/application.properties index 6d8a4fa2b..1378c62c5 100755 --- a/ms/blueprintsprocessor/application/src/main/resources/application.properties +++ b/ms/blueprintsprocessor/application/src/main/resources/application.properties @@ -69,19 +69,12 @@ security.user.name: ccsdkapps endpoints.user.name=ccsdkapps endpoints.user.password=ccsdkapps -# SDN-C's ODL Restconf Connection Details -blueprintsprocessor.restconfEnabled=true -blueprintsprocessor.restclient.sdncodl.type=basic-auth -blueprintsprocessor.restclient.sdncodl.url=http://sdnc:8282/ -blueprintsprocessor.restclient.sdncodl.username=admin -blueprintsprocessor.restclient.sdncodl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - # Executor Options -blueprintprocessor.resourceResolution.enabled=true -blueprintprocessor.netconfExecutor.enabled=true -blueprintprocessor.restConfExecutor.enabled=true +blueprintsprocessor.resourceResolution.enabled=true +blueprintsprocessor.netconfExecutor.enabled=true +blueprintsprocessor.restConfExecutor.enabled=true blueprintsprocessor.cliExecutor.enabled=true -blueprintprocessor.remoteScriptCommand.enabled=true +blueprintsprocessor.remoteScriptCommand.enabled=true # Command executor blueprintsprocessor.grpcclient.remote-python.type=token-auth @@ -90,6 +83,7 @@ blueprintsprocessor.grpcclient.remote-python.port=50051 blueprintsprocessor.grpcclient.remote-python.token=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== # Config Data REST client settings +blueprintsprocessor.restconfEnabled=true blueprintsprocessor.restclient.sdnc.type=basic-auth blueprintsprocessor.restclient.sdnc.url=http://sdnc:8282 blueprintsprocessor.restclient.sdnc.username=admin diff --git a/ms/blueprintsprocessor/application/src/test/resources/application-test.properties b/ms/blueprintsprocessor/application/src/test/resources/application-test.properties index 74c8a2380..0f3457454 100644 --- a/ms/blueprintsprocessor/application/src/test/resources/application-test.properties +++ b/ms/blueprintsprocessor/application/src/test/resources/application-test.properties @@ -45,6 +45,6 @@ blueprints.processor.functions.python.executor.modulePaths=\ # Executor Options blueprintsprocessor.cliExecutor.enabled=true -blueprintprocessor.netconfExecutor.enabled=true +blueprintsprocessor.netconfExecutor.enabled=true blueprintsprocessor.restconfEnabled=true diff --git a/ms/blueprintsprocessor/application/src/test/resources/application.properties b/ms/blueprintsprocessor/application/src/test/resources/application.properties index d56e9582c..92d54f6f5 100644 --- a/ms/blueprintsprocessor/application/src/test/resources/application.properties +++ b/ms/blueprintsprocessor/application/src/test/resources/application.properties @@ -62,11 +62,11 @@ security.user.password:{bcrypt}$2a$10$duaUzVUVW0YPQCSIbGEkQOXwafZGwQ/b32/Ys4R1iw security.user.name:ccsdkapps # Executor Options -blueprintprocessor.resourceResolution.enabled=true -blueprintprocessor.netconfExecutor.enabled=true -blueprintprocessor.restConfExecutor.enabled=true +blueprintsprocessor.resourceResolution.enabled=true +blueprintsprocessor.netconfExecutor.enabled=true +blueprintsprocessor.restConfExecutor.enabled=true blueprintsprocessor.cliExecutor.enabled=true -blueprintprocessor.remoteScriptCommand.enabled=false +blueprintsprocessor.remoteScriptCommand.enabled=false # Kafka-message-lib Configuration |