summaryrefslogtreecommitdiffstats
path: root/sparkybe-onap-application/config
diff options
context:
space:
mode:
authorrenealr <reneal.rogers@amdocs.com>2018-08-24 09:20:37 -0400
committerrenealr <reneal.rogers@amdocs.com>2018-08-24 11:25:20 -0400
commit11b1339ca114835bf60356b4061f1ff3f3fd3e8b (patch)
tree6965f83294a0bd4d7a01935dbacf3bc3e61df147 /sparkybe-onap-application/config
parent3f9bce9e9d5c7f779a20d289811a88babfbda3cf (diff)
update sync queries to use searh data service
Issue-ID: AAI-1540 Change-Id: I6a00b0e12830e1220070ae60ba9b2c42e67dfbfc Signed-off-by: renealr <reneal.rogers@amdocs.com>
Diffstat (limited to 'sparkybe-onap-application/config')
-rw-r--r--sparkybe-onap-application/config/application.properties3
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-elasticsearch.xml21
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-oxm.xml16
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-sync.xml103
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml4
5 files changed, 10 insertions, 137 deletions
diff --git a/sparkybe-onap-application/config/application.properties b/sparkybe-onap-application/config/application.properties
index f3ba9a9..4c6b1c0 100644
--- a/sparkybe-onap-application/config/application.properties
+++ b/sparkybe-onap-application/config/application.properties
@@ -7,9 +7,6 @@ spring.mvc.favicon.enabled=false
#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
-
searchservice.hostname=127.0.0.1
searchservice.port=9502
searchservice.client-cert=client-cert-onap.p12
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-elasticsearch.xml b/sparkybe-onap-application/config/spring-beans/sparky-elasticsearch.xml
index b697fed..8f1207e 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-elasticsearch.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-elasticsearch.xml
@@ -8,25 +8,4 @@
<property name="resourceLoader" ref="sparkyResourceLoader" />
</bean>
- <bean id="elasticSearchRestEndpointConfig" class="org.onap.aai.sparky.dal.rest.config.RestEndpointConfig">
- <property name="endpointIpAddress" value="${elasticsearch.hostname:127.0.0.1}" />
- <property name="endpointServerPort" value="${elasticsearch.port:9200}" />
- <property name="numRequestRetries" value="5" />
- <property name="restAuthenticationMode" value="HTTP_NOAUTH" />
- <property name="connectTimeoutInMs" value="60000" />
- <property name="readTimeoutInMs" value="30000" />
- </bean>
-
- <bean id="elasticSearchAdapter" class="org.onap.aai.sparky.dal.ElasticSearchAdapter">
- <constructor-arg ref="elasticSearchRestEndpointConfig" />
- </bean>
-
- <bean id="elasticSearchEndpointConfig"
- class="org.onap.aai.sparky.sync.config.ElasticSearchEndpointConfig">
- <property name="esIpAddress" value="${elasticsearch.hostname:127.0.0.1}" />
- <property name="esServerPort" value="${elasticsearch.port:9200}" />
- <property name="scrollContextTimeToLiveInMinutes" value="5" />
- <property name="scrollContextBatchRequestSize" value="5000" />
- </bean>
-
</beans> \ No newline at end of file
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
index ecba6cd..fe1eab0 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
@@ -60,22 +60,6 @@
<property name="searchProviderRegistry" ref="searchProviderRegistry" />
</bean>
- <bean id="entityCountHistoryProcessor" class="org.onap.aai.sparky.search.EntityCountHistoryProcessor">
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg name="entityTypesToSummarizeDelimitedList"
- value="customer,service-instance,complex,pserver,vserver,vnf" />
- <constructor-arg name="vnfEntityTypesDelimitedList"
- value="vnf,newvce,vce,vpe" />
- <constructor-arg name="entityCountHistoryIndexName"
- value="entitycounthistoryindex" />
- </bean>
-
- <bean id="geoVisualizationProcessor" class="org.onap.aai.sparky.inventory.GeoVisualizationProcessor">
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg name="topographicalSearchIndexName"
- value="topographicalsearchindex" />
- </bean>
-
<bean id="pairingHashMap" class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="targetMapClass">
<value>java.util.HashMap</value>
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-sync.xml b/sparkybe-onap-application/config/spring-beans/sparky-sync.xml
index 34c063b..bb976c8 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-sync.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-sync.xml
@@ -74,14 +74,14 @@
class="org.onap.aai.sparky.aggregation.sync.AggregationSyncControllerFactory"
init-method="registerController">
- <constructor-arg ref="elasticSearchEndpointConfig" />
+ <constructor-arg ref="searchServiceRestEndpointConfi" />
<constructor-arg ref="aggregationSyncControllerConfig" />
<constructor-arg ref="syncControllerRegistry" />
<constructor-arg ref="suggestionEntityLookup" />
<constructor-arg ref="oxmEntityLookup" />
<constructor-arg ref="elasticSearchSchemaFactory" />
- <property name="esAdapter" ref="elasticSearchAdapter" />
+ <property name="searchServiceAdapter" ref="searchServiceAdapter" />
<property name="esStatConfig" ref="elasticSearchNetworkStatConfig" />
<property name="aaiAdapter" ref="activeInventoryAdapter" />
@@ -107,51 +107,6 @@
</bean>
-
- <bean id="historicalEntitySyncControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
-
- <property name="controllerName" value="Historical-Entity-Sync-Controller" />
- <property name="enabled" value="${historicalEntitySyncEnabled:true}" />
- <property name="syncTaskDelayInMs" value="5000" />
- <property name="syncTaskFrequencyInDays" value="1" />
- <property name="numSyncControllerWorkers" value="2" />
- <property name="runOnceSyncEnabled" value="true" />
- <property name="periodicSyncEnabled" value="false" />
- <property name="numInternalSyncWorkers" value="2" />
- <property name="numSyncElasticWorkers" value="5" />
- <property name="numSyncActiveInventoryWorkers" value="5" />
- <property name="targetSyncStartTimeStamp" value="06:00:00 UTC+00:00" />
- </bean>
-
- <bean id="historicalEntitySchemaConfig"
- class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="entitycounthistoryindex" />
- <property name="indexDocType" value="default" />
- <property name="indexMappingsFileName" value="/schemas/entityCountHistoryMappings.json" />
- <property name="indexSettingsFileName" value="/schemas/es_settings.json" />
- </bean>
-
- <bean id="historicalEntitySyncController"
- class="org.onap.aai.sparky.aggregation.sync.HistoricalEntitySyncController"
- init-method="registerController">
-
- <constructor-arg ref="historicalEntitySyncControllerConfig" />
- <constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="historicalEntitySchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg value="60" />
- <constructor-arg ref="aaiNetworkStatConfig" />
- <constructor-arg ref="elasticSearchNetworkStatConfig" />
- <constructor-arg ref="searchableEntityLookup" />
- <constructor-arg ref="elasticSearchSchemaFactory" />
-
- <property name="syncControllerRegistry" ref="syncControllerRegistry" />
-
- </bean>
-
-
-
<bean id="autoSuggestionSyncControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
<property name="controllerName" value="Auto-Suggestion-Sync-Controller" />
@@ -181,9 +136,9 @@
<constructor-arg ref="autoSuggestionSyncControllerConfig" />
<constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
+ <constructor-arg ref="searchServiceAdapter" />
<constructor-arg ref="autoSuggestionEntitySchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
+ <constructor-arg ref="searchServiceRestEndpointConfig" />
<constructor-arg ref="aaiNetworkStatConfig" />
<constructor-arg ref="elasticSearchNetworkStatConfig" />
<constructor-arg ref="oxmEntityLookup" />
@@ -228,9 +183,9 @@
<constructor-arg ref="vnfAliasSyncControllerConfig" />
<constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
+ <constructor-arg ref="searchServiceAdapter" />
<constructor-arg ref="vnfAliasEntitySchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
+ <constructor-arg ref="searchServiceRestEndpointConfig" />
<constructor-arg ref="aaiNetworkStatConfig" />
<constructor-arg ref="elasticSearchNetworkStatConfig" />
<constructor-arg ref="filtersConfig" />
@@ -240,48 +195,6 @@
</bean>
- <bean id="geoSyncControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
-
- <property name="controllerName" value="Geo-Sync-Controller" />
- <property name="enabled" value="${geoSyncEnabled:true}" />
- <property name="syncTaskDelayInMs" value="5000" />
- <property name="syncTaskFrequencyInDays" value="1" />
- <property name="numSyncControllerWorkers" value="2" />
- <property name="runOnceSyncEnabled" value="true" />
- <property name="periodicSyncEnabled" value="false" />
- <property name="numInternalSyncWorkers" value="2" />
- <property name="numSyncElasticWorkers" value="5" />
- <property name="numSyncActiveInventoryWorkers" value="5" />
- <property name="targetSyncStartTimeStamp" value="06:00:00 UTC+00:00" />
- </bean>
-
- <bean id="geoEntitySchemaConfig"
- class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="topographicalsearchindex" />
- <property name="indexDocType" value="default" />
- <property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" />
- </bean>
-
- <bean id="geoSyncController" class="org.onap.aai.sparky.topology.sync.GeoSyncController"
- init-method="registerController">
-
- <constructor-arg ref="geoSyncControllerConfig" />
- <constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="geoEntitySchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
- <constructor-arg ref="aaiNetworkStatConfig" />
- <constructor-arg ref="elasticSearchNetworkStatConfig" />
- <constructor-arg ref="geoEntityLookup" />
- <constructor-arg ref="oxmEntityLookup" />
- <constructor-arg ref="elasticSearchSchemaFactory" />
-
- <property name="syncControllerRegistry" ref="syncControllerRegistry" />
-
- </bean>
-
-
-
<bean id="viewInspectControllerConfig" class="org.onap.aai.sparky.sync.config.SyncControllerConfig">
<property name="controllerName" value="View-Inspect-Sync-Controller" />
@@ -303,9 +216,9 @@
<constructor-arg ref="viewInspectControllerConfig" />
<constructor-arg ref="activeInventoryAdapter" />
- <constructor-arg ref="elasticSearchAdapter" />
+ <constructor-arg ref="searchServiceAdapter" />
<constructor-arg ref="viewInspectSchemaConfig" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
+ <constructor-arg ref="searchServiceRestEndpointConfig" />
<constructor-arg ref="aaiNetworkStatConfig" />
<constructor-arg ref="elasticSearchNetworkStatConfig" />
<constructor-arg ref="crossEntityReferenceLookup" />
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml
index 7c34697..b0d5471 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-resources.xml
@@ -49,8 +49,8 @@
<constructor-arg name="gizmoAdapter">
<null />
</constructor-arg>
- <constructor-arg ref="elasticSearchAdapter" />
- <constructor-arg ref="elasticSearchEndpointConfig" />
+ <constructor-arg ref="searchServiceAdapter" />
+ <constructor-arg ref="searchServiceRestEndpointConfig" />
<constructor-arg ref="viewInspectSchemaConfig" />
<constructor-arg name="numActiveInventoryWorkers"
value="50" />