diff options
| author |   rv871f <richard.vondadelszen@amdocs.com> | 2018-08-29 14:56:02 -0400 |
|---|---|---|
| committer | rv871f <richard.vondadelszen@amdocs.com> | 2018-08-29 15:16:28 -0400 |
| commit | c48ce4b76edaffa8d5d991769aba848006985eaa (patch) | |
| tree | a6ecd1af0c2ed9708f58ae0fd34deb3d8cbb1ad3 /sparkybe-onap-application/config/spring-beans | |
| parent | 87dfa2cf9864b4eb0a99eb4771bcd04455e70318 (diff) | |
aai-schema and ingest fixes
Issue-ID: AAI-1554
Change-Id: I0a27cf320d3d69d8e715af8c27d5afeaa2951da5
Signed-off-by: rv871f <richard.vondadelszen@amdocs.com>
Diffstat (limited to 'sparkybe-onap-application/config/spring-beans')
3 files changed, 9 insertions, 4 deletions
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml index 98ce1ad..b44d626 100644 --- a/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml +++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm-default.xml @@ -3,11 +3,12 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + <bean id="oxmModelLoader" class="org.onap.aai.sparky.config.oxm.OxmModelLoader" init-method="loadModel"> <constructor-arg ref="oxmModelProcessorSet" /> <constructor-arg ref="nodeIngestor" /> + <constructor-arg ref="schemaVersions" /> </bean> </beans>
\ No newline at end of file diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml index 5c6839b..3c2d76b 100644 --- a/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml +++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm-override.xml @@ -6,7 +6,7 @@ <bean id="oxmModelLoader" class="org.onap.aai.sparky.config.oxm.OxmModelLoader" init-method="loadModel"> - <constructor-arg name="apiVersionOverride" value="${oxm.apiVersionOverride}" /> + <constructor-arg name="apiVersionOverride" value="${oxm.apiVersion}" /> <constructor-arg ref="oxmModelProcessorSet" /> <constructor-arg ref="nodeIngestor" /> </bean> diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml index fe1eab0..c392153 100644 --- a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml +++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml @@ -42,9 +42,13 @@ <property name="edgeDirectory" value="${edgeDir}" /> </bean> - <bean id="oxmConfigTranslator" class="org.onap.aai.sparky.config.oxm.OxmConfigTranslator"> - <constructor-arg ref="schemaLocationsBean" /> + <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="oxmConfigTranslator" /> </bean> |