From c035a608c273859d928896ae27198dfa603c1901 Mon Sep 17 00:00:00 2001 From: Michael Arrastia Date: Thu, 29 Nov 2018 11:35:51 +0000 Subject: [aai-spike] Update schema ingest configuration * This change is related to changes in AAI Spike to use the latest version of aai-common. The aai-common adoption requires configuration of schema ingestion beans and the resources updated in this commit provide that configuration. * Additionally, the configuration of the meta-validation of the DBEdgeRules, know as "Edge Properties", is now separated into its own property file (edgeprops-ingest.properties) to distinguish this particular configuration from the aai-common schema ingest configuration. Change-Id: I15c79b36c7f53f4c7e85f83179b1f7674b28a200 Issue-ID: AAI-1953 Signed-off-by: Michael Arrastia --- .../resources/config/schema-ingest.properties | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 charts/aai-spike/resources/config/schema-ingest.properties (limited to 'charts/aai-spike/resources/config/schema-ingest.properties') diff --git a/charts/aai-spike/resources/config/schema-ingest.properties b/charts/aai-spike/resources/config/schema-ingest.properties new file mode 100644 index 0000000..7cec524 --- /dev/null +++ b/charts/aai-spike/resources/config/schema-ingest.properties @@ -0,0 +1,49 @@ +# +# ============LICENSE_START======================================================= +# org.onap.aai +# ================================================================================ +# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright © 2018 Amdocs +# ================================================================================ +# 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========================================================= +# + +####################################### +# Schema Version Related Attributes +####################################### + +schema.uri.base.path=/aai +# Lists all of the versions in the schema +schema.version.list=v8,v9,v10,v11,v12,v13,v14 +# Specifies from which version should the depth parameter to default to zero +schema.version.depth.start=v9 +# Specifies from which version should the related link be displayed in response payload +schema.version.related.link.start=v10 +# Specifies from which version should the client see only the uri excluding host info +# Before this version server base will also be included +schema.version.app.root.start=v11 +# Specifies from which version should the namespace be changed +schema.version.namespace.change.start=v12 +# Specifies from which version should the client start seeing the edge label in payload +schema.version.edge.label.start=v12 +# Specifies the version that the application should default to +schema.version.api.default=v14 + +####################################### +# Schema Location Related Attributes +####################################### + +schema.configuration.location=NA +schema.nodes.location=/opt/app/spike/bundleconfig/etc/onap/oxm +schema.edges.location=/opt/app/spike/bundleconfig/etc/onap/dbedgerules -- cgit From 36cb76dfc878a223501cca3f1b5b9ea22136e1e6 Mon Sep 17 00:00:00 2001 From: Michael Arrastia Date: Thu, 20 Dec 2018 10:48:24 +0000 Subject: Schema Service configuration for Spike The config has entries for both Schema Service and local schema files. The property schema.translator.list is currently set to config. This configuration only uses local schema files. Change-Id: Ib5ec6e0d5fad38623a38bb3a68e516491f6b3ed3 Issue-ID: AAI-2010 Signed-off-by: Michael Arrastia --- .../resources/config/schema-ingest.properties | 28 +++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'charts/aai-spike/resources/config/schema-ingest.properties') diff --git a/charts/aai-spike/resources/config/schema-ingest.properties b/charts/aai-spike/resources/config/schema-ingest.properties index 7cec524..1569761 100644 --- a/charts/aai-spike/resources/config/schema-ingest.properties +++ b/charts/aai-spike/resources/config/schema-ingest.properties @@ -22,28 +22,44 @@ ####################################### # Schema Version Related Attributes ####################################### - schema.uri.base.path=/aai # Lists all of the versions in the schema -schema.version.list=v8,v9,v10,v11,v12,v13,v14 +schema.version.list=v10,v11,v12,v13,v14,v15 # Specifies from which version should the depth parameter to default to zero -schema.version.depth.start=v9 +schema.version.depth.start=v10 # Specifies from which version should the related link be displayed in response payload schema.version.related.link.start=v10 # Specifies from which version should the client see only the uri excluding host info # Before this version server base will also be included schema.version.app.root.start=v11 # Specifies from which version should the namespace be changed -schema.version.namespace.change.start=v12 +schema.version.namespace.change.start=v11 # Specifies from which version should the client start seeing the edge label in payload schema.version.edge.label.start=v12 # Specifies the version that the application should default to -schema.version.api.default=v14 +schema.version.api.default=v15 ####################################### # Schema Location Related Attributes ####################################### - schema.configuration.location=NA schema.nodes.location=/opt/app/spike/bundleconfig/etc/onap/oxm schema.edges.location=/opt/app/spike/bundleconfig/etc/onap/dbedgerules + +############################################################################### +# Schema Service Related Attributes +############################################################################### +# Specifies whether to use the schema service (schema-service) or local schema files (config) +schema.translator.list=config + +schema.service.base.url=https://:8452/aai/schema-service/v1/ +schema.service.nodes.endpoint=nodes?version= +schema.service.edges.endpoint=edgerules?version= +schema.service.versions.endpoint=versions + +#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/client-cert.p12 +#Replace the below with the A&AI tomcat trust store +schema.service.ssl.trust-store=${CONFIG_HOME}/auth/tomcat_keystore -- cgit