From 2ecd77cb78cc7bfbe4f5f36510efc5380a7863b9 Mon Sep 17 00:00:00 2001 From: Ravi Geda Date: Thu, 29 Nov 2018 11:23:46 +0000 Subject: Update Gizmo config for 1810 schema ingest Change-Id: I88a2a7a266a628646cd2a0c3f88fbc7635070167 Issue-ID: AAI-1954 Signed-off-by: Ravi Geda --- .../aai-gizmo/resources/config/crud-beans.xml | 4 --- .../resources/config/edgeprops-ingest.properties | 3 ++ .../config/model/edge_properties_v14.json | 6 ++++ .../resources/config/schema-ingest.properties | 22 +++++++++++++++ .../resources/config/schemaIngest.properties | 32 ---------------------- .../aai/charts/aai-gizmo/templates/deployment.yaml | 13 ++++++--- 6 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 kubernetes/aai/charts/aai-gizmo/resources/config/edgeprops-ingest.properties create mode 100644 kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v14.json create mode 100644 kubernetes/aai/charts/aai-gizmo/resources/config/schema-ingest.properties delete mode 100644 kubernetes/aai/charts/aai-gizmo/resources/config/schemaIngest.properties (limited to 'kubernetes/aai/charts/aai-gizmo') diff --git a/kubernetes/aai/charts/aai-gizmo/resources/config/crud-beans.xml b/kubernetes/aai/charts/aai-gizmo/resources/config/crud-beans.xml index 48db706b1f..e0ab32b584 100644 --- a/kubernetes/aai/charts/aai-gizmo/resources/config/crud-beans.xml +++ b/kubernetes/aai/charts/aai-gizmo/resources/config/crud-beans.xml @@ -44,8 +44,4 @@ - - - - diff --git a/kubernetes/aai/charts/aai-gizmo/resources/config/edgeprops-ingest.properties b/kubernetes/aai/charts/aai-gizmo/resources/config/edgeprops-ingest.properties new file mode 100644 index 0000000000..fbefd30219 --- /dev/null +++ b/kubernetes/aai/charts/aai-gizmo/resources/config/edgeprops-ingest.properties @@ -0,0 +1,3 @@ +# DB Edge Property files are copied here: +edgePropsDir=/opt/app/crud-service/config/model + diff --git a/kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v14.json b/kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v14.json new file mode 100644 index 0000000000..8d00636d27 --- /dev/null +++ b/kubernetes/aai/charts/aai-gizmo/resources/config/model/edge_properties_v14.json @@ -0,0 +1,6 @@ +{ + "contains-other-v": "java.lang.String", + "delete-other-v": "java.lang.String", + "SVC-INFRA": "java.lang.String", + "prevent-delete": "java.lang.String" +} \ No newline at end of file diff --git a/kubernetes/aai/charts/aai-gizmo/resources/config/schema-ingest.properties b/kubernetes/aai/charts/aai-gizmo/resources/config/schema-ingest.properties new file mode 100644 index 0000000000..39e08edf1b --- /dev/null +++ b/kubernetes/aai/charts/aai-gizmo/resources/config/schema-ingest.properties @@ -0,0 +1,22 @@ +# Schema Version Related Attributes +schema.uri.base.path=/aai +# Lists all of the versions in the schema +schema.version.list=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/crud-api/bundleconfig/etc/onap/oxm +schema.edges.location=/opt/app/crud-api/bundleconfig/etc/onap/dbedgerules diff --git a/kubernetes/aai/charts/aai-gizmo/resources/config/schemaIngest.properties b/kubernetes/aai/charts/aai-gizmo/resources/config/schemaIngest.properties deleted file mode 100644 index 605f7e3ba6..0000000000 --- a/kubernetes/aai/charts/aai-gizmo/resources/config/schemaIngest.properties +++ /dev/null @@ -1,32 +0,0 @@ -# -# ============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 - -# The AAI Schema jar will be unpacked to bundleconfig/etc -schemaConfig=NA -# OXM files named aai_oxm_v*.xml are unpacked here: -nodeDir=/opt/app/crud-api/bundleconfig/etc/oxm -# DB Edge Rules are unpacked here: -edgeDir=/opt/app/crud-api/bundleconfig/etc/dbedgerules -# DB Edge Property files are copied here: -edgePropsDir=/opt/app/crud-service/config/model diff --git a/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml b/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml index 1e68712749..0a30388279 100644 --- a/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml +++ b/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml @@ -86,8 +86,11 @@ spec: - mountPath: /opt/app/crud-service/config/crud-api.properties subPath: crud-api.properties name: {{ include "common.fullname" . }}-config - - mountPath: /opt/app/crud-service/config/schemaIngest.properties - subPath: schemaIngest.properties + - mountPath: /opt/app/crud-service/config/schema-ingest.properties + subPath: schema-ingest.properties + name: {{ include "common.fullname" . }}-config + - mountPath: /opt/app/crud-service/config/edgeprops-ingest.properties + subPath: edgeprops-ingest.properties name: {{ include "common.fullname" . }}-config - mountPath: /opt/app/crud-service/config/model/ name: {{ include "common.fullname" . }}-model-config @@ -217,8 +220,10 @@ spec: items: - key: crud-api.properties path: crud-api.properties - - key: schemaIngest.properties - path: schemaIngest.properties + - key: schema-ingest.properties + path: schema-ingest.properties + - key: edgeprops-ingest.properties + path: edgeprops-ingest.properties - key: crud-beans.xml path: crud-beans.xml - name: {{ include "common.fullname" . }}-logback-config -- cgit 1.2.3-korg