Merge "Fix model_type missing"

9 files changed, 320 insertions, 211 deletions

diff --git a/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java
index 36d4eb829..e1b963cc4 100644
--- a/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java
@@ -179,10 +179,9 @@ public class CsarInstallerItCase {
             ResourceFileUtil.getResourceAsStream("example/sdc/blueprint-dcae/prop-text-for-tca-2.json"),
             StandardCharsets.UTF_8), cldsModel2.getPropText(), true);
         CldsModel cldsModel3 = verifyClosedLoopModelLoadedInDb(csar, "tca_3.yaml");
-        JSONAssert.assertEquals(
-            IOUtils.toString(ResourceFileUtil.getResourceAsStream("example/sdc/blueprint-dcae/prop-text-for-tca.json"),
-                StandardCharsets.UTF_8),
-            cldsModel3.getPropText(), true);
+        JSONAssert.assertEquals(IOUtils.toString(
+            ResourceFileUtil.getResourceAsStream("example/sdc/blueprint-dcae/prop-text-for-tca-3.json"),
+            StandardCharsets.UTF_8), cldsModel3.getPropText(), true);
     }
 
     private CldsModel verifyClosedLoopModelLoadedInDb(CsarHandler csar, String artifactName)
diff --git a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
index 211bb3906..7a1f9f0ac 100644
--- a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
+++ b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
@@ -142,18 +142,18 @@ public class BlueprintParserTest {
     public void getNodeRepresentationFromCompleteYaml() {
         final JsonObject jsonObject = jsonObjectBlueprintValid;
 
-        MicroService expected = new MicroService(SECOND_APPP, MODEL_TYPE1, FIRST_APPP, "", SECOND_APPP);
+        MicroService expected = new MicroService(SECOND_APPP, MODEL_TYPE1, FIRST_APPP, "");
         Entry<String, JsonElement> entry = jsonObject.entrySet().iterator().next();
-        MicroService actual = new BlueprintParser().getNodeRepresentation(entry);
+        MicroService actual = new BlueprintParser().getNodeRepresentation(entry, jsonObject);
 
         Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void getMicroServicesFromBlueprintTest() {
-        MicroService thirdApp = new MicroService(THIRD_APPP, MODEL_TYPE3, "", "", THIRD_APPP);
-        MicroService firstApp = new MicroService(FIRST_APPP, MODEL_TYPE1, THIRD_APPP, "", FIRST_APPP);
-        MicroService secondApp = new MicroService(SECOND_APPP, MODEL_TYPE2, FIRST_APPP, "", SECOND_APPP);
+        MicroService thirdApp = new MicroService(THIRD_APPP, MODEL_TYPE3, "", "");
+        MicroService firstApp = new MicroService(FIRST_APPP, MODEL_TYPE1, THIRD_APPP, "");
+        MicroService secondApp = new MicroService(SECOND_APPP, MODEL_TYPE2, FIRST_APPP, "");
 
         Set<MicroService> expected = new HashSet<>(Arrays.asList(firstApp, secondApp, thirdApp));
         Set<MicroService> actual = new BlueprintParser().getMicroServices(microServiceTheWholeBlueprintValid);
@@ -164,7 +164,7 @@ public class BlueprintParserTest {
     @Test
     public void fallBackToOneMicroServiceTCATest() {
         MicroService tcaMS = new MicroService(BlueprintParser.TCA, "onap.policies.monitoring.cdap.tca.hi.lo.app", "",
-            "", "");
+            "");
 
         List<MicroService> expected = Collections.singletonList(tcaMS);
         List<MicroService> actual = new BlueprintParser().fallbackToOneMicroService(microServiceBlueprintOldStyleTCA);
@@ -175,7 +175,7 @@ public class BlueprintParserTest {
     @Test
     public void fallBackToOneMicroServiceHolmesTest() {
         MicroService holmesMS = new MicroService(BlueprintParser.HOLMES, "onap.policies.monitoring.cdap.tca.hi.lo.app",
-            "", "", "");
+            "", "");
 
         List<MicroService> expected = Collections.singletonList(holmesMS);
         List<MicroService> actual = new BlueprintParser()
diff --git a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
index 1eb66eadd..4b41ee818 100644
--- a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
+++ b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
@@ -38,10 +38,10 @@ public class ChainGeneratorTest {
 
     @Test
     public void getChainOfMicroServicesTest() {
-        MicroService ms1 = new MicroService(FIRST_APPP, "", "", "", "");
-        MicroService ms2 = new MicroService(SECOND_APPP, "", FIRST_APPP, "", "");
-        MicroService ms3 = new MicroService(THIRD_APPP, "", SECOND_APPP, "", "");
-        MicroService ms4 = new MicroService(FOURTH_APPP, "", THIRD_APPP, "", "");
+        MicroService ms1 = new MicroService(FIRST_APPP, "", "", "");
+        MicroService ms2 = new MicroService(SECOND_APPP, "", FIRST_APPP, "");
+        MicroService ms3 = new MicroService(THIRD_APPP, "", SECOND_APPP, "");
+        MicroService ms4 = new MicroService(FOURTH_APPP, "", THIRD_APPP, "");
 
         List<MicroService> expectedList = Arrays.asList(ms1, ms2, ms3, ms4);
         Set<MicroService> inputSet = new HashSet<>(expectedList);
@@ -52,10 +52,10 @@ public class ChainGeneratorTest {
 
     @Test
     public void getChainOfMicroServicesTwiceNoInputTest() {
-        MicroService ms1 = new MicroService(FIRST_APPP, "", "", "", "");
-        MicroService ms2 = new MicroService(SECOND_APPP, "", "", "", "");
-        MicroService ms3 = new MicroService(THIRD_APPP, "", SECOND_APPP, "", "");
-        MicroService ms4 = new MicroService(FOURTH_APPP, "", FIRST_APPP, "", "");
+        MicroService ms1 = new MicroService(FIRST_APPP, "", "", "");
+        MicroService ms2 = new MicroService(SECOND_APPP, "", "", "");
+        MicroService ms3 = new MicroService(THIRD_APPP, "", SECOND_APPP, "");
+        MicroService ms4 = new MicroService(FOURTH_APPP, "", FIRST_APPP, "");
 
         Set<MicroService> inputSet = new HashSet<>(Arrays.asList(ms1, ms2, ms3, ms4));
         List<MicroService> actualList = new ChainGenerator().getChainOfMicroServices(inputSet);
@@ -64,10 +64,10 @@ public class ChainGeneratorTest {
 
     @Test
     public void getChainOfMicroServicesBranchingTest() {
-        MicroService ms1 = new MicroService(FIRST_APPP, "", "", "", "");
-        MicroService ms2 = new MicroService(SECOND_APPP, "", FIRST_APPP, "", "");
-        MicroService ms3 = new MicroService(THIRD_APPP, "", FIRST_APPP, "", "");
-        MicroService ms4 = new MicroService(FOURTH_APPP, "", FIRST_APPP, "", "");
+        MicroService ms1 = new MicroService(FIRST_APPP, "", "", "");
+        MicroService ms2 = new MicroService(SECOND_APPP, "", FIRST_APPP, "");
+        MicroService ms3 = new MicroService(THIRD_APPP, "", FIRST_APPP, "");
+        MicroService ms4 = new MicroService(FOURTH_APPP, "", FIRST_APPP, "");
 
         Set<MicroService> inputSet = new HashSet<>(Arrays.asList(ms1, ms2, ms3, ms4));
         List<MicroService> actualList = new ChainGenerator().getChainOfMicroServices(inputSet);
diff --git a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java b/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
index 5eb664fe7..ff6e1b5d4 100644
--- a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
+++ b/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
@@ -56,8 +56,8 @@ public class ClampGraphBuilderTest {
     @Test
     public void clampGraphBuilderCompleteChainTest() {
         String collector = "VES";
-        MicroService ms1 = new MicroService("ms1", "", "", "ms1_jpa_id", "");
-        MicroService ms2 = new MicroService("ms2", "", "", "ms2_jpa_id", "");
+        MicroService ms1 = new MicroService("ms1", "", "", "ms1_jpa_id");
+        MicroService ms2 = new MicroService("ms2", "", "", "ms2_jpa_id");
 
         String policy = "OperationalPolicy";
         List<MicroService> microServices = Arrays.asList(ms1, ms2);
@@ -76,8 +76,8 @@ public class ClampGraphBuilderTest {
     @Test(expected = InvalidStateException.class)
     public void clampGraphBuilderNoPolicyGivenTest() {
         String collector = "VES";
-        MicroService ms1 = new MicroService("ms1", "", "", "ms1_jpa_id", "");
-        MicroService ms2 = new MicroService("ms2", "", "", "ms2_jpa_id", "");
+        MicroService ms1 = new MicroService("ms1", "", "", "ms1_jpa_id");
+        MicroService ms2 = new MicroService("ms2", "", "", "ms2_jpa_id");
 
         ClampGraphBuilder clampGraphBuilder = new ClampGraphBuilder(mockPainter);
         clampGraphBuilder.collector(collector).addMicroService(ms1).addMicroService(ms2).build();
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
index 3bf85009a..cd6db68db 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
@@ -51,6 +51,7 @@ import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
 import org.onap.clamp.clds.sdc.controller.installer.CsarInstaller;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.sdc.api.notification.IArtifactInfo;
 import org.onap.sdc.api.notification.INotificationData;
 import org.onap.sdc.api.notification.IResourceInstance;
@@ -206,6 +207,17 @@ public class CsarInstallerItCase {
         assertThat(loop.getModelPropertiesJson().get("resourceDetails")).isNotNull();
         JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/model-properties.json"),
             JsonUtils.GSON.toJson(loop.getModelPropertiesJson()), true);
+        assertThat(((MicroServicePolicy) (loop.getMicroServicePolicies().toArray()[0])).getModelType()).isNotEmpty();
+
+        loop = loopsRepo
+            .findById(Loop.generateLoopName(generatedName, "1.0", RESOURCE_INSTANCE_NAME_RESOURCE1, "tca_3.yaml"))
+            .get();
+        assertThat(((MicroServicePolicy) (loop.getMicroServicePolicies().toArray()[0])).getModelType()).isNotEmpty();
+
+        loop = loopsRepo
+            .findById(Loop.generateLoopName(generatedName, "1.0", RESOURCE_INSTANCE_NAME_RESOURCE2, "tca_2.yaml"))
+            .get();
+        assertThat(((MicroServicePolicy) (loop.getMicroServicePolicies().toArray()[0])).getModelType()).isNotEmpty();
     }
 
 }
diff --git a/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-2.json b/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-2.json
index 41ca2de22..d7a54162f 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-2.json
+++ b/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-2.json
@@ -27,23 +27,22 @@
 		{
 			"name": "deployParameters",
 			"value": {
-				"dh_override": "component_dockerhost",
-				"dh_location_id": "zone1",
-				"aaiEnrichmentHost": "none",
-				"aaiEnrichmentPort": 8443,
-				"enableAAIEnrichment": false,
-				"dmaap_host": "dmaap.onap-message-router",
-				"dmaap_port": 3904,
+				"aaiEnrichmentHost": "aai.onap.svc.cluster.local",
+				"aaiEnrichmentPort": "8443",
+				"enableAAIEnrichment": true,
+				"dmaap_host": "message-router.onap",
+				"dmaap_port": "3904",
 				"enableRedisCaching": false,
-				"redisHosts": "",
-				"tag_version": "nexus3.onap.org:10001/onap//onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.0.0",
-				"consul_host": "consul-server.onap-consul",
+				"redisHosts": "dcae-redis.onap.svc.cluster.local:6379",
+				"tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1",
+				"consul_host": "consul-server.onap",
 				"consul_port": "8500",
-				"cbs_host": "config-binding-service.dcae",
+				"cbs_host": "config-binding-servicel",
 				"cbs_port": "10000",
-				"external_port": "32010",
+				"external_port": "32012",
+				"policy_model_id": "onap.policies.monitoring.cdap.tca.hi.lo.app",
 				"policy_id": "AUTO_GENERATED_POLICY_ID_AT_SUBMIT"
 			}
 		}
 	]
-}
+}
\ No newline at end of file
diff --git a/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-3.json b/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-3.json
new file mode 100644
index 000000000..f8f531654
--- /dev/null
+++ b/src/test/resources/example/sdc/blueprint-dcae/prop-text-for-tca-3.json
@@ -0,0 +1,47 @@
+{
+	"global": [
+		{
+			"name": "service",
+			"value": [
+				"4cc5b45a-1f63-4194-8100-cd8e14248c92"
+			]
+		},
+		{
+			"name": "vf",
+			"value": [
+				"07e266fc-49ab-4cd7-8378-ca4676f1b9ec"
+			]
+		},
+		{
+			"name": "actionSet",
+			"value": [
+				"vnfRecipe"
+			]
+		},
+		{
+			"name": "location",
+			"value": [
+				"DC1"
+			]
+		},
+		{
+			"name": "deployParameters",
+			"value": {
+				"aaiEnrichmentHost": "aai.onap.svc.cluster.local",
+				"aaiEnrichmentPort": "8443",
+				"enableAAIEnrichment": true,
+				"dmaap_host": "message-router.onap.svc.cluster.local",
+				"dmaap_port": "3904",
+				"enableRedisCaching": false,
+				"redisHosts": "dcae-redis.onap.svc.cluster.local:6379",
+				"tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest",
+				"consul_host": "consul-server.onap.svc.cluster.local",
+				"consul_port": "8500",
+				"cbs_host": "config-binding-service.dcae.svc.cluster.local",
+				"cbs_port": "10000",
+				"external_port": "32012",
+				"policy_id": "AUTO_GENERATED_POLICY_ID_AT_SUBMIT"
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
index c834b1b93..56ae32a7f 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
+++ b/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
@@ -1,76 +1,92 @@
+#
+# ============LICENSE_START====================================================
+# =============================================================================
+# Copyright (c) 2019 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======================================================
+
 tosca_definitions_version: cloudify_dsl_1_3
-imports:
-  - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R2/dockerplugin/3.2.0/dockerplugin_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R2/relationshipplugin/1.0.0/relationshipplugin_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R2/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
 
+description: >
+  This blueprint deploys/manages the TCA module as a Docker container
+
+imports:
+  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
+  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml
+#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
+  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml
 inputs:
-  dh_override:
-    type: string
-    default: "component_dockerhost"
-  dh_location_id:
-    type: string
-    default: "zone1"
   aaiEnrichmentHost:
     type: string
-    default: "none"
+    default: "aai.onap.svc.cluster.local"
   aaiEnrichmentPort:
-    type: string    
-    default: 8443
+    type: string
+    default: "8443"
   enableAAIEnrichment:
     type: string
-    default: false
+    default: true
   dmaap_host:
     type: string
-    default: dmaap.onap-message-router   
+    default: message-router.onap
   dmaap_port:
     type: string
-    default: 3904    
+    default: "3904"
   enableRedisCaching:
     type: string
-    default: false    
+    default: false
   redisHosts:
-    type: string      
+    type: string
+    default: dcae-redis.onap.svc.cluster.local:6379
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap//onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.0.0"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1"
   consul_host:
     type: string
-    default: consul-server.onap-consul
+    default: consul-server.onap
   consul_port:
     type: string
     default: "8500"
   cbs_host:
     type: string
-    default: "config-binding-service.dcae"
+    default: "config-binding-servicel"
   cbs_port:
     type: string
     default: "10000"
   policy_id:
     type: string
-    default: "none"
+    default: "onap.restart.tca"
   external_port:
     type: string
-    description: "Port for CDAPgui to be exposed"
-    default: "32010"
-
+    description: Kubernetes node port on which CDAPgui is exposed
+    default: "32012"
+  policy_model_id:
+    type: string
+    default: "onap.policies.monitoring.cdap.tca.hi.lo.app"
 node_templates:
-  docker_service_host:
-    properties:
-      docker_host_override:
-        get_input: dh_override
-      location_id:
-        get_input: dh_location_id
-    type: dcae.nodes.SelectedDockerHost
-  tca_docker:
+  tca_k8s:
+    type: dcae.nodes.ContainerizedServiceComponent
     relationships:
-       - type: dcae.relationships.component_contained_in
-         target: docker_service_host
-       - target: tca_policy
-         type: cloudify.relationships.depends_on        
-    type: dcae.nodes.DockerContainerForComponentsUsingDmaap
+      - target: tca_policy
+        type: cloudify.relationships.depends_on
     properties:
+        service_component_type: 'dcaegen2-analytics-tca'
+        application_config: {}
+        docker_config: {}
+        image:
+          get_input: tag_version
+        log_info:
+          log_directory: "/opt/app/TCAnalytics/logs"
         application_config:
             app_config:
                 appDescription: DCAE Analytics Threshold Crossing Alert Application
@@ -84,87 +100,75 @@ node_templates:
                 tcaVESMessageStatusTableTTLSeconds: '86400'
                 thresholdCalculatorFlowletInstances: '2'
             app_preferences:
-                aaiEnrichmentHost: 
+                aaiEnrichmentHost:
                     get_input: aaiEnrichmentHost
                 aaiEnrichmentIgnoreSSLCertificateErrors: 'true'
                 aaiEnrichmentPortNumber: '8443'
                 aaiEnrichmentProtocol: https
-                aaiEnrichmentUserName: DCAE
-                aaiEnrichmentUserPassword: DCAE
+                aaiEnrichmentUserName: dcae@dcae.onap.org
+                aaiEnrichmentUserPassword: demo123456!
                 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'
                 publisherProtocol: http
                 publisherTopicName: unauthenticated.DCAE_CL_OUTPUT
-                subscriberConsumerGroup: OpenDCAE-c12
+                subscriberConsumerGroup: OpenDCAE-clamp
                 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
                 subscriberTimeoutMS: '-1'
-                subscriberTopicName: unauthenticated.SEC_MEASUREMENT_OUTPUT
-                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    
-        docker_config:
-            healthcheck:
-               endpoint: /healthcheck
-               interval: 15s
-               timeout: 1s
-               type: http
-        image:
-            get_input: tag_version        
+                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT
+#                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.vNicPerformanceArray[*].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.vNicPerformanceArray[*].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.vNicPerformanceArray[*].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:
         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: 
+                DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT"
+                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 }]        
-        stop:
-          inputs:
-            cleanup_image: true              
+              - concat: ["11011:", { get_input: external_port }]
   tca_policy:
-    type: dcae.nodes.policy
+    type: clamp.nodes.policy
     properties:
       policy_id:
            get_input: policy_id
            policy_type_id: onap.policies.monitoring.cdap.tca.hi.lo.app
-
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
index edaa0be28..53cfc4f76 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
+++ b/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
@@ -1,105 +1,153 @@
 tosca_definitions_version: cloudify_dsl_1_3
+
+description: >
+  This blueprint deploys/manages the TCA module as a Docker container
+
 imports:
-- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml
-- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
-- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml
+  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
+  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml
+  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
 inputs:
-  location_id:
+  aaiEnrichmentHost:
     type: string
-  service_id:
+    default: "aai.onap.svc.cluster.local"
+  aaiEnrichmentPort:
     type: string
+    default: "8443"
+  enableAAIEnrichment:
+    type: string
+    default: true
+  dmaap_host:
+    type: string
+    default: message-router.onap.svc.cluster.local
+  dmaap_port:
+    type: string
+    default: "3904"
+  enableRedisCaching:
+    type: string
+    default: false
+  redisHosts:
+    type: string
+    default: dcae-redis.onap.svc.cluster.local:6379
+  tag_version:
+    type: string
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest"
+  consul_host:
+    type: string
+    default: consul-server.onap.svc.cluster.local
+  consul_port:
+    type: string
+    default: "8500"
+  cbs_host:
+    type: string
+    default: "config-binding-service.dcae.svc.cluster.local"
+  cbs_port:
+    type: string
+    default: "10000"
   policy_id:
     type: string
+    default: "none"
+  external_port:
+    type: string
+    description: Kubernetes node port on which CDAPgui is exposed
+    default: "32012"
+
 node_templates:
-  policy_0:
-    type: dcae.nodes.policy
-    properties:
-      policy_id: 
-        get_input: policy_id
-        policy_type_id: onap.policies.monitoring.cdap.tca.hi.lo.app
-  cdap_host_host:
-    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure
-    properties:
-      location_id:
-        get_input: location_id
-      scn_override: cdap_broker.solutioning-central.dcae.onap.org
-    interfaces:
-      cloudify.interfaces.lifecycle: {
-        }
-  tca_tca:
-    type: dcae.nodes.MicroService.cdap
-    properties:
-      app_config:
-        appDescription: DCAE Analytics Threshold Crossing Alert Application
-        appName: dcae-tca
-        tcaSubscriberOutputStreamName: TCASubscriberOutputStream
-        tcaVESAlertsTableName: TCAVESAlertsTable
-        tcaVESAlertsTableTTLSeconds: '1728000'
-        tcaVESMessageStatusTableName: TCAVESMessageStatusTable
-        tcaVESMessageStatusTableTTLSeconds: '86400'
-        thresholdCalculatorFlowletInstances: '2'
-      app_preferences:
-        publisherContentType: application/json
-        publisherHostName: mrlocal-mtnjftle01.onap.org
-        publisherHostPort: '3905'
-        publisherMaxBatchSize: '10'
-        publisherMaxRecoveryQueueSize: '100000'
-        publisherPollingInterval: '20000'
-        publisherProtocol: https
-        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub
-        publisherUserName: test@tca.af.dcae.onap.org
-        publisherUserPassword: password
-        subscriberConsumerGroup: OpenDCAE-c12
-        subscriberConsumerId: c12
-        subscriberContentType: application/json
-        subscriberHostName: mrlocal-mtnjftle01.onap.org
-        subscriberHostPort: '3905'
-        subscriberMessageLimit: '-1'
-        subscriberPollingInterval: '20000'
-        subscriberProtocol: https
-        subscriberTimeoutMS: '-1'
-        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub
-        subscriberUserName: test@tca.af.dcae.onap.org
-        subscriberUserPassword: password
-        tca_policy: null
-      artifact_name: dcae-analytics-tca
-      artifact_version: 1.0.0
-      connections:
-        streams_publishes: [
-          ]
-        streams_subscribes: [
-          ]
-      jar_url: http://somejar
-      location_id:
-        get_input: location_id
-      namespace: cdap_tca_hi_lo
-      programs:
-      - program_id: TCAVESCollectorFlow
-        program_type: flows
-      - program_id: TCADMaaPMRSubscriberWorker
-        program_type: workers
-      - program_id: TCADMaaPMRPublisherWorker
-        program_type: workers
-      service_component_type: cdap_app_tca
-      service_id:
-        get_input: service_id
-      streamname: TCASubscriberOutputStream
+  tca_k8s:
+    type: dcae.nodes.ContainerizedServiceComponent
     relationships:
-    - target: topic0
-      type: dcae.relationships.subscribe_to_events
-    - target: topic1
-      type: dcae.relationships.publish_events
-    - target: cdap_host_host
-      type: dcae.relationships.component_contained_in
-    - target: policy_0
-      type: dcae.relationships.depends_on
-  topic0:
-    type: dcae.nodes.Topic
+      - target: tca_policy
+        type: cloudify.relationships.depends_on
     properties:
-      topic_name: ''
-  topic1:
-    type: dcae.nodes.Topic
+        service_component_type: 'dcaegen2-analytics-tca'
+        application_config: {}
+        docker_config: {}
+        image:
+          get_input: tag_version
+        log_info:
+          log_directory: "/opt/app/TCAnalytics/logs"
+        application_config:
+            app_config:
+                appDescription: DCAE Analytics Threshold Crossing Alert Application
+                appName: dcae-tca
+                tcaAlertsAbatementTableName: TCAAlertsAbatementTable
+                tcaAlertsAbatementTableTTLSeconds: '1728000'
+                tcaSubscriberOutputStreamName: TCASubscriberOutputStream
+                tcaVESAlertsTableName: TCAVESAlertsTable
+                tcaVESAlertsTableTTLSeconds: '1728000'
+                tcaVESMessageStatusTableName: TCAVESMessageStatusTable
+                tcaVESMessageStatusTableTTLSeconds: '86400'
+                thresholdCalculatorFlowletInstances: '2'
+            app_preferences:
+                aaiEnrichmentHost:
+                    get_input: aaiEnrichmentHost
+                aaiEnrichmentIgnoreSSLCertificateErrors: 'true'
+                aaiEnrichmentPortNumber: '8443'
+                aaiEnrichmentProtocol: https
+                aaiEnrichmentUserName: dcae@dcae.onap.org
+                aaiEnrichmentUserPassword: demo123456!
+                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query
+                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf
+                enableAAIEnrichment:
+                    get_input: enableAAIEnrichment
+                enableRedisCaching:
+                    get_input: enableRedisCaching
+                redisHosts:
+                    get_input: redisHosts
+                enableAlertCEFFormat: 'false'
+                publisherContentType: application/json
+                publisherHostName:
+                    get_input: dmaap_host
+                publisherHostPort:
+                    get_input: dmaap_port
+                publisherMaxBatchSize: '1'
+                publisherMaxRecoveryQueueSize: '100000'
+                publisherPollingInterval: '20000'
+                publisherProtocol: http
+                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT
+                subscriberConsumerGroup: OpenDCAE-c12
+                subscriberConsumerId: c12
+                subscriberContentType: application/json
+                subscriberHostName:
+                    get_input: dmaap_host
+                subscriberHostPort:
+                    get_input: dmaap_port
+                subscriberMessageLimit: '-1'
+                subscriberPollingInterval: '30000'
+                subscriberProtocol: http
+                subscriberTimeoutMS: '-1'
+                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT
+                tca_policy: ''
+        service_component_type: dcaegen2-analytics_tca
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        start:
+          inputs:
+            envs:
+                DMAAPHOST:
+                    { get_input: dmaap_host }
+                DMAAPPORT:
+                    { get_input: dmaap_port }
+                DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
+                DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT"
+                AAIHOST:
+                    { get_input: aaiEnrichmentHost }
+                AAIPORT:
+                    { get_input: aaiEnrichmentPort }
+                CONSUL_HOST:
+                    { get_input: consul_host }
+                CONSUL_PORT:
+                    { get_input: consul_port }
+                CBS_HOST:
+                    { get_input: cbs_host }
+                CBS_PORT:
+                    { get_input: cbs_port }
+                CONFIG_BINDING_SERVICE: "config_binding_service"
+            ports:
+              - concat: ["11011:", { get_input: external_port }]
+  tca_policy:
+    type: dcae.nodes.policy
     properties:
-      topic_name: ''
-      
+      policy_id:
+           get_input: policy_id
+           policy_type_id: onap.policies.monitoring.cdap.tca.hi.lo.app