From 1996ca0d6cdbee6484d1490735b7ff566f3aa7b3 Mon Sep 17 00:00:00 2001
From: "Arul.Nambi" <arul.nambi@amdocs.com>
Date: Tue, 17 Jul 2018 16:02:30 -0400
Subject: [PATCH] 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/dynamic/conf/entity-event-policy.xml    |  4 ++--
 charts/aai-elasticsearch/templates/deployment.yaml    |  1 +
 charts/aai-elasticsearch/templates/service.yaml       |  2 +-
 .../resources/config/application.properties           |  2 +-
 charts/aai-search-data/values.yaml                    |  2 +-
 .../config/spring-beans/sparky-core-sync.xml          |  8 ++++----
 charts/aai-sparky-be/templates/deployment.yaml        | 19 +++++++++++++++++++
 7 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/charts/aai-data-router/resources/dynamic/conf/entity-event-policy.xml b/charts/aai-data-router/resources/dynamic/conf/entity-event-policy.xml
index e995053..5db9092 100644
--- a/charts/aai-data-router/resources/dynamic/conf/entity-event-policy.xml
+++ b/charts/aai-data-router/resources/dynamic/conf/entity-event-policy.xml
@@ -5,8 +5,8 @@
               http://www.springframework.org/schema/beans/spring-beans.xsd">
 
   <bean id="eepConfig" class="org.onap.aai.datarouter.policy.EntityEventPolicyConfig" >
-    <property name="sourceDomain" value="default" />
-    <property name="searchBaseUrl" value="https://search-data-service:9509" />
+    <property name="sourceDomain" value="dev" />
+    <property name="searchBaseUrl" value="https://{{.Values.global.searchData.serviceName}}.{{.Release.Namespace}}:9509" />
     <property name="searchEndpoint" value="services/search-data-service/v1/search/indexes/" />
     <property name="searchEndpointDocuments" value = "documents" />
     <property name="searchEntitySearchIndex" value="entity-search-index" />
diff --git a/charts/aai-elasticsearch/templates/deployment.yaml b/charts/aai-elasticsearch/templates/deployment.yaml
index 0417536..40c6210 100644
--- a/charts/aai-elasticsearch/templates/deployment.yaml
+++ b/charts/aai-elasticsearch/templates/deployment.yaml
@@ -17,6 +17,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
+        release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
     spec:
       initContainers:
diff --git a/charts/aai-elasticsearch/templates/service.yaml b/charts/aai-elasticsearch/templates/service.yaml
index 54ee8b6..f3a6dbb 100644
--- a/charts/aai-elasticsearch/templates/service.yaml
+++ b/charts/aai-elasticsearch/templates/service.yaml
@@ -20,6 +20,6 @@ spec:
       name: {{ .Values.service.portName }}
     {{- end}}
   selector:
-    app: {{ include "common.fullname" . }}
+    app: {{ include "common.name" . }}
     release: {{ .Release.Name }}
   clusterIP: None
diff --git a/charts/aai-resources/resources/config/application.properties b/charts/aai-resources/resources/config/application.properties
index a65c04e..cfeabb9 100644
--- a/charts/aai-resources/resources/config/application.properties
+++ b/charts/aai-resources/resources/config/application.properties
@@ -44,7 +44,7 @@ server.ssl.key-store-type=JKS
 # JMS bind address host port
 jms.bind.address=tcp://localhost:61647
 dmaap.ribbon.eureka.enabled=false
-dmaap.ribbon.listOfServers=dmaap.{{ include "common.namespace" . }}:3904
+dmaap.ribbon.listOfServers=message-router.{{.Release.Namespace}}:3904
 # Number of milliseconds to wait before making ping requests again
 dmaap.ribbon.ServerListRefreshInterval=75000
 dmaap.ribbon.NFLoadBalancerPingInterval=75000
diff --git a/charts/aai-search-data/values.yaml b/charts/aai-search-data/values.yaml
index f781662..2c3a005 100644
--- a/charts/aai-search-data/values.yaml
+++ b/charts/aai-search-data/values.yaml
@@ -9,7 +9,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/search-data-service:1.2.1
+image: onap/search-data-service:1.2.2
 pullPolicy: Always
 restartPolicy: Always
 
diff --git a/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml b/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
index 0763f94..29eb4a3 100644
--- a/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
+++ b/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" />
diff --git a/charts/aai-sparky-be/templates/deployment.yaml b/charts/aai-sparky-be/templates/deployment.yaml
index b459646..b9de92b 100644
--- a/charts/aai-sparky-be/templates/deployment.yaml
+++ b/charts/aai-sparky-be/templates/deployment.yaml
@@ -34,6 +34,25 @@ spec:
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - aai-elasticsearch
+        - --container-name
+        - aai-search-data
+        - --container-name
+        - aai
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: {{ include "common.name" . }}-readiness
       containers:
       - name: {{ include "common.name" . }}
         image: "{{ include "common.repository" . }}/{{ .Values.image }}"
-- 
2.16.6