15 files changed, 261 insertions, 4 deletions

diff --git a/input-templates/cdap-sdk-inputs.yaml b/input-templates/cdap-sdk-inputs.yaml
new file mode 100644
index 0000000..e55c796
--- /dev/null
+++ b/input-templates/cdap-sdk-inputs.yaml
@@ -0,0 +1,22 @@
+# ================================================================================
+# Copyright (c) 2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+{
+  "dh_location_id": "{{ dcae_zone }}",
+  "dh_override": "component_dockerhost",
+  "cdap_cluster_name": "cdap"
+}
diff --git a/input-templates/cdapinputs.yaml b/input-templates/cdapinputs.yaml
index 496a922..879b59c 100644
--- a/input-templates/cdapinputs.yaml
+++ b/input-templates/cdapinputs.yaml
@@ -1,3 +1,20 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ubuntu1604image_id: '{{ ubuntu_1604_image }}'
 centos7image_id: '{{ centos_7_image }}'
 flavor_id: '{{ flavor_id_cdap }}'
diff --git a/input-templates/dhinputs.yaml b/input-templates/dhinputs.yaml
index ad51a25..9014ac6 100644
--- a/input-templates/dhinputs.yaml
+++ b/input-templates/dhinputs.yaml
@@ -1,3 +1,20 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 application_config:
   cloudify:
     protocol: "http"
diff --git a/input-templates/he-ip.yaml b/input-templates/he-ip.yaml
index 509b0ee..284aa2d 100644
--- a/input-templates/he-ip.yaml
+++ b/input-templates/he-ip.yaml
@@ -1,3 +1,20 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 {
   "dh_location_id": "{{ dcae_zone }}",
   "docker_host_override": "component_dockerhost",
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/hr-ip.yaml b/input-templates/hr-ip.yaml
index f3ca7bc..10c65e0 100644
--- a/input-templates/hr-ip.yaml
+++ b/input-templates/hr-ip.yaml
@@ -1,3 +1,20 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 {
   "dh_location_id": "{{ dcae_zone }}",
   "docker_host_override": "component_dockerhost",
diff --git a/input-templates/inputs.yaml b/input-templates/inputs.yaml
index f6cb432..b87a760 100644
--- a/input-templates/inputs.yaml
+++ b/input-templates/inputs.yaml
@@ -1,3 +1,20 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ubuntu1604image_id: '{{ ubuntu_1604_image }}'
 centos7image_id: '{{ centos_7_image }}'
 flavor_id: '{{ flavor_id }}'
diff --git a/input-templates/invinputs.yaml b/input-templates/invinputs.yaml
index 260b3a2..9701b9b 100644
--- a/input-templates/invinputs.yaml
+++ b/input-templates/invinputs.yaml
@@ -1,3 +1,20 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 docker_host_override: "platform_dockerhost"
 asdc_address: '{{ sdc_ip_addr }}:8443'
 asdc_uri: 'https://{{ sdc_ip_addr }}:8443'
diff --git a/input-templates/phinputs.yaml b/input-templates/phinputs.yaml
index 07ba828..d79511d 100644
--- a/input-templates/phinputs.yaml
+++ b/input-templates/phinputs.yaml
@@ -1,3 +1,21 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
 application_config:
   policy_handler :
     # parallelize the getConfig queries to policy-engine on each policy-update notification
@@ -7,12 +25,27 @@ application_config:
     pool_connections : 20
 
     # list of policyName prefixes (filters) that DCAE-Controller handles (=ignores any other policyName values)
-    scope_prefixes : ["DCAE.Config_"]
+    scope_prefixes : ["DCAE.Config_", "CLAMP"]
 
     # retry to getConfig from policy-engine on policy-update notification
     policy_retry_count : 5
     policy_retry_sleep : 5
 
+    # config of automatic catch_up for resiliency
+    catch_up :
+        # interval in seconds on how often to call automatic catch_up
+        # example: 1200 is 20*60 seconds that is 20 minutes
+        interval : 1200
+        # max_skips is the maximal number of times the auto catch_up can be skipped
+        # to reduce sending of identically the same messages to the deployment-handler
+        # example: if nothing changes in policy-engine
+        #          the policy-handler will still send the identicall cathc_up message
+        #          to deployment handler roughly every (max_skips + 1) * interval seconds
+        #          instead of sending the changed message every interval seconds
+        # in this case of max_skips = 5 the catch_up message will be sent
+        #          roughly every 2 hours = (5+1) * 1200 = 6 * 20 * 60 seconds = 2 * 60 * 60
+        max_skips : 5
+
     # policy-engine config
     # These are the url of and the auth for the external system, namely the policy-engine (PDP).
     # We obtain that info manually from PDP folks at the moment.
@@ -29,5 +62,11 @@ application_config:
             Authorization : "Basic dGVzdHBkcDphbHBoYTEyMw=="
             Environment : "TEST"
         target_entity : "policy_engine"
-    # name of deployment-handler service in consul for policy-handler to direct the policy-updates to
-    deploy_handler : "deployment_handler"
+    # deploy_handler config
+    #    changed from string "deployment_handler" in 2.3.1 to structure in 2.4.0
+    deploy_handler :
+        # name of deployment-handler service used by policy-handler for logging
+        target_entity : "deployment_handler"
+        # url of the deployment-handler service for policy-handler to direct the policy-updates to
+        #   - expecting dns to resolve the hostname deployment-handler to ip address
+        url : "http://deployment-handler:8188"
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/prh-input.yaml b/input-templates/prh-input.yaml
new file mode 100644
index 0000000..6b54630
--- /dev/null
+++ b/input-templates/prh-input.yaml
@@ -0,0 +1,26 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+
+#aaiEnrichmentHost: '{{ aaiEnrichmentHost }}'
+#aaiEnrichmentPort: '{{ aaiEnrichmentPort }}'
+#aaiEnrichmentUser: '{{ aaiEnrichmentUser }}'
+#aaiEnrichmentPasswd: '{{ aaiEnrichmentPasswd }}'
+#dmaap_host: '{{ dmaap_host }}'
+#dmaap_port: '{{ dmaap_port }}'
+#dmaap_user: '{{ dmaap_user }}'
+#dmaap_passwd: '{{ dmaap_passwd }}'
+#tag_version: '{{ tag_version }}'
+#replicas: '{{ replicas }}'
\ No newline at end of file
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/tcainputs.yaml b/input-templates/tcainputs.yaml
index ecd6407..a4d3828 100644
--- a/input-templates/tcainputs.yaml
+++ b/input-templates/tcainputs.yaml
@@ -1,4 +1,21 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 aaiEnrichmentHost: '{{ aai1_ip_addr }}'
 enableAAIEnrichment: true
 subscriberHostName: '{{ mr_ip_addr }}'
-publisherHostName: '{{ mr_ip_addr }}'
\ No newline at end of file
+publisherHostName: '{{ mr_ip_addr }}'
diff --git a/input-templates/vesinput.yaml b/input-templates/vesinput.yaml
index cb5c542..d11e630 100644
--- a/input-templates/vesinput.yaml
+++ b/input-templates/vesinput.yaml
@@ -1,6 +1,25 @@
+# ================================================================================
+# Copyright (c) 2017-2018 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.
+# 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.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 {
   "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/"
 }