commit 3622f7a20e615d409dd5a8dea3ae592115df91ae
author Lusheng Ji <lji@research.att.com> Wed Apr 04 21:51:34 2018 -0400
committer Lusheng Ji <lji@research.att.com> Thu Apr 05 02:41:25 2018 +0000
tree 1ebd8cce7be5c3013c26139aed1eceec22080349
parent 6fabd804de890bc5069d2518fffb11b83ea5961a

Fix TCA image

Issue-ID: DCAEGEN2-206
Change-Id: I8fa5150bffc0e371ab09bd75f1df4e460bf85a72
Signed-off-by: Lusheng Ji <lji@research.att.com>

tca-cdap-container/tca_app_preferences.json

diff --git a/tca-cdap-container/tca_app_preferences.json b/tca-cdap-container/tca_app_preferences.json
index 4ca1a44..76fa8c2 100644
--- a/tca-cdap-container/tca_app_preferences.json
+++ b/tca-cdap-container/tca_app_preferences.json
@@ -1,7 +1,7 @@
 {
-  "aaiEnrichmentHost": "10.0.1.1",
+  "aaiEnrichmentHost": "{{AAIHOST}}",
   "aaiEnrichmentIgnoreSSLCertificateErrors": "true",
-  "aaiEnrichmentPortNumber": "8443",
+  "aaiEnrichmentPortNumber": "{{AAIPORT}}",
   "aaiEnrichmentProtocol": "https",
   "aaiEnrichmentUserName": "DCAE",
   "aaiEnrichmentUserPassword": "DCAE",
@@ -9,25 +9,25 @@
   "aaiVNFEnrichmentAPIPath": "/aai/v11/network/generic-vnfs/generic-vnf",
   "enableAAIEnrichment": "false",
   "enableAlertCEFFormat": "false",
-  "enableRedisCaching": "false",
-  "redisHosts": "redis-cluster:6379",
+  "enableRedisCaching": "{{REDISCACHING}}",
+  "redisHosts": "{{REDISHOSTPORT}}",
   "publisherContentType": "application/json",
-  "publisherHostName": "dmaap.onap-message-router",
-  "publisherHostPort": "3904",
+  "publisherHostName": "{{DMAAPHOST}}",
+  "publisherHostPort": "{{DMAAPPORT}}",
   "publisherMaxBatchSize": "1",
   "publisherMaxRecoveryQueueSize": "100000",
   "publisherPollingInterval": "20000",
   "publisherProtocol": "http",
-  "publisherTopicName": "unauthenticated.TCA_EVENT_OUTPUT",
-  "subscriberConsumerGroup": "OpenDCAE-c12",
-  "subscriberConsumerId": "c12",
+  "publisherTopicName": "{{DMAAPPUBTOPIC}}",
+  "subscriberConsumerGroup": "{{DMAAPSUBGROUP}}",
+  "subscriberConsumerId": "{{DMAAPSUBID}}",
   "subscriberContentType": "application/json",
-  "subscriberHostName": "dmaap.onap-message-router",
-  "subscriberHostPort": "3904",
+  "subscriberHostName": "{{DMAAPHOST}}",
+  "subscriberHostPort": "{{DMAAPPORT}}",
   "subscriberMessageLimit": "-1",
   "subscriberPollingInterval": "30000",
   "subscriberProtocol": "http",
   "subscriberTimeoutMS": "-1",
-  "subscriberTopicName": "unauthenticated.SEC_MEASUREMENT_OUTPUT",
+  "subscriberTopicName": "{{DMAAPSUBTOPIC}}",
   "tca_policy": "{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}"
 }