diff options
author | 2018-11-29 11:35:51 +0000 | |
---|---|---|
committer | 2018-11-29 11:35:51 +0000 | |
commit | c035a608c273859d928896ae27198dfa603c1901 (patch) | |
tree | 9b5359f603482dd559d5240dd17c0914e2c1c15f /charts | |
parent | abbdb91eb0a48d10dae6cf457e1abe23a9b173d9 (diff) |
[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 <MArrasti@amdocs.com>
Diffstat (limited to 'charts')
-rw-r--r-- | charts/aai-spike/resources/config/edgeprops-ingest.properties (renamed from charts/aai-spike/resources/config/schemaIngest.properties) | 9 | ||||
-rw-r--r-- | charts/aai-spike/resources/config/schema-ingest.properties | 49 | ||||
-rw-r--r-- | charts/aai-spike/templates/deployment.yaml | 13 |
3 files changed, 59 insertions, 12 deletions
diff --git a/charts/aai-spike/resources/config/schemaIngest.properties b/charts/aai-spike/resources/config/edgeprops-ingest.properties index cc51f17..b0a3150 100644 --- a/charts/aai-spike/resources/config/schemaIngest.properties +++ b/charts/aai-spike/resources/config/edgeprops-ingest.properties @@ -19,12 +19,5 @@ # ============LICENSE_END========================================================= # -# Properties for the SchemaLocationsBean -# The AAI Schema jar will be unpacked to bundleconfig/etc -schemaConfig=NA -# Files named aai_oxm_v*.xml are unpacked here: -nodeDir=/opt/app/spike/bundleconfig/etc/oxm -# DB Edge Rules are unpacked here: -edgeDir=/opt/app/spike/bundleconfig/etc/dbedgerules # DB Edge Property files are copied here: -edgePropsDir=/opt/app/spike/config/model/edge_props
\ No newline at end of file +edgePropsDir=/opt/app/spike/config/model/edge_props 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 diff --git a/charts/aai-spike/templates/deployment.yaml b/charts/aai-spike/templates/deployment.yaml index 38c5ac8..a3ff068 100644 --- a/charts/aai-spike/templates/deployment.yaml +++ b/charts/aai-spike/templates/deployment.yaml @@ -92,8 +92,11 @@ spec: - mountPath: /opt/app/spike/config/spike.properties subPath: spike.properties name: {{ include "common.fullname" . }}-config - - mountPath: /opt/app/spike/config/schemaIngest.properties - subPath: schemaIngest.properties + - mountPath: /opt/app/spike/config/schema-ingest.properties + subPath: schema-ingest.properties + name: {{ include "common.fullname" . }}-config + - mountPath: /opt/app/spike/config/edgeprops-ingest.properties + subPath: edgeprops-ingest.properties name: {{ include "common.fullname" . }}-config - mountPath: /opt/app/spike/config/model/edge_props name: {{ include "common.fullname" . }}-edge-props-config @@ -141,8 +144,10 @@ spec: path: spike.properties - key: spike-beans.xml path: spike-beans.xml - - key: schemaIngest.properties - path: schemaIngest.properties + - key: schema-ingest.properties + path: schema-ingest.properties + - key: edgeprops-ingest.properties + path: edgeprops-ingest.properties - key: logback.xml path: logback.xml - name: {{ include "common.fullname" . }}-edge-props-config |