From 7202e8f8480369c1e97a4152a6f5305efb6cfad7 Mon Sep 17 00:00:00 2001 From: BT2983 Date: Mon, 27 Aug 2018 19:14:42 -0600 Subject: Naming micro-service updates. Support for docker compose and some fixes. Change-Id: Ida28efd9c785aaf9d12b31e053ef5b1014289e60 Issue-ID: CCSDK-342 Signed-off-by: BT2983 --- ms/neng/opt/etc/config/application-live.properties | 30 ++++++++++++++++++++++ ms/neng/pom.xml | 2 +- ms/neng/src/main/compose/docker-compose.yaml | 29 +++++++++++++++++++++ .../scripts/rel_18_10/04_ref_data_extrn_int.sql | 22 ++++++++-------- 4 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 ms/neng/opt/etc/config/application-live.properties create mode 100644 ms/neng/src/main/compose/docker-compose.yaml (limited to 'ms') diff --git a/ms/neng/opt/etc/config/application-live.properties b/ms/neng/opt/etc/config/application-live.properties new file mode 100644 index 00000000..23feb8de --- /dev/null +++ b/ms/neng/opt/etc/config/application-live.properties @@ -0,0 +1,30 @@ +#============LICENSE_START======================================================= +# ONAP : CCSDK.apps +# ================================================================================ +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +#============LICENSE_END========================================================= + +#========================================================================= +# +# Configuration used for running the application in a live env, in a docker +# container, with real DB and interfaces. +# +#========================================================================= +datasource.db.url=${neng_db_url} +datasource.db.username=${neng_db_user} +datasource.db.password=${neng_db_pass} +jpa.hibernate.ddl-auto=none +jpa.show-sql=true +hibernate.show_sql:true diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index 9cf6f33c..8390350a 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -438,7 +438,7 @@ docker-maven-plugin 0.4.11 - ${docker.registry}/org.onap.ccsdk.apps/${serviceArtifactName}:${project.version} + onap/ccsdk-apps-ms-neng:${project.version} src/main/docker docker-hub https://${docker.registry} diff --git a/ms/neng/src/main/compose/docker-compose.yaml b/ms/neng/src/main/compose/docker-compose.yaml new file mode 100644 index 00000000..93dbbf0d --- /dev/null +++ b/ms/neng/src/main/compose/docker-compose.yaml @@ -0,0 +1,29 @@ + +nengdb: + image: mariadb + container_name: nengdb + ports: + - "${NENG_DB_PORT}:3306" + volumes: + - /var/lib/nengdb:/var/lib/mysql + restart: always + environment: + MYSQL_ROOT_PASSWORD: "${NENG_DB_ROOT}" + MYSQL_DATABASE: neng + MYSQL_USER: "${NENG_DB_USER}" + MYSQL_PASSWORD: "${NENG_DB_PASS}" + +neng: + #depends_on: + #- nengdb + image: onap/ccsdk-apps-ms-neng + container_name: neng + ports: + - "${NENG_SERV_PORT}:8080" + restart: always + environment: + SPRING_PROFILE: "${SPRING_PROFILE}" + NENG_DB_URL: "${NENG_DB_URL}" + NENG_DB_USER: "${NENG_DB_USER}" + NENG_DB_PASS: "${NENG_DB_PASS}" + diff --git a/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/04_ref_data_extrn_int.sql b/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/04_ref_data_extrn_int.sql index 7b0973c2..bb257082 100644 --- a/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/04_ref_data_extrn_int.sql +++ b/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/04_ref_data_extrn_int.sql @@ -1,32 +1,32 @@ --liquibase formatted sql --changeset ref_data_update:18_10.ref_data_update.sql -delete from external_interface; +delete from EXTERNAL_INTERFACE; -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','vnf-name','nodes/generic-vnfs?vnf-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VNF','nodes/generic-vnfs?vnf-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','vnfc-name','nodes/vnfcs?vnfc-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VNFC','nodes/vnfcs?vnfc-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','vserver-name','nodes/vservers?vserver-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','vf-module-name','nodes/vf-modules?vf-module-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VFMODULE','nodes/vf-modules?vf-module-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VF-MODULE','nodes/vf-modules?vf-module-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','service-instance-id','nodes/service-instances?service-instance-id=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VM','nodes/vservers?vserver-name=',sysdate(),'nengsys',sysdate(),'nengsys'); commit; -- cgit 1.2.3-korg