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/auth/client-cert.p12 | Bin 0 -> 3617 bytes .../model/edge_props/edge_properties_v15.json | 6 +++++ .../resources/config/schema-ingest.properties | 28 ++++++++++++++++----- 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 charts/aai-spike/resources/config/auth/client-cert.p12 create mode 100644 charts/aai-spike/resources/config/model/edge_props/edge_properties_v15.json (limited to 'charts') diff --git a/charts/aai-spike/resources/config/auth/client-cert.p12 b/charts/aai-spike/resources/config/auth/client-cert.p12 new file mode 100644 index 0000000..d9fe86e Binary files /dev/null and b/charts/aai-spike/resources/config/auth/client-cert.p12 differ diff --git a/charts/aai-spike/resources/config/model/edge_props/edge_properties_v15.json b/charts/aai-spike/resources/config/model/edge_props/edge_properties_v15.json new file mode 100644 index 0000000..8d00636 --- /dev/null +++ b/charts/aai-spike/resources/config/model/edge_props/edge_properties_v15.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/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 1.2.3-korg