Merge "input files for new service bp"

11 files changed, 74 insertions, 6 deletions

diff --git a/blueprints/.tca.yaml-template.swp b/blueprints/.tca.yaml-template.swp
new file mode 100644
index 0000000..da7b0e0
--- /dev/null
+++ b/blueprints/.tca.yaml-template.swp
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/"
 }