tcagen2 spec update

Change-Id: I5b0e6c788b632cf0f0a796207c009e18be96a4ca
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-1907

6 files changed, 143 insertions, 130 deletions

diff --git a/dcae-analytics/dpo/aai.json b/dcae-analytics/dpo/aai.json
new file mode 100644
index 0000000..70c105d
--- /dev/null
+++ b/dcae-analytics/dpo/aai.json
@@ -0,0 +1,11 @@
+{
+  "self": {
+    "name": "tca.aai",
+    "version": "1.0.0",
+    "description": "aai request/response structure"
+  },
+  "dataformatversion": "1.0.0",
+  "unstructured": {
+    "encoding": "UTF-8"
+  }
+}
diff --git a/dcae-analytics/dpo/tca/commands b/dcae-analytics/dpo/commands
index 168681b..168681b 100644
--- a/dcae-analytics/dpo/tca/commands
+++ b/dcae-analytics/dpo/commands
diff --git a/dcae-analytics/dpo/dcaeCLOutput.json b/dcae-analytics/dpo/dcaeCLOutput.json
new file mode 100644
index 0000000..4a27e11
--- /dev/null
+++ b/dcae-analytics/dpo/dcaeCLOutput.json
@@ -0,0 +1,101 @@
+{
+  "self": {
+    "name": "DCAE_CL_Output",
+    "version": "1.0.1",
+    "description": "The format of the output CL event from DCAE to Policy"
+  },
+  "dataformatversion": "1.0.0",
+  "jsonschema": {
+    "name": "CL Alert",
+    "version": "1.0.0",
+    "properties": {
+      "version": {
+        "type": "string",
+        "enum": [
+          "1.0.2"
+        ]
+      },
+      "closedLoopControlName": {
+        "type": "string",
+        "description" : "This is the unique ID for the Control Loop. It is created by the CLAMP platform during Control Loop design"
+      },
+      "requestID": {
+        "type": "string",
+        "description" : "For the control loop, when an instance of the Control Loop occurs, this unique ID must be created. The same ID must be forwarded for both the ONSET and the ABATED control loop messages"
+      },
+      "closedLoopEventStatus": {
+        "type": "string",
+        "description" : "This is the status of the closedLoopControlName/requestID pair",
+        "enum": [
+          "ONSET",
+          "ABATED"
+        ]
+      },
+      "closedLoopAlarmStart": {
+        "type": "string",
+        "description" : "When the alarm was first detected"
+      },
+      "closedLoopAlarmEnd" : {
+        "type" : "string",
+        "description" : "When the alarm was cleared. This field need only be present in the ABATED message"
+      },
+      "closedLoopEventClient": {
+        "type": "string",
+        "description" : "For monitoring/logging/auditing purposes, if there is an instance ID of the DCAE micro service this field should be populated with it"
+      },
+      "policyVersion": {
+        "type": "string",
+        "description" : "The version of the Policy driving the DCAE Micro service. Should be a part of the configuration policy setup by CLAMP and passed by DCAE controller"
+      },
+      "policyName": {
+        "type": "string",
+        "description" : "The name of the Policy driving the DCAE micro service. Should be a part of the configuration policy setup by CLAMP and passed by DCAE controller"
+      },
+      "policyScope": {
+        "type": "string",
+        "description" : "The scope of the Policy driving the DCAE micro service. Should be a part of the configuration policy setup by CLAMP and passed by DCAE controller"
+      },      
+      "from": {
+        "type": "string",
+        "description" : "The ONAP platform component publishing this message",
+        "enum": [
+          "DCAE"
+        ]
+      },
+      "target_type": {
+        "type": "string",
+        "description" : "The type of the target: VM or VNF",
+        "enum": [
+          "VNF",
+          "VM"
+        ]
+      },
+      "target": {
+        "type": "string",
+        "description" : "This is the name of the field within the A&AI sub-tag that indicates the actual entity Node details. There should be a matching node field within the A&AI subtag holding this value",
+        "enum": [
+          "generic-vnf.vnf-id",
+          "vserver.vserver-name"
+        ]
+      },
+      "AAI": {
+        "description" : "Contains the A&AI Node-Attribute list",
+        "anyOf": [
+          {
+            "generic-vnf.vnf-id": {
+              "type": "string"
+            }
+          },
+          {
+            "vserver.vserver-name": {
+              "type": "string"
+            }
+          }
+        ]
+      }
+    },
+    "required": ["version", "closedLoopControlName", "requestID", "closedLoopEventStatus", "closedLoopAlarmStart", "from", "target_type", "target", "AAI"]
+  }
+}
+
+
diff --git a/dcae-analytics/dpo/tca/dmaap.json b/dcae-analytics/dpo/dmaap.json
index 6ee67d2..6ee67d2 100644
--- a/dcae-analytics/dpo/tca/dmaap.json
+++ b/dcae-analytics/dpo/dmaap.json
diff --git a/dcae-analytics/dpo/tca/tca_output.json b/dcae-analytics/dpo/tca/tca_output.json
deleted file mode 100644
index f593fda..0000000
--- a/dcae-analytics/dpo/tca/tca_output.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "self": {
-    "name": "TCA Alert Definition",
-    "version": "1.0.1",
-    "description": "The format of the output event from TCA"
-  },
-  "dataformatversion": "1.0.0",
-  "jsonschema": {
-    "name": "TCA Alert",
-    "version": "1.0.0",
-    "properties": {
-      "version": {
-        "type": "string",
-        "enum": [
-          "1.0.2"
-        ]
-      },
-      "closedLoopControlName": {
-        "type": "string",
-        "description": "This is the unique ID for the Control Loop. It is created by the CLAMP platform during Control Loop design"
-      },
-      "requestID": {
-        "type": "string",
-        "description": "For the control loop, when an instance of the Control Loop occurs, this unique ID must be created. The same ID must be forwarded for both the ONSET and the ABATED control loop messages"
-      },
-      "closedLoopEventStatus": {
-        "type": "string",
-        "description": "This is the status of the closedLoopControlName/requestID pair",
-        "enum": [
-          "ONSET",
-          "ABATED"
-        ]
-      },
-      "closedLoopAlarmStart": {
-        "type": "string",
-        "description": "When the alarm was first detected"
-      },
-      "closedLoopAlarmEnd": {
-        "type": "string",
-        "description": "When the alarm was cleared. This field need only be present in the ABATED message"
-      },
-      "closedLoopEventClient": {
-        "type": "string",
-        "description": "For monitoring/logging/auditing purposes, if there is an instance ID of the DCAE micro service this field should be populated with it"
-      },
-      "policyVersion": {
-        "type": "string",
-        "description": "The version of the Policy driving the DCAE Micro service. Should be a part of the configuration policy setup by CLAMP and passed by DCAE controller"
-      },
-      "policyName": {
-        "type": "string",
-        "description": "The name of the Policy driving the DCAE micro service. Should be a part of the configuration policy setup by CLAMP and passed by DCAE controller"
-      },
-      "policyScope": {
-        "type": "string",
-        "description": "The scope of the Policy driving the DCAE micro service. Should be a part of the configuration policy setup by CLAMP and passed by DCAE controller"
-      },
-      "from": {
-        "type": "string",
-        "description": "The ONAP platform component publishing this message",
-        "enum": [
-          "DCAE"
-        ]
-      },
-      "target_type": {
-        "type": "string",
-        "description": "The type of the target: VM or VNF",
-        "enum": [
-          "VNF",
-          "VM"
-        ]
-      },
-      "target": {
-        "type": "string",
-        "description": "This is the name of the field within the A&AI sub-tag that indicates the actual entity Node details. There should be a matching node field within the A&AI subtag holding this value",
-        "enum": [
-          "generic-vnf.vnf-id",
-          "vserver.vserver-name"
-        ]
-      },
-      "AAI": {
-        "description": "Contains the A&AI Node-Attribute list",
-        "anyOf": [
-          {
-            "generic-vnf.vnf-id": {
-              "type": "string"
-            }
-          },
-          {
-            "vserver.vserver-name": {
-              "type": "string"
-            }
-          }
-        ]
-      }
-    },
-    "required": [
-      "version",
-      "closedLoopControlName",
-      "requestID",
-      "closedLoopEventStatus",
-      "closedLoopAlarmStart",
-      "from",
-      "target_type",
-      "target",
-      "AAI"
-    ]
-  }
-}
diff --git a/dcae-analytics/dpo/tca/tca_spec.json b/dcae-analytics/dpo/tcagen2_spec.json
index 4d99201..00cf73f 100644
--- a/dcae-analytics/dpo/tca/tca_spec.json
+++ b/dcae-analytics/dpo/tcagen2_spec.json
@@ -1,8 +1,8 @@
 {
   "self": {
-    "name": "docker.tca",
-    "version": "1.0.5",
-    "description": "TCA Docker Application",
+    "name": "docker-tcagen2",
+    "version": "1.0.0",
+    "description": "TCAGen2 Docker Application",
     "component_type": "docker"
   },
   "streams": {
@@ -11,15 +11,15 @@
         "config_key": "tca_handle_in",
         "format": "VES_specification",
         "version": "5.28.4",
-        "type": "message router"
+        "type": "message_router"
       }
     ],
     "publishes": [
       {
         "config_key": "tca_handle_out",
-        "format": "TCA Alert Definition",
-        "version": "1.0.0",
-        "type": "message router"
+        "format": "DCAE_CL_Output",
+        "version": "1.0.1",
+        "type": "message_router"
       }
     ]
   },
@@ -29,12 +29,12 @@
         "config_key": "aai_broker_handle",
         "verb": "GET",
         "request": {
-          "format": "get_with_query_params",
+          "format": "tca.aai",
           "version": "1.0.0"
         },
         "response": {
-          "format": "aai_broker_response",
-          "version": "3.0.0"
+          "format": "tca.aai",
+          "version": "1.0.0"
         }
       }
     ],
@@ -45,19 +45,29 @@
       "type": "http",
       "interval": "30s",
       "timeout": "10s",
-      "endpoint": "actuator/health"
-    }
+      "endpoint": "/actuator/health"
+    },
+    "ports": [
+      "9091:0"
+    ],
+    "log_info": {
+        "log_directory": "/opt/logs/dcae-analytics-tca"
+     },
+    "tls_info":{
+        "cert_directory":"/opt/app/dcae-certificate/",
+        "use_tls":true
+     }
   },
   "artifacts": [
     {
-      "uri": "docker_repository.com:5100/org.onap.dcae.analytics/dcae-analytics-web:1.0",
+      "uri": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.0.0",
       "type": "docker image"
     }
   ],
   "parameters": [
     {
-      "name": "spring.mongodb.uri",
-      "value": "mongodb://localhost:27017/analytics-tca",
+      "name": "spring.data.mongodb.uri",
+      "value": "mongodb://dcae-mongohost/dcae-tcagen2",
       "description": "Mongodb database uri",
       "designer_editable": true,
       "sourced_at_deployment": true,
@@ -67,7 +77,7 @@
     },
     {
       "name": "tca.policy",
-      "value": "{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"Mfvs_eNodeB_RANKPI\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"resource=vFirewall;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":4000,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":20000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"},{\"closedLoopControlName\":\"CL-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09\",\"closedLoopEventStatus\":\"ABATED\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"CRITICAL\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"resource=vLoadBalancer;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":500,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":5000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"}]},{\"eventName\":\"virtualVMEventName\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"resource=virtualVM;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":500,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"}]}]}",
+      "value" : "{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VM\",\"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\"}]}]}",
       "description": "Threshold Crossing Alert Policy JSON as string",
       "designer_editable": false,
       "sourced_at_deployment": false,
@@ -87,7 +97,7 @@
     },
     {
       "name": "tca.enable_abatement",
-      "value": true,
+      "value": "true",
       "description": "Enables / Disables TCA Alerts Abatement",
       "designer_editable": true,
       "sourced_at_deployment": false,
@@ -97,7 +107,7 @@
     },
     {
       "name": "tca.enable_ecomp_logging",
-      "value": true,
+      "value": "true",
       "description": "Enables / Disables ECOMP Logging",
       "designer_editable": true,
       "sourced_at_deployment": false,
@@ -107,7 +117,7 @@
     },
     {
       "name": "tca.aai.enable_enrichment",
-      "value": false,
+      "value": "true",
       "description": "Enables / Disables TCA A&AI Enrichment",
       "designer_editable": true,
       "sourced_at_deployment": true,
@@ -117,7 +127,7 @@
     },
     {
       "name": "tca.aai.url",
-      "value": "http://localhost:8443",
+      "value": "http://aai.onap.svc.cluster.local",
       "description": "A&AI Enrichment Service URL. Required only if A&AI Enrichment is enabled",
       "designer_editable": true,
       "sourced_at_deployment": true,
@@ -216,7 +226,7 @@
       "required": false
     },
     {
-      "name": "streams_subscribes.tca_handle_in.polling.fixedRate",
+      "name": "streams_subscribes.tca_handle_in.polling.fixed_rate",
       "value": 0,
       "description": "Subscriber fixed polling interval in milliseconds. Value of 0 indicated auto adjusting polling will be used",
       "designer_editable": true,