Config for pomba services to enable integration

Issue-ID: LOG-194
Change-Id: Ia73101214fc265d538e147f7b329394b4ddaa878
Signed-off-by: Geora Barsky <georab@amdocs.com>

5 files changed, 64 insertions, 11 deletions

diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties
index 05eecc6184..dc885acac9 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties
@@ -1,3 +1,16 @@
+# Copyright © 2018 Amdocs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 server.port=9529
 server.ssl.key-store=/auth/tomcat_keystore
 server.ssl.key-store-password=onapSecret
@@ -29,7 +42,7 @@ transport.publish.type=HTTPAUTH
 transport.publish.partition=1
 transport.publish.retries=4
 
-event.header.domain=IST3S2
+event.header.domain=onap
 event.header.source-name=RO
 event.header.event-type=POA-EVENT
 event.header.entity-type=poa-entity
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties
index 1a958eae76..7a119f9267 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties
@@ -1,7 +1,21 @@
+# Copyright © 2018 Amdocs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 server.host={{ .Values.config.aaiCtxBuilderHost }}
 basicauth.username={{ .Values.config.aaiCtxBuilderUsername }}
 basicauth.password={{ .Values.config.aaiCtxBuilderPassword }}
-server.port=9530
+server.port={{ .Values.config.ctxBuilderExternalPort }}
 server.protocol=http
 trust.store.path=/auth/tomcat_keystore
 key.store.path=/auth/aai-client-cert.p12
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties
index 413ac1a5ec..80167d2257 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties
@@ -1,7 +1,20 @@
+# Copyright © 2018 Amdocs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 server.host={{ .Values.config.sdcCtxBuilderHost }}
 basicauth.username={{ .Values.config.sdcCtxBuilderUsername }}
 basicauth.password={{ .Values.config.sdcCtxBuilderPassword }}
-server.port=9532
+server.port={{ .Values.config.ctxBuilderExternalPort }}
 server.protocol=http
 trust.store.path=/auth/tomcat_keystore
 key.store.path=/auth/aai-client-cert.p12
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties
index 60a92737ec..f06d335213 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties
@@ -1,7 +1,20 @@
+# Copyright © 2018 Amdocs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 server.host={{ .Values.config.sdncCtxBuilderHost }}
 basicauth.username={{ .Values.config.sdncCtxBuilderUsername }}
 basicauth.password={{ .Values.config.sdncCtxBuilderPassword }}
-server.port=9531
+server.port={{ .Values.config.ctxBuilderExternalPort }}
 server.protocol=http
 trust.store.path=/auth/tomcat_keystore
 key.store.path=/auth/aai-client-cert.p12
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
index e67b85e988..92d1b0d2a5 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2017 Amdocs, Bell Canada
+# Copyright © 2018 Amdocs
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,14 +32,14 @@ debugEnabled: false
 # application configuration
 config:
   aaiCtxBuilderHost: pomba-aaictxbuilder
-  aaiCtxBuilderUsername: change-me
-  aaiCtxBuilderPassword: change-me
+  aaiCtxBuilderUsername: admin
+  aaiCtxBuilderPassword: admin
   sdcCtxBuilderHost: pomba-sdcctxbuilder
-  sdcCtxBuilderUsername: change-me
-  sdcCtxBuilderPassword: change-me
+  sdcCtxBuilderUsername: admin
+  sdcCtxBuilderPassword: admin
   sdncCtxBuilderHost: pomba-sdncctxbuilder
-  sdncCtxBuilderUsername: change-me
-  sdncCtxBuilderPassword: change-me
+  sdncCtxBuilderUsername: admin
+  sdncCtxBuilderPassword: admin
   networkdiscoveryCtxBuilderHost: pomba-networkdiscoveryctxbuilder
   networkdiscoveryCtxBuilderUsername: admin
   networkdiscoveryCtxBuilderPassword: admin