using latest 2.3.0 dcaepolicyplugin data types

- discovering consul at consul:8500 instead of localhost:8500

Change-Id: Iaae3378084b9db7355623efd8dbcc2ab0ad2b7dd
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-438

3 files changed, 44 insertions, 46 deletions

diff --git a/blueprints/k8s-holmes-engine.yaml-template b/blueprints/k8s-holmes-engine.yaml-template
index 80ed9da..4817411 100644
--- a/blueprints/k8s-holmes-engine.yaml-template
+++ b/blueprints/k8s-holmes-engine.yaml-template
@@ -1,16 +1,15 @@
 # -*- indent-tabs-mode: nil -*- # vi: set expandtab:
 #
 # ============LICENSE_START====================================================
-# org.onap.dcae
 # =============================================================================
 # 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.
@@ -21,7 +20,7 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
 - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.0.1/k8splugin_types.yaml"
-- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.2.1/dcaepolicyplugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml"
 - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml"
 inputs:
   dcae_CL_publish_url:
@@ -32,7 +31,7 @@ inputs:
     default: "http://10.0.11.1:3904/events/unauthenticated.SEC_FAULT_OUTPUT"
   msb_hostname:
     type: string
-    default: ""  
+    default: ""
   pgaas_cluster_name:
     type: string
     # use the single-VM PG instance
@@ -42,7 +41,7 @@ inputs:
     default: holmes
   he_image:
     type: string
-    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/holmes/engine-management:v1.0.0"    
+    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/holmes/engine-management:v1.0.0"
 
 node_templates:
   pgaasvm:
@@ -50,7 +49,7 @@ node_templates:
     properties:
       writerfqdn: { concat: [ { get_input: pgaas_cluster_name }, '-write.' ] }
       name: { get_input: database_name }
-      use_existing: true      
+      use_existing: true
 
   holmesengine:
     type:  dcae.nodes.ContainerizedServiceComponentUsingDmaap
@@ -66,20 +65,20 @@ node_templates:
             JDBC_USERNAME:
                 { get_attribute: [ pgaasvm, admin, user ] }
             MSB_ADDR:
-                get_input: msb_hostname    
+                get_input: msb_hostname
     properties:
       application_config:
-        msb.hostname: 
+        msb.hostname:
          get_input: msb_hostname
         msb.uri: /api/microservices/v1/services
         services_calls: {}
         streams_publishes:
           dcae_cl_out:
-            dmaap_info: 
+            dmaap_info:
              topic_url:
                   get_input: dcae_CL_publish_url
             type: message_router
-        streams_subscribes: 
+        streams_subscribes:
           ves_fault:
             dmaap_info:
              topic_url:
diff --git a/blueprints/k8s-holmes-rules.yaml-template b/blueprints/k8s-holmes-rules.yaml-template
index 5be6d91..ccf4913 100644
--- a/blueprints/k8s-holmes-rules.yaml-template
+++ b/blueprints/k8s-holmes-rules.yaml-template
@@ -1,16 +1,15 @@
 # -*- indent-tabs-mode: nil -*- # vi: set expandtab:
 #
 # ============LICENSE_START====================================================
-# org.onap.dcae
 # =============================================================================
 # 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.
@@ -21,7 +20,7 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
 - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.0.1/k8splugin_types.yaml"
-- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.2.1/dcaepolicyplugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml"
 - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml"
 inputs:
   msb_hostname:
@@ -36,7 +35,7 @@ inputs:
     default: holmes
   hr_image:
     type: string
-    default: ""{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/holmes/rule-management:v1.0.0"    
+    default: ""{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/holmes/rule-management:v1.0.0"
 node_templates:
   pgaasvm:
     type: dcae.nodes.pgaas.database
@@ -61,8 +60,8 @@ node_templates:
     properties:
       application_config:
         holmes.default.rule.volte.scenario1: "ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b$$$package org.onap.holmes.droolsRule;\n\nimport org.onap.holmes.common.dmaap.DmaapService;\nimport org.onap.holmes.common.api.stat.VesAlarm;\nimport org.onap.holmes.common.aai.CorrelationUtil;\nimport org.onap.holmes.common.dmaap.entity.PolicyMsg;\nimport org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;\nimport org.onap.holmes.common.utils.DroolsLog;\n \n\nrule \"Relation_analysis_Rule\"\nsalience 200\nno-loop true\n    when\n        $root : VesAlarm(alarmIsCleared == 0,\n            $sourceId: sourceId, sourceId != null && !sourceId.equals(\"\"),\n\t\t\t$sourceName: sourceName, sourceName != null && !sourceName.equals(\"\"),\n\t\t\t$startEpochMicrosec: startEpochMicrosec,\n            eventName in (\"Fault_MultiCloud_VMFailure\"),\n            $eventId: eventId)\n        $child : VesAlarm( eventId != $eventId, parentId == null,\n            CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId, $sourceName),\n            eventName in (\"Fault_MME_eNodeB out of service alarm\"),\n            startEpochMicrosec < $startEpochMicrosec + 60000 && startEpochMicrosec > $startEpochMicrosec - 60000 )\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"Relation_analysis_Rule: rootId=\" + $root.getEventId() + \", childId=\" + $child.getEventId());\n\t\t$child.setParentId($root.getEventId());\n\t\tupdate($child);\n\t\t\nend\n\nrule \"root_has_child_handle_Rule\"\nsalience 150\nno-loop true\n\twhen\n\t\t$root : VesAlarm(alarmIsCleared == 0, rootFlag == 0, $eventId: eventId)\n\t\t$child : VesAlarm(eventId != $eventId, parentId == $eventId)\n\tthen\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"root_has_child_handle_Rule: rootId=\" + $root.getEventId() + \", childId=\" + $child.getEventId());\n\t\tDmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\n\t\tPolicyMsg policyMsg = dmaapService.getPolicyMsg($root, $child, \"org.onap.holmes.droolsRule\");\n        dmaapService.publishPolicyMsg(policyMsg, \"unauthenticated.DCAE_CL_OUTPUT\");\n\t\t$root.setRootFlag(1);\n\t\tupdate($root);\nend\n\nrule \"root_no_child_handle_Rule\"\nsalience 100\nno-loop true\n    when\n        $root : VesAlarm(alarmIsCleared == 0, rootFlag == 0,\n            sourceId != null && !sourceId.equals(\"\"),\n\t\t\tsourceName != null && !sourceName.equals(\"\"),\n            eventName in (\"Fault_MultiCloud_VMFailure\"))\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"root_no_child_handle_Rule: rootId=\" + $root.getEventId());\n\t\tDmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\n\t\tPolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, \"org.onap.holmes.droolsRule\");\n        dmaapService.publishPolicyMsg(policyMsg, \"unauthenticated.DCAE_CL_OUTPUT\");\n\t\t$root.setRootFlag(1);\n\t\tupdate($root);\nend\n\nrule \"root_cleared_handle_Rule\"\nsalience 100\nno-loop true\n    when\n        $root : VesAlarm(alarmIsCleared == 1, rootFlag == 1)\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"root_cleared_handle_Rule: rootId=\" + $root.getEventId());\n\t\tDmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\n\t\tPolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, \"org.onap.holmes.droolsRule\");\n        dmaapService.publishPolicyMsg(policyMsg, \"unauthenticated.DCAE_CL_OUTPUT\");\n\t\tretract($root);\nend\n\nrule \"child_handle_Rule\"\nsalience 100\nno-loop true\n    when\n        $child : VesAlarm(alarmIsCleared == 1, rootFlag == 0)\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"child_handle_Rule: childId=\" + $child.getEventId());\n\t\tretract($child);\nend"
-        msb.hostname: 
-         get_input: msb_hostname                
+        msb.hostname:
+         get_input: msb_hostname
         msb.uri: /api/microservices/v1/services
         services_calls: {}
         streams_publishes: {}
@@ -79,4 +78,4 @@ node_templates:
       service_component_type: dcae-analytics-holmes-rule-management
     relationships:
     - type: cloudify.relationships.depends_on
-      target: pgaasvm     
+      target: pgaasvm
diff --git a/blueprints/k8s-tca.yaml-template b/blueprints/k8s-tca.yaml-template
index a6654ce..d345acf 100644
--- a/blueprints/k8s-tca.yaml-template
+++ b/blueprints/k8s-tca.yaml-template
@@ -23,28 +23,28 @@ description: >
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.0.1/k8splugin_types.yaml 
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.2.1/dcaepolicyplugin_types.yaml  
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.0.1/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
 inputs:
   aaiEnrichmentHost:
     type: string
     default: "none"
   aaiEnrichmentPort:
-    type: string    
+    type: string
     default: 8443
   enableAAIEnrichment:
     type: string
     default: false
   dmaap_host:
     type: string
-    default: dmaap.onap-message-router   
+    default: dmaap.onap-message-router
   dmaap_port:
     type: string
-    default: 3904    
+    default: 3904
   enableRedisCaching:
     type: string
   redisHosts:
-    type: string      
+    type: string
   tag_version:
     type: string
     default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.0.0"
@@ -67,10 +67,10 @@ inputs:
     type: string
     description: Kubernetes node port on which CDAPgui is exposed
     default: "32010"
-    
+
 node_templates:
   tca_k8s:
-    type: dcae.nodes.ContainerizedServiceComponent    
+    type: dcae.nodes.ContainerizedServiceComponent
     relationships:
       - target: tca_policy
         type: cloudify.relationships.depends_on
@@ -78,7 +78,7 @@ node_templates:
         service_component_type: 'dcaegen2-analytics-tca'
         application_config: {}
         docker_config: {}
-        image: 
+        image:
           get_input: tag_version
         log_info:
           log_directory: "/opt/app/TCAnalytics/logs"
@@ -95,7 +95,7 @@ node_templates:
                 tcaVESMessageStatusTableTTLSeconds: '86400'
                 thresholdCalculatorFlowletInstances: '2'
             app_preferences:
-                aaiEnrichmentHost: 
+                aaiEnrichmentHost:
                     get_input: aaiEnrichmentHost
                 aaiEnrichmentIgnoreSSLCertificateErrors: 'true'
                 aaiEnrichmentPortNumber: '8443'
@@ -104,18 +104,18 @@ node_templates:
                 aaiEnrichmentUserPassword: DCAE
                 aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query
                 aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf
-                enableAAIEnrichment: 
+                enableAAIEnrichment:
                     get_input: enableAAIEnrichment
-                enableRedisCaching: 
+                enableRedisCaching:
                     get_input: enableRedisCaching
-                redisHosts: 
+                redisHosts:
                     get_input: redisHosts
                 enableAlertCEFFormat: 'false'
                 publisherContentType: application/json
-                publisherHostName: 
+                publisherHostName:
                     get_input: dmaap_host
-                publisherHostPort: 
-                    get_input: dmaap_port                  
+                publisherHostPort:
+                    get_input: dmaap_port
                 publisherMaxBatchSize: '1'
                 publisherMaxRecoveryQueueSize: '100000'
                 publisherPollingInterval: '20000'
@@ -124,10 +124,10 @@ node_templates:
                 subscriberConsumerGroup: OpenDCAE-c12
                 subscriberConsumerId: c12
                 subscriberContentType: application/json
-                subscriberHostName: 
+                subscriberHostName:
                     get_input: dmaap_host
                 subscriberHostPort:
-                    get_input: dmaap_port                                  
+                    get_input: dmaap_port
                 subscriberMessageLimit: '-1'
                 subscriberPollingInterval: '30000'
                 subscriberProtocol: http
@@ -140,27 +140,27 @@ node_templates:
         start:
           inputs:
             envs:
-                DMAAPHOST: 
+                DMAAPHOST:
                     { get_input: dmaap_host }
                 DMAAPPORT:
                     { get_input: dmaap_port }
                 DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
                 DMAAPSUBTOPIC: "unauthenticated.SEC_MEASUREMENT_OUTPUT"
-                AAIHOST: 
+                AAIHOST:
                     { get_input: aaiEnrichmentHost }
-                AAIPORT: 
+                AAIPORT:
                     { get_input: aaiEnrichmentPort }
-                CONSUL_HOST: 
+                CONSUL_HOST:
                     { get_input: consul_host }
-                CONSUL_PORT: 
+                CONSUL_PORT:
                     { get_input: consul_port }
-                CBS_HOST: 
+                CBS_HOST:
                     { get_input: cbs_host }
-                CBS_PORT: 
+                CBS_PORT:
                     { get_input: cbs_port }
-                CONFIG_BINDING_SERVICE: "config_binding_service"                
+                CONFIG_BINDING_SERVICE: "config_binding_service"
             ports:
-              - concat: ["11011:", { get_input: external_port }]                           
+              - concat: ["11011:", { get_input: external_port }]
   tca_policy:
     type: dcae.nodes.policy
     properties: