From f751bdfbcaad923bd537e8aa0f0c778cdeddaeaa Mon Sep 17 00:00:00 2001
From: vagrant <vv770d@att.com>
Date: Wed, 21 Mar 2018 18:08:00 +0000
Subject: [PATCH] input files for new service bp

Change-Id: I14c9892ae8aa823ec55cf477d75d6d617637a97a
Issue-ID: DCAEGEN2-405
Signed-off-by: Vijay VK <vv770d@att.com>
---
 blueprints/.tca.yaml-template.swp           | Bin 0 -> 16384 bytes
 blueprints/heartbeat-service.yaml-template  |   7 ++++++-
 blueprints/prh-service.yaml-template        |  10 ++++++++--
 blueprints/snmptrap-collector.yaml-template |   8 +++++++-
 blueprints/tcadocker-service.yaml-template  |   9 ++++++++-
 blueprints/ves.yaml-template                |  12 +++++++++++-
 input-templates/heartbeat-input.json        |   7 +++++++
 input-templates/prh-input.json              |   7 +++++++
 input-templates/snmptrap-input.json         |   7 +++++++
 input-templates/tcadocker-input.json        |  11 +++++++++++
 input-templates/vesinput.yaml               |   2 ++
 11 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 blueprints/.tca.yaml-template.swp
 create mode 100644 input-templates/heartbeat-input.json
 create mode 100644 input-templates/prh-input.json
 create mode 100644 input-templates/snmptrap-input.json
 create mode 100644 input-templates/tcadocker-input.json

diff --git a/blueprints/.tca.yaml-template.swp b/blueprints/.tca.yaml-template.swp
new file mode 100644
index 0000000000000000000000000000000000000000..da7b0e00cef21ee5bcdcbfa29a53280d5ad4dcf6
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/blueprints/heartbeat-service.yaml-template b/blueprints/heartbeat-service.yaml-template
index 9d8c59e..b5e8ad4 100644
--- a/blueprints/heartbeat-service.yaml-template
+++ b/blueprints/heartbeat-service.yaml-template
@@ -15,6 +15,10 @@ inputs:
   dh_location_id:
     type: string
     default: "zone1"
+  tag_version:
+    type: string
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.heartbeat:2.0"
+
 node_templates:
   docker_service_host:
     type: dcae.nodes.SelectedDockerHost
@@ -46,7 +50,8 @@ node_templates:
           interval: 18s
           timeout: 30s
           type: docker
-      image: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.heartbeat:2.0"
+      image: 
+        get_input: tag_version
       location_id:
         get_input: dh_location_id
       service_component_type: dcaegen2-services-heartbeat
diff --git a/blueprints/prh-service.yaml-template b/blueprints/prh-service.yaml-template
index 51810f1..b527e1e 100644
--- a/blueprints/prh-service.yaml-template
+++ b/blueprints/prh-service.yaml-template
@@ -6,7 +6,7 @@ inputs:
   prh_publish_url:
     type: string
     default: "http://10.0.11.1:3904/events/unauthenticated.SO_OUTPUT"
-  prh_subcribe_url:
+  prh_subscribe_url:
     type: string
     default: "http://10.0.11.1:3904/events/unauthenticated.SEC_OTHER_OUTPUT"
   docker_host_override:
@@ -15,6 +15,11 @@ inputs:
   dh_location_id:
     type: string
     default: "zone1"
+  tag_version:
+    type: string
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh:1.0"
+
+
 node_templates:
   docker_service_host:
     type: dcae.nodes.SelectedDockerHost
@@ -45,7 +50,8 @@ node_templates:
           interval: 18s
           timeout: 30s
           type: docker
-      image: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.services.prh:1.0"
+      image: 
+        get_input: tag_version
       location_id:
         get_input: dh_location_id
       service_component_type: dcaegen2-services-prh
diff --git a/blueprints/snmptrap-collector.yaml-template b/blueprints/snmptrap-collector.yaml-template
index 062ac1d..95353cb 100644
--- a/blueprints/snmptrap-collector.yaml-template
+++ b/blueprints/snmptrap-collector.yaml-template
@@ -12,6 +12,10 @@ inputs:
   dh_location_id:
     type: string
     default: "zone1"
+  tag_version:
+    type: string
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.snmptrap:1.3"
+
 node_templates:
   docker_service_host:
     type: dcae.nodes.SelectedDockerHost
@@ -79,7 +83,9 @@ node_templates:
           interval: 18s
           timeout: 30s
           type: docker
-      image: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.snmptrap:1.3"
+      image: 
+        get_input: tag_version
+
       location_id:
         get_input: dh_location_id
       service_component_type: dcaegen2-collectors-snmptrap
diff --git a/blueprints/tcadocker-service.yaml-template b/blueprints/tcadocker-service.yaml-template
index 25c1424..ec0ad6c 100644
--- a/blueprints/tcadocker-service.yaml-template
+++ b/blueprints/tcadocker-service.yaml-template
@@ -45,6 +45,11 @@ inputs:
   dh_location_id:
     type: string
     default: "zone1"        
+  tag_version:
+    type: string
+    default: "nexus3.onap.org:10001/onap/tca-cdap-container:1.0"
+
+
 node_templates:
   docker_service_host:
     properties:
@@ -128,6 +133,8 @@ node_templates:
           interval: 15s
           timeout: 1s
           type: http
-      image: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.analytics:v1.1.0"
+      image: 
+        get_input: tag_version
+
       
 
diff --git a/blueprints/ves.yaml-template b/blueprints/ves.yaml-template
index ef65f9a..482d2ab 100644
--- a/blueprints/ves.yaml-template
+++ b/blueprints/ves.yaml-template
@@ -27,6 +27,12 @@ imports:
   - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationshipplugin/1/relationshipplugin_types.yaml"
 
 inputs:
+  ves_other_publish_url:
+    type: string
+    default: "http://10.0.11.1:3904/events/unauthenticated.SEC_OTHER_OUTPUT"
+  ves_heartbeat_publish_url:
+    type: string
+    default: "http://10.0.11.1:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT"
   ves_fault_publish_url:
     type: string
     default: "http://10.0.11.1:3904/events/unauthenticated.SEC_FAULT_OUTPUT"
@@ -39,6 +45,9 @@ inputs:
   dh_location_id:
     type: string
     default: "zone1"
+  tag_version:
+    type: string
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.1-latest"
 
 node_templates:
   docker_collector_host:
@@ -91,7 +100,8 @@ node_templates:
           interval: 15s
           timeout: 1s
           type: http
-      image: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:v1.1.0"
+      image: 
+        get_input: tag_version
       service_component_type: dcaegen2-collectors-ves
     relationships:
       - type: dcae.relationships.component_contained_in
diff --git a/input-templates/heartbeat-input.json b/input-templates/heartbeat-input.json
new file mode 100644
index 0000000..eaf13a3
--- /dev/null
+++ b/input-templates/heartbeat-input.json
@@ -0,0 +1,7 @@
+{
+  "dh_location_id": "{{ dcae_zone }}",
+  "docker_host_override": "component_dockerhost",
+  "dcae_CL_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.DCAE_CL_OUTPUT/",
+  "ves_heartbeat_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/",
+  "tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.heartbeat:2.0"
+}
diff --git a/input-templates/prh-input.json b/input-templates/prh-input.json
new file mode 100644
index 0000000..0207309
--- /dev/null
+++ b/input-templates/prh-input.json
@@ -0,0 +1,7 @@
+{
+  "dh_location_id": "{{ dcae_zone }}",
+  "docker_host_override": "component_dockerhost",
+  "prh_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.unauthenticated.PNF_READY/",
+  "prh_subscribe_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.SEC_OTHER_OUTPUT/",
+  "tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh:1.0"
+}
diff --git a/input-templates/snmptrap-input.json b/input-templates/snmptrap-input.json
new file mode 100644
index 0000000..b3be3df
--- /dev/null
+++ b/input-templates/snmptrap-input.json
@@ -0,0 +1,7 @@
+
+{
+  "dh_location_id": "{{ dcae_zone }}",
+  "docker_host_override": "component_dockerhost",
+  "snmp_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.ONAP-COLLECTOR-SNMPTRAP/",
+  "tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.snmptrap:1.3"
+}
diff --git a/input-templates/tcadocker-input.json b/input-templates/tcadocker-input.json
new file mode 100644
index 0000000..56a1681
--- /dev/null
+++ b/input-templates/tcadocker-input.json
@@ -0,0 +1,11 @@
+{
+	"aaiEnrichmentHost": "{{ aai1_ip_addr }}",
+	"enableAAIEnrichment": true,
+	"subscriberHostName": "{{ mr_ip_addr }}",
+	"publisherHostName": "{{ mr_ip_addr }}",
+	"dh_location_id": "{{ dcae_zone }}",
+	"dh_override": "component_dockerhost",
+	"redisHosts": "{{ redis_ip_port_addr }}",
+	"enableRedisCaching": true,
+  	"tag_version": "nexus3.onap.org:10001/onap/tca-cdap-container:1.0"
+}
diff --git a/input-templates/vesinput.yaml b/input-templates/vesinput.yaml
index f0a64a3..d11e630 100644
--- a/input-templates/vesinput.yaml
+++ b/input-templates/vesinput.yaml
@@ -18,6 +18,8 @@
 {
   "dh_location_id": "{{ dcae_zone }}",
   "dh_override": "component_dockerhost",
+  "ves_other_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.SEC_OTHER_OUTPUT/",
+  "ves_heartbeat_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/",
   "ves_fault_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.SEC_FAULT_OUTPUT/",
   "ves_measurement_publish_url": "http://{{ mr_ip_addr }}:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT/"
 }
-- 
2.16.6