From 9cbcdacf01abd92ca0952410760d3d8545b23ad8 Mon Sep 17 00:00:00 2001 From: BT2983 Date: Thu, 16 Aug 2018 21:48:07 -0600 Subject: Naming micro-service code. Docker updates and tests. Change-Id: Iba669453c4035290441c757f5b1c673ab41213d6 Issue-ID: CCSDK-342 Signed-off-by: BT2983 --- .../opt/etc/config/application-dbless.properties | 42 +++++++++++++++++++ .../etc/config/application-standalone.properties | 44 ++++++++++++++++++++ ms/neng/opt/etc/config/application.properties | 47 ++++++++++++++++++++++ ms/neng/opt/etc/config/logback.xml | 40 ++++++++++++++++++ ms/neng/opt/etc/config/system.properties | 35 ++++++++++++++++ 5 files changed, 208 insertions(+) create mode 100644 ms/neng/opt/etc/config/application-dbless.properties create mode 100644 ms/neng/opt/etc/config/application-standalone.properties create mode 100644 ms/neng/opt/etc/config/application.properties create mode 100644 ms/neng/opt/etc/config/logback.xml create mode 100644 ms/neng/opt/etc/config/system.properties (limited to 'ms/neng/opt') diff --git a/ms/neng/opt/etc/config/application-dbless.properties b/ms/neng/opt/etc/config/application-dbless.properties new file mode 100644 index 00000000..3ac94d18 --- /dev/null +++ b/ms/neng/opt/etc/config/application-dbless.properties @@ -0,0 +1,42 @@ +#============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 from your IDE, without a DB, for testing. +# +# It uses an in-memory DB to support database related functions. +# +#========================================================================= +datasource.db.driver-class-name=org.h2.Driver +datasource.db.url=jdbc:h2:mem:tests;DB_CLOSE_DELAY=-1; +datasource.db.username=TBD +datasource.db.password=TBD +jpa.hibernate.ddl-auto=none +jpa.show-sql=true + +policymgr.clientAuth=Basic TBD +policymgr.basicAuth=Basic TBD +policymgr.url=https://TBD/pdp/api/getConfig +policymgr.environment=TEST +policymgr.ecompRequestId=xx + +aai.certPassword=TBD +aai.cert=opt/aai/keystore/TBD +aai.uriBase=https://TBD/aai/v13/ +aai.fromAppId=namegen-mS diff --git a/ms/neng/opt/etc/config/application-standalone.properties b/ms/neng/opt/etc/config/application-standalone.properties new file mode 100644 index 00000000..07ad0ee2 --- /dev/null +++ b/ms/neng/opt/etc/config/application-standalone.properties @@ -0,0 +1,44 @@ +#============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 stand-alone, in a docker +# container, without a DB. +# +# It uses an in-memory DB for supporting database related functions. +# +#========================================================================= +datasource.db.driver-class-name=org.h2.Driver +datasource.db.url=jdbc:h2:mem:tests;DB_CLOSE_DELAY=-1; +datasource.db.username=${neng_db_user} +datasource.db.password=${neng_db_pass} +jpa.hibernate.ddl-auto=none +jpa.show-sql=true + +policymgr.clientAuth=Basic TBD +policymgr.basicAuth=Basic TBD +policymgr.url=${policymgr_url} +policymgr.environment=TEST +policymgr.ecompRequestId=xx + +aai.certPassword=${aai_cert_pass} +aai.cert=opt/aai/keystore/TBD +aai.uriBase=${aai_uribase} +aai.fromAppId=namegen-mS + diff --git a/ms/neng/opt/etc/config/application.properties b/ms/neng/opt/etc/config/application.properties new file mode 100644 index 00000000..71d7a5f5 --- /dev/null +++ b/ms/neng/opt/etc/config/application.properties @@ -0,0 +1,47 @@ +#============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========================================================= + +#========================================================================= +# +# Main configuration for the application, used always. +# +# This can be overridden with entries in the 'application-xyz.properties' file +# when using a specific spring profile 'xyz'. +# +#========================================================================= + +datasource.db.driver-class-name=com.mysql.jdbc.Driver + +endpoints.beans.id=springbeans +endpoints.beans.sensitive=false + +logging.level.liquibase=DEBUG + +liquibase.changeLog=classpath:/db/changelog/db.changelog-master.xml + +management.security.enabled=false + +server.contextPath=/web + +#The max number of active threads in this pool +server.tomcat.max-threads=200 + +#The minimum number of threads always kept alive +server.tomcat.min-spare-threads=25 + +spring.jersey.type=filter diff --git a/ms/neng/opt/etc/config/logback.xml b/ms/neng/opt/etc/config/logback.xml new file mode 100644 index 00000000..6e0ea863 --- /dev/null +++ b/ms/neng/opt/etc/config/logback.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + ${defaultPattern} + + + + + + diff --git a/ms/neng/opt/etc/config/system.properties b/ms/neng/opt/etc/config/system.properties new file mode 100644 index 00000000..d8fa4d45 --- /dev/null +++ b/ms/neng/opt/etc/config/system.properties @@ -0,0 +1,35 @@ +#============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========================================================= + +#========================================================================= +# +# system configuration for the application. +# +#========================================================================= + +logging.config=opt/etc/config/logback.xml + +# Spring configuration files +spring.config.location=opt/etc/config/ +spring.config.name=application + +appName=networkelementnamegen + +#Modify the below system property +info.build.version=2018.10.01 +javax.net.ssl.trustStore=opt/etc/truststore/truststore.jks -- cgit 1.2.3-korg