Merge "Controller Blueprints Microservice"

8 files changed, 77 insertions, 19 deletions

diff --git a/ms/controllerblueprints/README.md b/ms/controllerblueprints/README.md
index 4079daf6..43eeee5f 100755
--- a/ms/controllerblueprints/README.md
+++ b/ms/controllerblueprints/README.md
@@ -9,4 +9,5 @@ Application VM Arguments :
 -Dspring.datasource.username=sdnctl

 -Dspring.datasource.password=sdnctl

 -Dblueprints.load.initial-data=true

+-Dspring.profiles.active=dev

 

diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties b/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
new file mode 100644
index 00000000..e0920870
--- /dev/null
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
@@ -0,0 +1,62 @@
+#
+# Copyright © 2017-2018 AT&T Intellectual Property.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+appName=ControllerBluePrints
+ms_name=org.onap.ccsdk.apps.controllerblueprints
+appVersion=1.0.0
+
+# Basic Authentication
+basic-auth.user-name=ccsdkapps
+basic-auth.hashed-pwd=$2a$10$MJxhNiOAffxbyrV9.rrOUewP9Q/ASg5Nit2cmP.yBaXGsVXo8BW3y
+
+#logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr($ threadId: {PID:- }){magenta} %clr(---){faint} %clr([ hostname: %X{hostname} serviceName: %X{serviceName} version: %X{version} transactionId: %X{transactionId} requestTimeStamp: %X{requestTimestamp}  responseTimeStamp: %X{responseTimestamp} duration: %X{duration}]){yellow} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex
+
+logging.level.org.springframework.web=INFO
+logging.level.org.hibernate.SQL=warn
+logging.level.org.hibernate.type.descriptor.sql=debug
+
+#To Remove Null in JSON API Response
+spring.jackson.default-property-inclusion=non_null
+
+#Swagger Configuration
+swagger.contact.name=Brinda Santh Muthuramalingam
+swagger.contact.url=www.onap.com
+swagger.contact.email=brindasanth@onap.com
+
+spring.jpa.properties.hibernate.show_sql=true
+spring.jpa.properties.hibernate.use_sql_comments=true
+spring.jpa.properties.hibernate.format_sql=true
+
+# spring.datasource.url, spring.datasource.username,spring.datasource.password  may be overridden by ENV variables
+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
+
+# Load Resource Source Mappings
+resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest
\ 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 c0588c86..0160ee5f 100644
--- a/ms/controllerblueprints/application/opt/app/onap/config/application.properties
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
@@ -52,12 +52,12 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial
 
 #Load Blueprints
 # blueprints.load.initial-data may be overridden by ENV variables
-blueprints.load.initial-data=false
-load.dataTypePath=load/model_type/data_type
-load.nodeTypePath=load/model_type/node_type
-load.artifactTypePath=load/model_type/artifact_type
-load.resourceDictionaryPath=load/resource_dictionary
-load.blueprintsPath=load/blueprints
+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
diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml
index d3bff091..33690024 100644
--- a/ms/controllerblueprints/distribution/pom.xml
+++ b/ms/controllerblueprints/distribution/pom.xml
@@ -94,7 +94,7 @@
             <plugin>

                 <!--build the final artifact for docker deployment -->

                 <artifactId>maven-assembly-plugin</artifactId>

-                <version>3.0.0</version>

+                <version>3.1.0</version>

                 <configuration>

                     <!-- <skipAssembly>${skip.assembly}</skipAssembly>-->

                     <outputDirectory>${basedir}/target/docker-stage</outputDirectory>

diff --git a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
index 3c146469..dd219084 100644
--- a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
+++ b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
      image: mariadb:latest

      container_name: cb-mariadb

      ports:

-       - "3307:3306"

+       - "3306:3306"

      volumes:

        - ~/vm_mysql:/var/lib/mysql

      restart: always

diff --git a/ms/controllerblueprints/distribution/src/main/docker/Dockerfile b/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
index a2f453f2..6de589da 100644
--- a/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
+++ b/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
@@ -14,7 +14,7 @@ RUN (mkdir -p /source /opt/app/onap) && (tar -xzf /source.tar.gz -C /source) \
 && (mv /source/@project.build.finalName@ /source/app) \
 && (cp -rf /source/app/opt/app/onap/lib /opt/app/onap/) \
 && (cp -rf /source/app/etc /) \
-&& (cp -rf /source/app/load /) \
+&& (cp -rf /source/app/model-catalog /) \
 && (rm -rf /source)
 
 ENTRYPOINT /startService.sh
diff --git a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
index f2f3cb0b..c929f98e 100644
--- a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
+++ b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
@@ -49,11 +49,6 @@
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/../application/src/main/groovy</directory>
-            <outputDirectory>src/main/groovy</outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-        </fileSet>
-        <fileSet>
             <directory>${project.basedir}/../application/src/main/resources</directory>
             <outputDirectory>src/main/resources</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
@@ -64,8 +59,8 @@
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/../application/load</directory>
-            <outputDirectory>load</outputDirectory>
+            <directory>${project.basedir}/../../../components/model-catalog</directory>
+            <outputDirectory>./model-catalog</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java
index cfcf93d2..92fe8def 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java
@@ -39,11 +39,11 @@ import com.att.eelf.configuration.EELFManager;
 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.beans.factory.annotation.Value;

 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

+import org.springframework.boot.context.event.ApplicationReadyEvent;

+import org.springframework.context.event.EventListener;

 import org.springframework.core.io.Resource;

 import org.springframework.core.io.support.ResourcePatternResolver;

 import org.springframework.stereotype.Component;

-

-import javax.annotation.PostConstruct;

 import java.io.IOException;

 import java.nio.charset.Charset;

 import java.util.List;

@@ -94,8 +94,8 @@ public class DataBaseInitService {
 

     }

 

-    @PostConstruct

     @SuppressWarnings("unused")

+    @EventListener(ApplicationReadyEvent.class)

     private void initDatabase() {

         log.info("loading dataTypePath from DIR : {}", dataTypePath);

         log.info("loading nodeTypePath from DIR : {}", nodeTypePath);