Multiple fixes & enhancement

- Rework docker image build
- Fix compress function
- Fix node type name for source-primary-db

Change-Id: Ide38e17036e76047d9f850b714ba0da4add5cd9d
Issue-ID: CCSDK-414
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

5 files changed, 39 insertions, 164 deletions

diff --git a/ms/blueprintsprocessor/application/etc/logback.xml b/ms/blueprintsprocessor/application/etc/logback.xml
deleted file mode 100755
index a97bb8c3..00000000
--- a/ms/blueprintsprocessor/application/etc/logback.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--

-  ~  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.

-  -->

-

-<configuration>

-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

-        <!-- encoders are assigned the type

-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->

-        <encoder>

-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger{100} - %msg%n</pattern>

-        </encoder>

-    </appender>

-

-

-    <logger name="org.springframework" level="info"/>

-    <logger name="org.springframework.web" level="info"/>

-    <logger name="org.hibernate" level="error"/>

-    <logger name="org.onap.ccsdk.apps" level="info"/>

-

-    <root level="warn">

-        <appender-ref ref="STDOUT"/>

-    </root>

-

-</configuration>

diff --git a/ms/blueprintsprocessor/application/etc/run.source b/ms/blueprintsprocessor/application/etc/run.source
deleted file mode 100755
index 7557ab12..00000000
--- a/ms/blueprintsprocessor/application/etc/run.source
+++ /dev/null
@@ -1,12 +0,0 @@
-java -classpath "/etc:${APP_HOME}/lib/*:/lib/*:/src:/schema:/generated-sources:${APP_CONFIG_HOME}:${APP_HOME}" \
--DappName=${APPLICATIONNAME} -DappVersion=${BUNDLEVERSION} \
--DrouteOffer=${ROUTEOFFER} \
--DVERSION_ROUTEOFFER_ENVCONTEXT=${BUNDLEVERSION}/${STICKYSELECTORKEY}/${ENVCONTEXT} \
--DSecurityFilePath=/etc \
--DREST_NAME_NORMALIZER_PATTERN_FILE=/etc/PatternInputs.txt \
--Dms_name=org.onap.ccsdk.apps.blueprintsprocessor \
--Dlogging.config=${APP_CONFIG_HOME}/logback.xml \
--Djava.security.egd=file:/dev/./urandom \
--DAPPNAME=${APP_NAME} -DAPPENV=${APP_ENV} -DAPPVERSION=${APP_VERSION} -DNAMESPACE=${NAMESPACE} \
--Dspring.config.location=${APP_CONFIG_HOME}/ \
-org.onap.ccsdk.apps.blueprintsprocessor.BlueprintProcessorApplication
diff --git a/ms/blueprintsprocessor/application/opt/app/onap/config/application.properties b/ms/blueprintsprocessor/application/opt/app/onap/config/application.properties
index 37a57082..e69de29b 100755
--- a/ms/blueprintsprocessor/application/opt/app/onap/config/application.properties
+++ b/ms/blueprintsprocessor/application/opt/app/onap/config/application.properties
@@ -1,40 +0,0 @@
-#

-#  Copyright � 2017-2018 AT&T Intellectual Property.

-#  Modifications Copyright © 2019 Bell Canada.

-#

-#  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.

-#

-#logging.level.web=DEBUG

-

-# Web server config

-server.port=8080

-

-blueprintsprocessor.grpcEnable=false

-blueprintsprocessor.httpPort=8080

-blueprintsprocessor.grpcPort=9111

-# Blueprint Processor File Execution and Handling Properties

-blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy

-blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive

-# Primary Database Configuration

-blueprintsprocessor.db.primary.url=jdbc:mysql://db:3306/sdnctl

-blueprintsprocessor.db.primary.username=sdnctl

-blueprintsprocessor.db.primary.password=sdnctl

-blueprintsprocessor.db.primary.driverClassName=org.mariadb.jdbc.Driver

-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=validate

-blueprintsprocessor.db.primary.hibernateDDLAuto=none

-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy

-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect

-

-# Python executor

-blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython

-blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/application/opt/app/onap/config/logback.xml b/ms/blueprintsprocessor/application/opt/app/onap/config/logback.xml
deleted file mode 100755
index a97bb8c3..00000000
--- a/ms/blueprintsprocessor/application/opt/app/onap/config/logback.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--

-  ~  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.

-  -->

-

-<configuration>

-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

-        <!-- encoders are assigned the type

-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->

-        <encoder>

-            <pattern>%d{HH:mm:ss.SSS} %-5level %logger{100} - %msg%n</pattern>

-        </encoder>

-    </appender>

-

-

-    <logger name="org.springframework" level="info"/>

-    <logger name="org.springframework.web" level="info"/>

-    <logger name="org.hibernate" level="error"/>

-    <logger name="org.onap.ccsdk.apps" level="info"/>

-

-    <root level="warn">

-        <appender-ref ref="STDOUT"/>

-    </root>

-

-</configuration>

diff --git a/ms/blueprintsprocessor/application/src/main/resources/application.properties b/ms/blueprintsprocessor/application/src/main/resources/application.properties
index a7ffc42b..d48aba50 100755
--- a/ms/blueprintsprocessor/application/src/main/resources/application.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application.properties
@@ -1,41 +1,40 @@
-#

-#  Copyright � 2017-2018 AT&T Intellectual Property.

-#

-#  Modifications Copyright © 2019 IBM, Bell Canada.

-#

-#  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.

-#

-#logging.level.web=DEBUG

-

-# Web server config

-server.port=8080

-

-blueprintsprocessor.grpcEnable=false

-blueprintsprocessor.httpPort=8080

-blueprintsprocessor.grpcPort=9111

-# Blueprint Processor File Execution and Handling Properties

-blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy

-blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive

-# Primary Database Configuration

-blueprintsprocessor.db.primary.url=jdbc:mysql://db:3306/sdnctl

-blueprintsprocessor.db.primary.username=sdnctl

-blueprintsprocessor.db.primary.password=sdnctl

-blueprintsprocessor.db.primary.driverClassName=org.mariadb.jdbc.Driver

-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=validate

-blueprintsprocessor.db.primary.hibernateDDLAuto=none

-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy

-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect

-

-# Python executor

-blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython

+#
+#  Copyright � 2017-2018 AT&T Intellectual Property.
+#  Modifications Copyright © 2019 IBM, Bell Canada.
+#
+#  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.
+#
+#logging.level.web=DEBUG
+
+# Web server config
+server.port=8080
+
+blueprintsprocessor.grpcEnable=false
+blueprintsprocessor.httpPort=8080
+blueprintsprocessor.grpcPort=9111
+# Blueprint Processor File Execution and Handling Properties
+blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy
+blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive
+# Primary Database Configuration
+blueprintsprocessor.db.primary.url=jdbc:mysql://db:3306/sdnctl
+blueprintsprocessor.db.primary.username=sdnctl
+blueprintsprocessor.db.primary.password=sdnctl
+blueprintsprocessor.db.primary.driverClassName=org.mariadb.jdbc.Driver
+blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=none
+blueprintsprocessor.db.primary.hibernateDDLAuto=none
+blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
+
+# Python executor
+blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython
 blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython
\ No newline at end of file