From 86cc273b9fd0ce30ecbd04ecb3da2c9db4cca61d Mon Sep 17 00:00:00 2001
From: Michael Arrastia <MArrasti@amdocs.com>
Date: Tue, 18 Sep 2018 10:57:03 +0100
Subject: [PATCH] [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 ++++
 kubernetes/aai/charts/aai-spike/values.yaml           |   3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystore
index 9eec841aa2c1243b5ca3e22b0b116e5bca2afd49..025f3c49da16d9b72b9e5c4481cf2ee7d01d2a3e 100644
GIT binary patch
delta 1238
zcmZ1`_*AO?-`jt085kIt;8;2(H!-n5H@8SZBQvigwJ0|=B{Q)kH90ZfP?LdyG4+L&
z;Uosu2t88+O9lp(Zi6P4c7rD7`~}QRj7&_7Tn4;soLX%jZQpqr8M#>*4BQR54LI4D
zLs{5_nL>jNc@4Nh94;Ofe?P|nL%w<g9uS|Kht)sW(b3IN(m))<XXX(=w%pk<-q1i!
zoY&C8z|6qZ(9{%2Mgh5&2ByY_P_98TUYnE*6d)E!g8i3U<d9pWmy)Xw^s8Qe9*8JP
zH{?Teji3QP#5EkSK$&dHrda>ZWWo&Q-L-c%K8QVeR&IWelwlITRIZepVyM2T>0dMR
zmklo@JmteHS4CKO{JQz)i^+{G4zY7r?mGI<vt~!NR#lo%4pUT`wDqi2hX0fA*r{Gz
z#ZZ`K(rualrYn6}Lbg@gm-(!(YdV@;+wUEb*MG41c&KE^2KC^mcQJLY;$=JQYwq)2
zSrNmKaN&Ay=D%f+w>$2>&UAUo>{D(%Df@-eADpy#<{ephTAWGvnuWO0p{+qdF}W*W
zXtH0>Kcqj&X!`WGKbR9IGykvjbyzYt<7y~h-FpLd^^KJqvs0Hzx2+I%^SD?oYSuLW
z=FRBMQDPyJ9@rReJ*UMVwru&|iZeStg>I?8#mmIZ$iTR`i7~;Ti7^Hozp}zCOa=@F
zf^3`#Z61tmKb#mDSy-5v*bW#NBZPQa)WlT$3sUofgMAd-Q}a@bfGI0QAvm?DEVW3%
zIkl)HGc7Y2C}toF40l;R7BLo)n2lA>a(V7`t@JtZw#@tSq=1k0T8j)qK=R5gz6Rb6
zB2rhviwe9hr>}hd@J^E9ruGZ}-mh9{utd*52O~n!k{@!?Y+__G-~*Y;&&c>6<aE{t
z5Lc+Oh#82macHwKva+%>GqQ2iLzzql$sqNDEHMUAO?<hj#l?x~sk%k^rNCU%Bn3=f
zi3OQ@#hJMUIjJeBx%u#9)+CIo7A(;OPhw5Hu*3$IK+90fO^o%73{!jBJ0rTX4C50R
zI=YG;#>ijORP_qEUAwdF;-AILvvwSd^V)g-?=Q*Oc4wZoE?Ro8wCc6bVXt+Y+{CJE
zW|z!T(+(~^wQQ@Z>CFhnQw#Qdvlp~D!u`TJzWnbY{kJPNPF#`IQ>#%Fu4egsNAeBF
zGtZh!k4-F#RNwxIQDfnQTlGzer~WMXXcXvY8@crJpV^Ok<r-Q-4tpwYovg#OU_#KU
zs1pL(_SQaE9@J?izjD_Xp3Aa0?R%=Hu*}V`2DQ&NdzW30`S>Mr#Y~eO)23#>isoCc
zboAGy=NCdsuPRh-uyySefAsOvM4wA>F4sP-;!)N3KC9y8gLRRLFWr{$IT<wCu^h|!
g8oZIGjYH(qI&}l4EeVmwIoqlP16McCTH9v}08d@Hp8x;=

delta 43
ycmaDVwM>xb-`jt085kItfS7UfX_ht)k#hZ}6aT+&66d=)e^1+SmaYBL>Y@OCw-KEH

diff --git a/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml b/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml
index 20dfbc5e6d..50be8cb0f8 100644
--- a/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml
+++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-spike/values.yaml b/kubernetes/aai/charts/aai-spike/values.yaml
index c8d20437ad..6429d3f119 100644
--- a/kubernetes/aai/charts/aai-spike/values.yaml
+++ b/kubernetes/aai/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:
-- 
2.16.6