From: Arul.Nambi <arul.nambi@amdocs.com>
Date: Tue, 18 Sep 2018 13:24:40 +0000 (-0400)
Subject: Changing the routes for new dmaap client
X-Git-Tag: 4.0.0-ONAP~15^2~97
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8b52fa35261775ada62c127d15fceaead9063274;p=aai%2Foom.git

Changing the routes for new dmaap client

Issue-ID: AAI-1621
Change-Id: I0ca38f082f611f5c4ee6a10622e891d831bcc2b3
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
---

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 bfa35c2..acfe0a5 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
@@ -27,12 +27,24 @@
     <property name="searchEndpointDocuments" value = "documents" />
     <property name="searchEntitySearchIndex" value="entity-search-index" />
     <property name="searchTopographySearchIndex" value="topography-search-index" />
-    <property name="searchEntityAutoSuggestIndex" value="entity-autosuggest-index" />
-    <property name="searchAggregationVnfIndex" value="aggregate-vnf-index" />
+    <property name="searchEntityAutoSuggestIndex" value="entityautosuggestindex" />
+    <property name="searchAggregationVnfIndex" value="aggregate_generic-vnf_index" />
     <property name="searchCertName" value="client-cert-onap.p12" />
     <property name="searchKeystorePwd" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10" />
     <property name="searchKeystore" value="tomcat_keystore" />
   </bean>
+  
+  <bean id="consumerBeanEntityEvent" class="org.onap.aai.event.client.DMaaPEventConsumer " >
+    <constructor-arg name="host" value="message-router.{{.Release.Namespace}}:3904" />
+    <constructor-arg name="topic" value="AAI-EVENT" />
+    <constructor-arg name="username" value="" />
+    <constructor-arg name="password" value="" />
+    <constructor-arg name="consumerGroup" value="datarouter" />
+    <constructor-arg name="consumerId" value="datarouter" />
+    <constructor-arg name="timeoutMs" value="1000" />
+    <constructor-arg name="messageLimit" value="100" />
+    <constructor-arg name="transportType" value="HTTPAUTH" />
+  </bean>
 
   <bean id="entityEventPolicy" class="org.onap.aai.datarouter.policy.EntityEventPolicy" init-method="startup" >
     <constructor-arg ref="eepConfig"/>
diff --git a/charts/aai-data-router/resources/dynamic/routes/entity-event.route b/charts/aai-data-router/resources/dynamic/routes/entity-event.route
index d349ee9..14db6d6 100644
--- a/charts/aai-data-router/resources/dynamic/routes/entity-event.route
+++ b/charts/aai-data-router/resources/dynamic/routes/entity-event.route
@@ -1,4 +1,4 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
-  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;groupName=datarouter&amp;groupId=datarouter&amp;url=http://message-router.{{.Release.Namespace}}:3904"/>
+  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;consumer=#consumerBeanEntityEvent" />
   <to uri="bean:entityEventPolicy?method=process"/>
-</route>
+</route>
\ No newline at end of file