From 8899e7a0f1ba7481cbcbe7ff581c285a9d0e98b6 Mon Sep 17 00:00:00 2001 From: "Muthuramalingam, Brinda Santh(bs2796)" Date: Fri, 14 Dec 2018 20:38:44 -0500 Subject: Add multiple path load service. Change-Id: Ib2e5f60663991d097b7446106bb883a45db1bdb8 Issue-ID: CCSDK-746 Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) --- .../opt/app/onap/config/application-dev.properties | 32 ++++++++++++---------- .../opt/app/onap/config/application.properties | 25 ++++++++++------- .../src/test/resources/application.properties | 24 +++++++++------- 3 files changed, 46 insertions(+), 35 deletions(-) (limited to 'ms/controllerblueprints/application') diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties b/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties index 8741fab21..46aa2fa0e 100644 --- a/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties +++ b/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties @@ -44,19 +44,21 @@ spring.datasource.url=jdbc:mysql://localhost:3306/sdnctl spring.datasource.username=sdnctl spring.datasource.password=sdnctl spring.datasource.driver-class-name=org.mariadb.jdbc.Driver -spring.jpa.show-sql = true -spring.jpa.hibernate.ddl-auto = none -spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy -spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect - -#Load Blueprints -# blueprints.load.initial-data may be overridden by ENV variables -blueprints.load.initial-data=true -load.dataTypePath=./../../../components/model-catalog/definition-type/starter-type/data_type -load.nodeTypePath=./../../../components/model-catalog/definition-type/starter-type/node_type -load.artifactTypePath=./../../../components/model-catalog/definition-type/starter-type/artifact_type -load.resourceDictionaryPath=./../../../components/model-catalog/resource-dictionary/starter-dictionary -load.blueprintsPath=./../../../components/model-catalog/blueprint-model/starter-blueprint - +spring.jpa.show-sql=true +spring.jpa.hibernate.ddl-auto=none +spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect # Load Resource Source Mappings -resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest \ No newline at end of file +resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest +# Controller Blueprints Core Configuration +controllerblueprints.blueprintDeployPath=/etc/blueprints/deploy +controllerblueprints.blueprintArchivePath=/etc/blueprints/archive +controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment +# Controller Blueprint Load Configurations +controllerblueprints.loadInitialData=true +controllerblueprints.loadBluePrint=false +controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/starter-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 \ No newline at end of file diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application.properties b/ms/controllerblueprints/application/opt/app/onap/config/application.properties index aae37011e..2ac4ad373 100644 --- a/ms/controllerblueprints/application/opt/app/onap/config/application.properties +++ b/ms/controllerblueprints/application/opt/app/onap/config/application.properties @@ -50,14 +50,19 @@ spring.jpa.hibernate.ddl-auto = none spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect -#Load Blueprints -# blueprints.load.initial-data may be overridden by ENV variables -blueprints.load.initial-data=true -load.dataTypePath=model-catalog/definition-type/starter-type/data_type -load.nodeTypePath=model-catalog/definition-type/starter-type/node_type -load.artifactTypePath=model-catalog/definition-type/starter-type/artifact_type -load.resourceDictionaryPath=model-catalog/resource-dictionary/starter-dictionary -load.blueprintsPath=model-catalog/blueprint-model/starter-blueprint - # Load Resource Source Mappings -resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest \ No newline at end of file +resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest + +# Controller Blueprints Core Configuration +controllerblueprints.blueprintDeployPath=/etc/blueprints/deploy +controllerblueprints.blueprintArchivePath=/etc/blueprints/archive +controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment +# Controller Blueprint Load Configurations +# blueprints.load.initial-data may be overridden by ENV variables +controllerblueprints.loadInitialData=true +controllerblueprints.loadBluePrint=false +controllerblueprints.loadBluePrintPaths=model-catalog/blueprint-model/starter-blueprint +controllerblueprints.loadModelType=true +controllerblueprints.loadModeTypePaths=model-catalog/definition-type/starter-type +controllerblueprints.loadResourceDictionary=true +controllerblueprints.loadResourceDictionaryPaths=model-catalog/resource-dictionary/starter-dictionary \ No newline at end of file diff --git a/ms/controllerblueprints/application/src/test/resources/application.properties b/ms/controllerblueprints/application/src/test/resources/application.properties index 0e8789767..48f70b0ea 100644 --- a/ms/controllerblueprints/application/src/test/resources/application.properties +++ b/ms/controllerblueprints/application/src/test/resources/application.properties @@ -32,14 +32,18 @@ swagger.contact.name=Brinda Santh Muthuramalingam swagger.contact.url=www.onap.com swagger.contact.email=brindasanth@onap.com -#Load Blueprints -# blueprints.load.initial-data may be overridden by ENV variables -blueprints.load.initial-data=true -load.dataTypePath=./../../../components/model-catalog/definition-type/starter-type/data_type -load.nodeTypePath=./../../../components/model-catalog/definition-type/starter-type/node_type -load.artifactTypePath=./../../../components/model-catalog/definition-type/starter-type/artifact_type -load.resourceDictionaryPath=./../../../components/model-catalog/resource-dictionary/starter-dictionary -load.blueprintsPath=./../../../components/model-catalog/blueprint-model/starter-blueprint - # Load Resource Source Mappings -resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest \ No newline at end of file +resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest + +# Controller Blueprints Core Configuration +controllerblueprints.blueprintDeployPath=./target/blueprints/deploy +controllerblueprints.blueprintArchivePath=./target/blueprints/archive +controllerblueprints.blueprintEnrichmentPath=./target/blueprints/enrichment +# Controller Blueprint Load Configurations +controllerblueprints.loadInitialData=false +controllerblueprints.loadBluePrint=false +controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/starter-blueprint +controllerblueprints.loadModelType=false +controllerblueprints.loadModeTypePaths=./../../../../components/model-catalog/definition-type/starter-type +controllerblueprints.loadResourceDictionary=false +controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-catalog/resource-dictionary/starter-dictionary \ No newline at end of file -- cgit 1.2.3-korg