From b8c668f77b0ff1bacc8fba6a9f4b551ac5b531cb Mon Sep 17 00:00:00 2001
From: "Arul.Nambi" <arul.nambi@amdocs.com>
Date: Tue, 17 Jul 2018 16:02:30 -0400
Subject: AAI-UI es index are not getting populated

This change request contains the following fixes
1) SSL exception when contacting search service
2) AAI not posting to DMaap as it could not contact message-router
3) Search service unable to reach elastic search
4) Index name different between synapse and AAI-UI
5) Sparky starting before es which leads to the indexes not being
created
6) Changing the DMaaP topic on synapse to listen to the ones posted by
AAI

Issue-ID: OOM-1290
Change-Id: I8126755c50f6842d8aee429436fb57b8b96a3819
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
(cherry picked from commit 01a80afbf5e04b9c05b3f590d643c81b16088b3b)
---
 .../resources/config/spring-beans/sparky-core-sync.xml            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans')

diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
index 0763f94cd1..29eb4a311a 100644
--- a/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
+++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
@@ -142,7 +142,7 @@
 			<map>
 				<entry key="aggregate_generic-vnf_index">
 					<bean class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
-						<property name="indexName" value="aggregate_generic-vnf_index" />
+						<property name="indexName" value="aggregate-vnf-index" />
 						<property name="indexDocType" value="default" />
 						<property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" />
 					</bean>
@@ -212,7 +212,7 @@
 	</bean>
 
 	<bean id="autoSuggestionEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
-		<property name="indexName" value="entityautosuggestindex" />
+		<property name="indexName" value="entity-autosuggest-index" />
 		<property name="indexDocType" value="default" />
 		<property name="indexMappingsFileName" value="/schemas/autoSuggestMappings.json" />
 		<property name="indexSettingsFileName" value="/schemas/autoSuggestSettings.json" />
@@ -296,7 +296,7 @@
 	</bean>
 
 	<bean id="geoEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
-		<property name="indexName" value="topographicalsearchindex" />
+		<property name="indexName" value="topography-search-index" />
 		<property name="indexDocType" value="default" />
 		<property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" />
 	</bean>
@@ -336,7 +336,7 @@
 	</bean>
 
 	<bean id="viewInspectySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
-		<property name="indexName" value="entitysearchindex" />
+		<property name="indexName" value="entity-search-index" />
 		<property name="indexDocType" value="default" />
 		<property name="indexMappingsFileName" value="/schemas/es_mappings.json" />
 		<property name="indexSettingsFileName" value="/schemas/es_settings.json" />
-- 
cgit 1.2.3-korg