diff options
| author |   rv871f <richard.vondadelszen@amdocs.com> | 2018-08-21 17:28:34 -0400 |
|---|---|---|
| committer | rv871f <richard.vondadelszen@amdocs.com> | 2018-08-22 11:20:12 -0400 |
| commit | 6530692958399a5b180c69b40714cce97aea68c9 (patch) | |
| tree | 06a1fb985dec53b3209d7eefba623403f47af811 /sparkybe-onap-application/config | |
| parent | cc699c2d6769d28a520ee3c1fd47251a165b4b39 (diff) | |
ES to SDS conversion
Issue-ID: AAI-1530
Change-Id: Ic2f40c608a80109af1feafe42bad1f78d38647a1
Signed-off-by: rv871f <richard.vondadelszen@amdocs.com>
Diffstat (limited to 'sparkybe-onap-application/config')
3 files changed, 5 insertions, 9 deletions
diff --git a/sparkybe-onap-application/config/application.properties b/sparkybe-onap-application/config/application.properties index 54f4f40..f3ba9a9 100644 --- a/sparkybe-onap-application/config/application.properties +++ b/sparkybe-onap-application/config/application.properties @@ -3,8 +3,9 @@ # spring.mvc.favicon.enabled=false -#possible values: camel,http,ssl,portal,fe-dev,fe-prod,oxm-default,oxm-override,[resources|gizmo],sync,oxm-schema-prod -spring.profiles.active=camel,ssl,fe-dev,oxm-schema-dev,resources,sync +#possible values: camel,http,ssl,portal,fe-dev,fe-prod,oxm-default,oxm-override,[resources|gizmo],sync,oxm-schema-dev,oxm-schema-prod +#For oxm loading there needs to be a combo of [oxm-default OR oxm-override] AND [oxm-schema-dev OR oxm-schema-prod] +spring.profiles.active=camel,ssl,fe-dev,oxm-schema-dev,resources,sync,oxm-override elasticsearch.hostname=127.0.0.1 elasticsearch.port=9200 diff --git a/sparkybe-onap-application/config/spring-beans/sparky-aggregate-vnf-search-provider.xml b/sparkybe-onap-application/config/spring-beans/sparky-aggregate-vnf-search-provider.xml index 25da171..03218d1 100644 --- a/sparkybe-onap-application/config/spring-beans/sparky-aggregate-vnf-search-provider.xml +++ b/sparkybe-onap-application/config/spring-beans/sparky-aggregate-vnf-search-provider.xml @@ -14,7 +14,7 @@ <bean id="aggregateSummaryProcessor" class="org.onap.aai.sparky.aggregatevnf.search.AggregateSummaryProcessor"> - <constructor-arg ref="elasticSearchAdapter" /> + <constructor-arg ref="searchServiceAdapter" /> <constructor-arg ref="filtersConfig" /> <property name="vnfAggregationIndexName" value="aggregate_generic-vnf_index" /> </bean> diff --git a/sparkybe-onap-application/config/spring-beans/sparky-filters.xml b/sparkybe-onap-application/config/spring-beans/sparky-filters.xml index 2dc4936..6cd9b06 100644 --- a/sparkybe-onap-application/config/spring-beans/sparky-filters.xml +++ b/sparkybe-onap-application/config/spring-beans/sparky-filters.xml @@ -10,14 +10,9 @@ <constructor-arg name="resourceLoader" ref="sparkyResourceLoader" /> </bean> - <bean id="filterElasticSearchAdapter" - class="org.onap.aai.sparky.search.filters.FilterElasticSearchAdapter"> - <constructor-arg ref="elasticSearchAdapter" /> - </bean> - <bean id="filteredSearchHelper" class="org.onap.aai.sparky.search.filters.FilteredSearchHelper"> <constructor-arg ref="filtersConfig" /> - <constructor-arg ref="filterElasticSearchAdapter" /> + <constructor-arg ref="searchServiceAdapter" /> </bean> <bean id="filterProcessor" class="org.onap.aai.sparky.search.filters.FilterProcessor"> |