From 7007041548231606f3a2f0f98419d43619340bda Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Mon, 9 Nov 2020 21:58:48 +0100 Subject: [AAI] Reintegrate AAI OOM charts in main repo AAI chart is currently in its own directory. As a lot will be done in the charts with tight coordination between "common" part and components parts, it's a lot easier to have everything in a same place for now. Issue-ID: OOM-2513 Signed-off-by: Sylvain Desbureaux Change-Id: I5e27f7de286bf74e6d3a443e1cb31f63b3d83265 [Update aai to commit 18d4bd165e12cb4d03baa318e506f0dda381cd89] Signed-off-by: Krzysztof Opasiak --- .../resources/config/auth/client-cert-onap.p12 | Bin 0 -> 2556 bytes .../resources/config/auth/data-router_policy.json | 18 ++ .../resources/config/auth/tomcat_keystore | Bin 0 -> 4767 bytes .../resources/config/data-router.properties | 0 .../resources/config/log/logback.xml | 193 +++++++++++++++++++++ .../resources/config/schemaIngest.properties | 65 +++++++ 6 files changed, 276 insertions(+) create mode 100644 kubernetes/aai/components/aai-data-router/resources/config/auth/client-cert-onap.p12 create mode 100644 kubernetes/aai/components/aai-data-router/resources/config/auth/data-router_policy.json create mode 100644 kubernetes/aai/components/aai-data-router/resources/config/auth/tomcat_keystore create mode 100644 kubernetes/aai/components/aai-data-router/resources/config/data-router.properties create mode 100644 kubernetes/aai/components/aai-data-router/resources/config/log/logback.xml create mode 100644 kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties (limited to 'kubernetes/aai/components/aai-data-router/resources/config') diff --git a/kubernetes/aai/components/aai-data-router/resources/config/auth/client-cert-onap.p12 b/kubernetes/aai/components/aai-data-router/resources/config/auth/client-cert-onap.p12 new file mode 100644 index 0000000000..dbf4fcacec Binary files /dev/null and b/kubernetes/aai/components/aai-data-router/resources/config/auth/client-cert-onap.p12 differ diff --git a/kubernetes/aai/components/aai-data-router/resources/config/auth/data-router_policy.json b/kubernetes/aai/components/aai-data-router/resources/config/auth/data-router_policy.json new file mode 100644 index 0000000000..c03870e288 --- /dev/null +++ b/kubernetes/aai/components/aai-data-router/resources/config/auth/data-router_policy.json @@ -0,0 +1,18 @@ +{ + "roles": [ + { + "name": "admin", + "functions": [ + { + "name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ] + } + ], + + "users": [ + { + "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA" + } + ] + } + ] +} diff --git a/kubernetes/aai/components/aai-data-router/resources/config/auth/tomcat_keystore b/kubernetes/aai/components/aai-data-router/resources/config/auth/tomcat_keystore new file mode 100644 index 0000000000..7a7738602d Binary files /dev/null and b/kubernetes/aai/components/aai-data-router/resources/config/auth/tomcat_keystore differ diff --git a/kubernetes/aai/components/aai-data-router/resources/config/data-router.properties b/kubernetes/aai/components/aai-data-router/resources/config/data-router.properties new file mode 100644 index 0000000000..e69de29bb2 diff --git a/kubernetes/aai/components/aai-data-router/resources/config/log/logback.xml b/kubernetes/aai/components/aai-data-router/resources/config/log/logback.xml new file mode 100644 index 0000000000..d7ff0143a1 --- /dev/null +++ b/kubernetes/aai/components/aai-data-router/resources/config/log/logback.xml @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + ${errorLogPattern} + + + + + + + + + + + ${logDirectory}/${generalLogName}.log + + ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${errorLogPattern} + + + + + + INFO + + 256 + + + + + + + ${logDirectory}/${auditLogName}.log + + ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${auditMetricPattern} + + + + 256 + + + + + ${logDirectory}/${metricsLogName}.log + + ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + + ${auditMetricPattern} + + + + + 256 + + + + + ${logDirectory}/${debugLogName}.log + + ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip + + 60 + + + ${errorLogPattern} + + + + + 256 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties b/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties new file mode 100644 index 0000000000..b94ce51e81 --- /dev/null +++ b/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties @@ -0,0 +1,65 @@ +# +# ============LICENSE_START======================================================= +# org.onap.aai +# ================================================================================ +# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright © 2017-2018 Amdocs +# Modifications Copyright © 2018 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. +# ============LICENSE_END========================================================= +# + + +# Properties for the SchemaLocationsBean +# Files named aai_oxm_v*.xml are unpacked here: +nodeDir=/opt/app/data-router/onap/oxm +# Dummy folder/directory: +edgeDir= + +# Properties required by the aai-common - aai-schema-ingest lib as of 1.3.0 +schema.configuration.location=N/A +schema.nodes.location=/opt/app/data-router/onap/oxm/ +schema.edges.location= +# These versions need to exist if they are included in the list +schema.version.list={{ .Values.config.schemaVersionList }} +# Decalares the oxm version to load +schema.version.api.default={{ .Values.config.schemaApiDefault }} + +# Don't use these properties in our application, need to be set to prevent an exception on startup (see SchemaVersions bean) +schema.version.depth.start={{.Values.global.config.schema.version.depth}} +schema.version.related.link.start={{.Values.global.config.schema.version.related.link}} +schema.version.app.root.start={{.Values.global.config.schema.version.app.root}} +schema.version.namespace.change.start={{.Values.global.config.schema.version.namespace.change}} +schema.version.edge.label.start={{.Values.global.config.schema.version.edge.label}} + +#This property is used to enable or disable schema service, possible values are: schema-service or config +schema.translator.list={{.Values.config.schemaTranslatorList}} + +#These properties are needed when schema service is enabled +schema.service.base.url=https://aai-schema-service:8452/aai/schema-service/v1/ +schema.service.nodes.endpoint=nodes?version= +schema.service.edges.endpoint=edgerules?version= +schema.service.versions.endpoint=versions +schema.local=true +schema.filename=mockrequests +#Default rest client is the two-way-ssl +#schema.service.client=two-way-ssl +#Replace the below with the A&AI client key store +schema.service.ssl.key-store=${CONFIG_HOME}/auth/{{.Values.global.config.keystore.filename}} +#Replace the below with the A&AI tomcat trust store +schema.service.ssl.trust-store=${CONFIG_HOME}/auth/{{.Values.global.config.truststore.filename}} +schema.service.ssl.key-store-password={{.Values.global.config.keystore.passwd}} +schema.service.ssl.trust-store-password={{.Values.global.config.truststore.passwd}} + +spring.application.name=datarouter -- cgit 1.2.3-korg