From 8d3f825da365b672731e07c2b4560a67ec287a61 Mon Sep 17 00:00:00 2001 From: Brinda Santh Date: Thu, 1 Aug 2019 11:25:14 -0400 Subject: Modify POM, properties and docker distributions. Change-Id: I541edfc36c0866fa7669129a46140fb21a63c6ba Issue-ID: CCSDK-1574 Signed-off-by: Brinda Santh --- ms/blueprintsprocessor/application/pom.xml | 18 +++++++--- .../src/main/resources/application-dev.properties | 26 +++++++++++++-- .../src/main/resources/application.properties | 24 ++++++++++++++ .../BlueprintProcessorApplicationTest.java | 4 +-- .../src/test/resources/application.properties | 24 ++++++++++++++ .../distribution/src/main/docker/distribution.xml | 10 ++++++ .../modules/inbounds/designer-api/pom.xml | 38 ++++++++++++++++++++++ ms/blueprintsprocessor/modules/inbounds/pom.xml | 1 + ms/blueprintsprocessor/parent/pom.xml | 12 +++++++ 9 files changed, 148 insertions(+), 9 deletions(-) create mode 100644 ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index e4129932b..2e94b7b11 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -17,7 +17,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor @@ -54,10 +55,20 @@ + + org.onap.ccsdk.cds.blueprintsprocessor + designer-api + org.onap.ccsdk.cds.blueprintsprocessor resource-api + + org.onap.ccsdk.cds.blueprintsprocessor + selfservice-api + + + org.onap.ccsdk.cds.blueprintsprocessor.functions python-executor @@ -78,10 +89,7 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions cli-executor - - org.onap.ccsdk.cds.blueprintsprocessor - selfservice-api - + com.h2database h2 diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties index fae1adb72..cf8311095 100755 --- a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties +++ b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties @@ -1,6 +1,5 @@ -<<<<<<< HEAD # -# Copyright � 2017-2018 AT&T Intellectual Property. +# Copyright © 2017-2018 AT&T Intellectual Property. # # Modifications Copyright © 2019 IBM, Bell Canada. # @@ -21,6 +20,29 @@ # Web server config server.port=8081 +### START -Controller Blueprints Properties +# Load Resource Source Mappings +resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability + +# Controller Blueprints Core Configuration +controllerblueprints.blueprintDeployPath=blueprints/deploy +controllerblueprints.blueprintArchivePath=blueprints/archive +controllerblueprints.blueprintWorkingPath=blueprints/work +# Controller Blueprint Load Configurations +# blueprints.load.initial-data may be overridden by ENV variables +controllerblueprints.loadInitialData=true +controllerblueprints.loadBluePrint=false +controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/service-blueprint +controllerblueprints.loadModelType=true +controllerblueprints.loadModeTypePaths=./../../../components/model-catalog/definition-type/starter-type +controllerblueprints.loadResourceDictionary=true +controllerblueprints.loadResourceDictionaryPaths=./../../../components/model-catalog/resource-dictionary/starter-dictionary + +# CBA file extension +controllerblueprints.loadCbaExtension=zip + +### END -Controller Blueprints Properties + blueprintsprocessor.grpcEnable=false blueprintsprocessor.httpPort=8081 blueprintsprocessor.grpcPort=9111 diff --git a/ms/blueprintsprocessor/application/src/main/resources/application.properties b/ms/blueprintsprocessor/application/src/main/resources/application.properties index d6e7dc890..bc297efb4 100755 --- a/ms/blueprintsprocessor/application/src/main/resources/application.properties +++ b/ms/blueprintsprocessor/application/src/main/resources/application.properties @@ -14,6 +14,30 @@ # limitations under the License. # # Web server config +### START -Controller Blueprints Properties +# Load Resource Source Mappings +resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability + +# Controller Blueprints Core Configuration +controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy +controllerblueprints.blueprintArchivePath=/opt/app/onap/blueprints/archive +controllerblueprints.blueprintWorkingPath=/opt/app/onap/blueprints/working + +# Controller Blueprint Load Configurations +# blueprints.load.initial-data may be overridden by ENV variables +controllerblueprints.loadInitialData=false +controllerblueprints.loadBluePrint=false +controllerblueprints.loadBluePrintPaths=/opt/app/onap/model-catalog/blueprint-model/service-blueprint +controllerblueprints.loadModelType=false +controllerblueprints.loadModeTypePaths=/opt/app/onap/model-catalog/definition-type/starter-type +controllerblueprints.loadResourceDictionary=false +controllerblueprints.loadResourceDictionaryPaths=/opt/app/onap/model-catalog/resource-dictionary/starter-dictionary + +# CBA file extension +controllerblueprints.loadCbaExtension=zip + +### END -Controller Blueprints Properties + blueprintsprocessor.grpcEnable=false blueprintsprocessor.httpPort=8080 blueprintsprocessor.grpcPort=9111 diff --git a/ms/blueprintsprocessor/application/src/test/java/org/onap/ccsdk/cds/blueprintsprocessor/BlueprintProcessorApplicationTest.java b/ms/blueprintsprocessor/application/src/test/java/org/onap/ccsdk/cds/blueprintsprocessor/BlueprintProcessorApplicationTest.java index fc36e6287..d2d8ea58d 100644 --- a/ms/blueprintsprocessor/application/src/test/java/org/onap/ccsdk/cds/blueprintsprocessor/BlueprintProcessorApplicationTest.java +++ b/ms/blueprintsprocessor/application/src/test/java/org/onap/ccsdk/cds/blueprintsprocessor/BlueprintProcessorApplicationTest.java @@ -1,5 +1,6 @@ /* * Copyright © 2017-2018 AT&T Intellectual Property. + * Modifications Copyright © 2019 IBM. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +21,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.ccsdk.cds.controllerblueprints.core.config.BluePrintLoadConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; @@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.SpringRunner; * DATE : 8/14/2018 */ @RunWith(SpringRunner.class) -@ContextConfiguration(classes = {BlueprintProcessorApplication.class, BluePrintLoadConfiguration.class}) +@ContextConfiguration(classes = {BlueprintProcessorApplication.class}) @SpringBootTest(classes = BlueprintProcessorApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class BlueprintProcessorApplicationTest { diff --git a/ms/blueprintsprocessor/application/src/test/resources/application.properties b/ms/blueprintsprocessor/application/src/test/resources/application.properties index ea2f976a3..06f3e948c 100644 --- a/ms/blueprintsprocessor/application/src/test/resources/application.properties +++ b/ms/blueprintsprocessor/application/src/test/resources/application.properties @@ -17,6 +17,30 @@ # # Web server config server.port=8080 +### START -Controller Blueprints Properties +# Load Resource Source Mappings +resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability + +# Controller Blueprints Core Configuration +controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy +controllerblueprints.blueprintArchivePath=/opt/app/onap/blueprints/archive +controllerblueprints.blueprintWorkingPath=/opt/app/onap/blueprints/working + +# Controller Blueprint Load Configurations +# blueprints.load.initial-data may be overridden by ENV variables +controllerblueprints.loadInitialData=false +controllerblueprints.loadBluePrint=false +controllerblueprints.loadBluePrintPaths=/opt/app/onap/model-catalog/blueprint-model/service-blueprint +controllerblueprints.loadModelType=false +controllerblueprints.loadModeTypePaths=/opt/app/onap/model-catalog/definition-type/starter-type +controllerblueprints.loadResourceDictionary=false +controllerblueprints.loadResourceDictionaryPaths=/opt/app/onap/model-catalog/resource-dictionary/starter-dictionary + +# CBA file extension +controllerblueprints.loadCbaExtension=zip + +### END -Controller Blueprints Properties + blueprintsprocessor.grpcEnable=false blueprintsprocessor.httpPort=8080 blueprintsprocessor.grpcPort=9111 diff --git a/ms/blueprintsprocessor/distribution/src/main/docker/distribution.xml b/ms/blueprintsprocessor/distribution/src/main/docker/distribution.xml index 10cf29d99..ba799ea7f 100755 --- a/ms/blueprintsprocessor/distribution/src/main/docker/distribution.xml +++ b/ms/blueprintsprocessor/distribution/src/main/docker/distribution.xml @@ -1,6 +1,7 @@ + + + + inbounds + org.onap.ccsdk.cds.blueprintsprocessor + 0.5.0-SNAPSHOT + + 4.0.0 + designer-api + jar + Blueprints Designer API + Blueprints Designer API + + + + org.onap.ccsdk.cds.controllerblueprints + service + + + \ No newline at end of file diff --git a/ms/blueprintsprocessor/modules/inbounds/pom.xml b/ms/blueprintsprocessor/modules/inbounds/pom.xml index 9cbb73f9d..6d82e951a 100644 --- a/ms/blueprintsprocessor/modules/inbounds/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/pom.xml @@ -29,6 +29,7 @@ Blueprints Processor Inbounds + designer-api resource-api selfservice-api diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index 1ed0a6570..0ad7f950a 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -371,6 +371,13 @@ workflow-service ${project.version} + + + + org.onap.ccsdk.cds.blueprintsprocessor + designer-api + ${project.version} + org.onap.ccsdk.cds.blueprintsprocessor resource-api @@ -445,6 +452,11 @@ blueprint-validation ${project.version} + + org.onap.ccsdk.cds.controllerblueprints + service + ${project.version} + -- cgit 1.2.3-korg