From: JoeOLeary <joseph.o.leary@est.tech>
Date: Wed, 2 Oct 2019 14:45:27 +0000 (+0100)
Subject: Update blueprint
X-Git-Tag: 1.3.0~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F96513%2F1;p=dcaegen2%2Fcollectors%2Fdatafile.git

Update blueprint

* Make topic name, consumer group and consumer id configurable
* Add use existing to DR feed

Issue-ID: DCAEGEN2-1793
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>
Change-Id: I454acf3390c112be16c1604d8d62098b7f3c45e6
---

diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
index 65013d4e..5a0b0bb6 100644
--- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
+++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
@@ -35,6 +35,15 @@ inputs:
   feed0_name:
     type: string
     default: "bulk_pm_feed"
+  topic_name:
+    type: string
+    default: "unauthenticated.VES_NOTIFICATION_OUTPUT"
+  consumer_group:
+    type: string
+    default: "OpenDcae-c12"
+  consumer_id:
+    type: string
+    default: "C12"
   log_directory:
     type: string
     default: "/var/log/ONAP"
@@ -77,7 +86,7 @@ node_templates:
         streams_subscribes:
           dmaap_subscriber:
             dmaap_info:
-              topic_url: https://message-router.onap.svc.cluster.local:3905/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12
+              topic_url: { concat: ['https://message-router:3905/events/',{ get_input: topic_name }, '/', { get_input: consumer_group }, "/", { get_input: consumer_id }] }
       docker_config:
         healthcheck:
           interval: 15s
@@ -124,3 +133,4 @@ node_templates:
     properties:
       feed_name:
         get_input: feed0_name
+      useExisting: true