fix crash look backoff in data router

update data router with additional config needed
by the schema ingest lib

Issue-ID: AAI-2369

Change-Id: I1870fa1fd3e92854b86553a394bd522429c22164
Signed-off-by: renealr <reneal.rogers@amdocs.com>

3 files changed, 33 insertions, 18 deletions

diff --git a/charts/aai-data-router/resources/config/schemaIngest.properties b/charts/aai-data-router/resources/config/schemaIngest.properties
index 8c680b5..f98ddce 100644
--- a/charts/aai-data-router/resources/config/schemaIngest.properties
+++ b/charts/aai-data-router/resources/config/schemaIngest.properties
@@ -32,15 +32,34 @@ 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=v9,v10,v11,v12,v13,v14

+schema.version.list={{.Values.global.config.schema.version.list}}

 # Decalares the oxm version to load

-schema.version.api.default=v14

+schema.version.api.default={{.Values.global.config.schema.version.api.default}}

 

 # 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=v14

-schema.version.related.link.start=v14

-schema.version.app.root.start=v14

-schema.version.namespace.change.start=v14

-schema.version.edge.label.start=v14

-~

+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

diff --git a/charts/aai-data-router/resources/dynamic/conf/data-router-oxm.xml b/charts/aai-data-router/resources/dynamic/conf/data-router-oxm.xml
index c945c39..f564797 100644
--- a/charts/aai-data-router/resources/dynamic/conf/data-router-oxm.xml
+++ b/charts/aai-data-router/resources/dynamic/conf/data-router-oxm.xml
@@ -9,14 +9,9 @@
         location="file:${CONFIG_HOME}/schemaIngest.properties"
         ignore-unresolvable="true" />
 
-  <bean id="schemaLocationsBean" class="org.onap.aai.setup.SchemaLocationsBean">
-                <!-- When running with AJSC these properties must be injected directly.
-                                             The reason for this is unknown. -->
-                <property name="nodeDirectory" value="${nodeDir}" />
-                <property name="edgeDirectory" value="${edgeDir}" />
-        </bean>
-
-  <bean id="schemaVersions" class="org.onap.aai.setup.SchemaVersions"/>
+        <bean id="nodeIngestor" class="org.onap.aai.nodes.NodeIngestor" autowire="byName"/>
+                <bean id="oxmModelLoader" class="org.onap.aai.schema.OxmModelLoader" >
+                      <constructor-arg ref="nodeIngestor"/>
+                </bean>
 
 </beans>
-
diff --git a/charts/aai-data-router/values.yaml b/charts/aai-data-router/values.yaml
index ddc7fd0..9965ef9 100644
--- a/charts/aai-data-router/values.yaml
+++ b/charts/aai-data-router/values.yaml
@@ -21,7 +21,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/data-router:1.3.1
+image: onap/data-router:1.4-STAGING-latest
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -32,6 +32,7 @@ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
 config:
   keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
   keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+  schemaTranslatorList: config
 
 
 # default number of instances