Merge "updated k8s bp"

2 files changed, 27 insertions, 8 deletions

diff --git a/blueprints/k8s-tca.yaml-template b/blueprints/k8s-tca.yaml-template
index 5d36312..7460324 100644
--- a/blueprints/k8s-tca.yaml-template
+++ b/blueprints/k8s-tca.yaml-template
@@ -35,6 +35,9 @@ inputs:
   dmaap_host:
     type: string
     default: dmaap.onap-message-router      
+  dmaap_port:
+    type: string
+    default: 3904
   enableRedisCaching:
     type: string
   redisHosts:
@@ -57,6 +60,10 @@ inputs:
   policy_id:
     type: string
     default: "none"
+  external_port:
+    type: string
+    description: Kubernetes node port on which CDAPgui is exposed
+    default: "32010"
 
 node_templates:
   tca_k8s:
@@ -65,13 +72,13 @@ node_templates:
       - target: tca_policy
         type: cloudify.relationships.depends_on
     properties:
-        service_component_type: 'tca'
+        service_component_type: 'dcaegen2-analytics-tca'
         application_config: {}
         docker_config: {}
         image: 
           get_input: tag_version
         log_info:
-          log_directory: "/opt/app/TCAAnalytics/logs"
+          log_directory: "/opt/app/TCAnalytics/logs"
         application_config:
             app_config:
                 appDescription: DCAE Analytics Threshold Crossing Alert Application
@@ -104,7 +111,8 @@ node_templates:
                 publisherContentType: application/json
                 publisherHostName: 
                     get_input: dmaap_host
-                publisherHostPort: '3904'
+                publisherHostPort: 
+                    get_input: dmaap_port                  
                 publisherMaxBatchSize: '1'
                 publisherMaxRecoveryQueueSize: '100000'
                 publisherPollingInterval: '20000'
@@ -115,13 +123,14 @@ node_templates:
                 subscriberContentType: application/json
                 subscriberHostName: 
                     get_input: dmaap_host
-                subscriberHostPort: '3904'
+                subscriberHostPort:
+                    get_input: dmaap_port                                  
                 subscriberMessageLimit: '-1'
                 subscriberPollingInterval: '30000'
                 subscriberProtocol: http
                 subscriberTimeoutMS: '-1'
                 subscriberTopicName: unauthenticated.SEC_MEASUREMENT_OUTPUT
-                tca_policy_property: '{"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"}]}]}'
+                tca_policy_default: '{"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"}]}]}'
         service_component_type: dcaegen2-analytics_tca
     interfaces:
       cloudify.interfaces.lifecycle:
@@ -133,10 +142,9 @@ node_templates:
               CONSUL_PORT: { get_input: consul_port }
               CBS_HOST: { get_input: cbs_host }
               CBS_PORT: { get_input: cbs_port }
-              SERVICE_NAME: "tca"
               CONFIG_BINDING_SERVICE: "config_binding_service"
             ports:
-              - "11011:0"
+              - concat: ["11011:", { get_input: external_port }]                           
   tca_policy:
     type: dcae.nodes.policy
     properties:
diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template
index 021e21e..f30cd69 100644
--- a/blueprints/k8s-ves.yaml-template
+++ b/blueprints/k8s-ves.yaml-template
@@ -43,7 +43,7 @@ inputs:
   external_port:
     type: string
     description: Kubernetes node port on which collector is exposed
-    default: "0"
+    default: "32001"
 node_templates:
   ves:
     interfaces:
@@ -78,6 +78,16 @@ node_templates:
                 topic_url:
                   get_input: ves_measurement_publish_url
               type: message_router
+            ves_heartbeat:
+              dmaap_info:
+                topic_url:
+                  get_input: ves_heartbeat_publish_url
+              type: message_router
+            ves_other:
+              dmaap_info:
+                topic_url:
+                  get_input: ves_other_publish_url
+              type: message_router              
         tomcat.maxthreads: "200"
       docker_config:
         healthcheck:
@@ -91,3 +101,4 @@ node_templates:
       log_info:
         log_directory: "/opt/app/VESCollector/logs/ecomp"
     type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
+