From b5c6f9382a2fe95ca035a7725ecfdcede7dfb8ee Mon Sep 17 00:00:00 2001
From: Michael Arrastia <MArrasti@amdocs.com>
Date: Tue, 18 Sep 2018 10:57:03 +0100
Subject: [Spike] Update to use DMaaP with SSL

- DMaaP client configured to use HTTPS protocol in XML bean definition.
- Values yaml updated with port and protocol.
- Update JKS trust store (tomcat_keystore) to accept the DMaaP
  certificate.

Change-Id: I71e8592b5aa6ca2170ee8449a14e6c7469a93839
Issue-ID: AAI-1537
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
---
 .../aai-spike/resources/config/auth/tomcat_keystore   | Bin 2214 -> 3429 bytes
 charts/aai-spike/resources/config/spike-beans.xml     |   4 ++++
 charts/aai-spike/values.yaml                          |   3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/aai-spike/resources/config/auth/tomcat_keystore b/charts/aai-spike/resources/config/auth/tomcat_keystore
index 9eec841..025f3c4 100644
Binary files a/charts/aai-spike/resources/config/auth/tomcat_keystore and b/charts/aai-spike/resources/config/auth/tomcat_keystore differ
diff --git a/charts/aai-spike/resources/config/spike-beans.xml b/charts/aai-spike/resources/config/spike-beans.xml
index 20dfbc5..50be8cb 100644
--- a/charts/aai-spike/resources/config/spike-beans.xml
+++ b/charts/aai-spike/resources/config/spike-beans.xml
@@ -37,6 +37,8 @@
       <constructor-arg name="timeoutMs" value="1000" />
       <constructor-arg name="messageLimit" value="100" />
       <constructor-arg name="transportType" value="HTTPAUTH" />
+      <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
+      <constructor-arg name="filter"><null /></constructor-arg>
    </bean>
 
     <bean id="eventPublisher" class="org.onap.aai.event.client.DMaaPEventPublisher" >
@@ -48,6 +50,8 @@
         <constructor-arg name="maxAgeMs" value="250" />
         <constructor-arg name="delayBetweenBatchesMs" value="50" />
         <constructor-arg name="transportType" value="HTTPAUTH" />
+        <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
+        <constructor-arg name="contentType" value="application/json" />
     </bean>
 
    <bean id="spikeService" class="org.onap.aai.spike.service.SpikeService" init-method="startup">
diff --git a/charts/aai-spike/values.yaml b/charts/aai-spike/values.yaml
index c8d2043..6429d3f 100644
--- a/charts/aai-spike/values.yaml
+++ b/charts/aai-spike/values.yaml
@@ -65,7 +65,8 @@ resources: {}
 # XML bean configuration
 event:
   port:
-    dmaap: 3904
+    dmaap: 3905
+  protocol: https
   consumer:
     topic: champRawEvents
   publisher:
-- 
cgit 1.2.3-korg