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-service/src/test/resources | |
| 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-service/src/test/resources')
9 files changed, 41 insertions, 13 deletions
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 diff --git a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v10.xml b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v10/test_oxm_v10.xml index 51eaa34..51eaa34 100644 --- a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v10.xml +++ b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v10/test_oxm_v10.xml diff --git a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v11.xml b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v11/test_oxm_v11.xml index 90d023c..90d023c 100644 --- a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v11.xml +++ b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v11/test_oxm_v11.xml diff --git a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v12.xml b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v12/test_oxm_v12.xml index ec61eb6..ec61eb6 100644 --- a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v12.xml +++ b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v12/test_oxm_v12.xml diff --git a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v13.xml b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v13/test_oxm_v13.xml index 9a29fa7..9a29fa7 100644 --- a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v13.xml +++ b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v13/test_oxm_v13.xml diff --git a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v8.xml b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v8/test_oxm_v8.xml index d666b73..d666b73 100644 --- a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v8.xml +++ b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v8/test_oxm_v8.xml diff --git a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v9.xml b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v9/test_oxm_v9.xml index ecffb2f..ecffb2f 100644 --- a/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/test_oxm_v9.xml +++ b/sparkybe-onap-service/src/test/resources/oxm-reader/oxm/v9/test_oxm_v9.xml diff --git a/sparkybe-onap-service/src/test/resources/oxm-reader/schema-ingest-single-oxm.properties b/sparkybe-onap-service/src/test/resources/oxm-reader/schema-ingest-single-oxm.properties index 596316c..897f7da 100644 --- a/sparkybe-onap-service/src/test/resources/oxm-reader/schema-ingest-single-oxm.properties +++ b/sparkybe-onap-service/src/test/resources/oxm-reader/schema-ingest-single-oxm.properties @@ -1,4 +1,20 @@ Test properties for the org.onap.aai.setup.SchemaLocationsBean schemaConfig=NA nodeDir=src/test/resources/oxm-reader/oxm/ -edgeDir=src/test/resources/oxm-reader/oxm/
\ No newline at end of file +edgeDir=src/test/resources/oxm-reader/oxm/ + +# New propterties required by the aai-common - aai-schema-ingest lib as of 1.3.0 +schema.configuration.location=N/A +schema.nodes.location=src/test/resources/oxm-reader/oxm/ +schema.edges.location= +# These versions need to exist if they are included in the list +schema.version.list=v8,v9,v10,v11,v12,v13 +# Decalares the oxm version to load +schema.version.api.default=v11 + +# Setting this values to ${oxm.apiVersion} only to ensure the value used exists (we don't use this properties in our application) +schema.version.depth.start=v11 +schema.version.related.link.start=v11 +schema.version.app.root.start=v11 +schema.version.namespace.change.start=v11 +schema.version.edge.label.start=v11
\ No newline at end of file diff --git a/sparkybe-onap-service/src/test/resources/oxm-reader/sparky-core.xml b/sparkybe-onap-service/src/test/resources/oxm-reader/sparky-core.xml index 4bccd66..86e4132 100644 --- a/sparkybe-onap-service/src/test/resources/oxm-reader/sparky-core.xml +++ b/sparkybe-onap-service/src/test/resources/oxm-reader/sparky-core.xml @@ -60,15 +60,19 @@ <property name="edgeDirectory" value="bundleconfig-local/etc/oxm/" /> </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> <bean id="oxmModelLoader" class="org.onap.aai.sparky.config.oxm.OxmModelLoader" init-method="loadModel"> - <constructor-arg name="apiVersionOverride" value="V11" /> + <constructor-arg name="apiVersionOverride" value="v11" /> <constructor-arg ref="oxmModelProcessorSet" /> <constructor-arg ref="nodeIngestor" /> </bean> |