From c48ce4b76edaffa8d5d991769aba848006985eaa Mon Sep 17 00:00:00 2001
From: rv871f <richard.vondadelszen@amdocs.com>
Date: Wed, 29 Aug 2018 14:56:02 -0400
Subject: aai-schema and ingest fixes

Issue-ID: AAI-1554
Change-Id: I0a27cf320d3d69d8e715af8c27d5afeaa2951da5
Signed-off-by: rv871f <richard.vondadelszen@amdocs.com>
---
 .../test/resources/oxm-reader/oxm-reader-bean.xml  | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'sparkybe-onap-service/src/test/resources/oxm-reader/oxm-reader-bean.xml')

diff --git a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm-reader-bean.xml b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm-reader-bean.xml
index a44a48c..3722fdd 100644
--- a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm-reader-bean.xml
+++ b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm-reader-bean.xml
@@ -32,25 +32,33 @@
 				<ref bean="oxmEntityLookup" />			</set>
 		</property>
 	</bean>
-    <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="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="configTranslator" class="org.onap.aai.sparky.config.oxm.OxmConfigTranslator">
-        <constructor-arg ref="schemaLocationsBean" />
-    </bean>
+  <bean id="schemaVersions" class="org.onap.aai.setup.SchemaVersions"/>
+  
+	<bean id="oxmConfigTranslator" class="org.onap.aai.setup.AAIConfigTranslator">
+    <constructor-arg ref="schemaLocationsBean" />
+    <constructor-arg ref="schemaVersions" />
+	</bean>
 
     <bean id="nodeIngestor" class="org.onap.aai.nodes.NodeIngestor">
-        <constructor-arg ref="configTranslator" />
+        <constructor-arg ref="oxmConfigTranslator" />
     </bean>
 
+    
+    
 	<bean id="oxmModelLoader" class="org.onap.aai.sparky.config.oxm.OxmModelLoader"
 		init-method="loadModel">
 		<!-- <constructor-arg name="apiVersionOverride" value="V11" /> -->
 		<constructor-arg ref="oxmModelProcessorSet" />
 		<constructor-arg ref="nodeIngestor" />
+    <constructor-arg ref="schemaVersions" />
 	</bean>
 
 </beans>
\ No newline at end of file
-- 
cgit 1.2.3-korg