Base POLICY-PDP-PAP channel configuration

With these changes the PDP should come up listening in
the new PAP-PDP topic for messages, and configured to
send.

Change-Id: I395f87a7401aeb6385d640e51f75d71c0def36b0
Issue-ID: POLICY-1548
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>

2 files changed, 26 insertions, 4 deletions

diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf
index bd5c5e88..4d38301b 100644
--- a/packages/install/src/files/base.conf
+++ b/packages/install/src/files/base.conf
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP POLICY
 # ================================================================================
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,6 +63,12 @@ PDPD_CONFIGURATION_CONSUMER_GROUP=
 PDPD_CONFIGURATION_CONSUMER_INSTANCE=
 PDPD_CONFIGURATION_PARTITION_KEY=
 
+# PAP-PDP configuration channel
+
+POLICY_PDP_PAP_TOPIC=POLICY-PDP-PAP
+POLICY_PDP_PAP_API_KEY=
+POLICY_PDP_PAP_API_SECRET=
+
 # PAP
 
 PAP_HOST=
diff --git a/policy-management/src/main/server/config/policy-engine.properties b/policy-management/src/main/server/config/policy-engine.properties
index f7ff5d71..b43971f1 100644
--- a/policy-management/src/main/server/config/policy-engine.properties
+++ b/policy-management/src/main/server/config/policy-engine.properties
@@ -20,9 +20,9 @@
 
 # Policy Engine Configuration
 
-# Configuration Channel Settings: PDPD_CONFIGURATION
+# Configuration Channel Settings: PDPD-CONFIGURATION
 
-dmaap.source.topics=${env:PDPD_CONFIGURATION_TOPIC}
+dmaap.source.topics=${env:PDPD_CONFIGURATION_TOPIC},POLICY-PDP-PAP
 dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${env:PDPD_CONFIGURATION_SERVERS}
 dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey=${env:PDPD_CONFIGURATION_API_KEY}
 dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=${env:PDPD_CONFIGURATION_API_SECRET}
@@ -31,7 +31,7 @@ dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.consumerInstance=${env:PDPD_CO
 dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.managed=false
 dmaap.source.topics.${{PDPD_CONFIGURATION_TOPIC}}.https=true
 
-dmaap.sink.topics=${env:PDPD_CONFIGURATION_TOPIC}
+dmaap.sink.topics=${env:PDPD_CONFIGURATION_TOPIC},POLICY-PDP-PAP
 dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.servers=${env:PDPD_CONFIGURATION_SERVERS}
 dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiKey=${env:PDPD_CONFIGURATION_API_KEY}
 dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=${env:PDPD_CONFIGURATION_API_SECRET}
@@ -39,6 +39,22 @@ dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.partitionKey=${env:PDPD_CONFIGUR
 dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.managed=false
 dmaap.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.https=true
 
+# Configuration Channel Settings: POLICY-PDP-PAP
+
+dmaap.source.topics.POLICY-PDP-PAP.effectiveTopic=${env:POLICY_PDP_PAP_TOPIC}
+dmaap.source.topics.POLICY-PDP-PAP.servers=${env:DMAAP_SERVERS}
+dmaap.source.topics.POLICY-PDP-PAP.apiKey=${env:POLICY_PDP_PAP_API_KEY}
+dmaap.source.topics.POLICY-PDP-PAP.apiSecret=${env:POLICY_PDP_PAP_API_SECRET}
+dmaap.source.topics.POLICY-PDP-PAP.managed=false
+dmaap.source.topics.POLICY-PDP-PAP.https=true
+
+dmaap.sink.topics.POLICY-PDP-PAP.effectiveTopic=${env:POLICY_PDP_PAP_TOPIC}
+dmaap.sink.topics.POLICY-PDP-PAP.servers=${env:DMAAP_SERVERS}
+dmaap.sink.topics.POLICY-PDP-PAP.apiKey=${env:POLICY_PDP_PAP_API_KEY}
+dmaap.sink.topics.POLICY-PDP-PAP.apiSecret=${env:POLICY_PDP_PAP_API_SECRET}
+dmaap.sink.topics.POLICY-PDP-PAP.managed=false
+dmaap.sink.topics.POLICY-PDP-PAP.https=true
+
 http.server.services=SECURED-CONFIG
 
 http.server.services.SECURED-CONFIG.host=${env:TELEMETRY_HOST}