From 4edf0fa48892bf38d0e3838d125e9bf2324b38e0 Mon Sep 17 00:00:00 2001
From: an4828 <nekrassov@att.com>
Date: Fri, 15 Sep 2017 15:28:53 -0400
Subject: Add support for ABATED alerts within CDAP TCA

Change-Id: Iae560a2d0a47b30b41cd31206dc481a08e4930f7
Signed-off-by: an4828 <nekrassov@att.com>
Issue-ID: DCAEGEN2-107
Signed-off-by: an4828 <nekrassov@att.com>
---
 .../plugins/sparkcompute/tca/SimpleTCAPlugin.java  | 14 +++---
 .../plugins/BaseAnalyticsCDAPPluginsUnitTest.java  |  4 +-
 .../test/resources/data/json/cef/cef_message.json  | 37 ---------------
 .../data/json/cef/non_compliant_cef_message.json   | 37 ---------------
 .../resources/data/json/policy/tca_policy.json     | 53 ----------------------
 5 files changed, 9 insertions(+), 136 deletions(-)
 delete mode 100644 dcae-analytics-cdap-plugins/src/test/resources/data/json/cef/cef_message.json
 delete mode 100644 dcae-analytics-cdap-plugins/src/test/resources/data/json/cef/non_compliant_cef_message.json
 delete mode 100644 dcae-analytics-cdap-plugins/src/test/resources/data/json/policy/tca_policy.json

(limited to 'dcae-analytics-cdap-plugins/src')

diff --git a/dcae-analytics-cdap-plugins/src/main/java/org/openecomp/dcae/apod/analytics/cdap/plugins/sparkcompute/tca/SimpleTCAPlugin.java b/dcae-analytics-cdap-plugins/src/main/java/org/openecomp/dcae/apod/analytics/cdap/plugins/sparkcompute/tca/SimpleTCAPlugin.java
index b915ade..cc11512 100644
--- a/dcae-analytics-cdap-plugins/src/main/java/org/openecomp/dcae/apod/analytics/cdap/plugins/sparkcompute/tca/SimpleTCAPlugin.java
+++ b/dcae-analytics-cdap-plugins/src/main/java/org/openecomp/dcae/apod/analytics/cdap/plugins/sparkcompute/tca/SimpleTCAPlugin.java
@@ -39,7 +39,7 @@ import org.openecomp.dcae.apod.analytics.cdap.common.utils.ValidationUtils;
 import org.openecomp.dcae.apod.analytics.cdap.plugins.domain.config.tca.SimpleTCAPluginConfig;
 import org.openecomp.dcae.apod.analytics.cdap.plugins.utils.CDAPPluginUtils;
 import org.openecomp.dcae.apod.analytics.cdap.plugins.validator.SimpleTCAPluginConfigValidator;
-import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerEventName;
 import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
 import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
 import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFJsonProcessor;
@@ -128,12 +128,12 @@ public class SimpleTCAPlugin extends SparkCompute<StructuredRecord, StructuredRe
                         LOG.debug("VES Threshold Violation Detected.An alert message is be generated: {}",
                                 alertMessage);
 
-                        final MetricsPerFunctionalRole metricsPerFunctionalRole =
-                                processorContextWithViolations.getMetricsPerFunctionalRole();
-                        if (metricsPerFunctionalRole != null
-                                && metricsPerFunctionalRole.getThresholds() != null
-                                && metricsPerFunctionalRole.getThresholds().get(0) != null) {
-                            final Threshold violatedThreshold = metricsPerFunctionalRole.getThresholds().get(0);
+                        final MetricsPerEventName metricsPerEventName =
+                                processorContextWithViolations.getMetricsPerEventName();
+                        if (metricsPerEventName != null
+                                && metricsPerEventName.getThresholds() != null
+                                && metricsPerEventName.getThresholds().get(0) != null) {
+                            final Threshold violatedThreshold = metricsPerEventName.getThresholds().get(0);
                             LOG.debug("CEF Message: {}, Violated Threshold: {}", cefMessage, violatedThreshold);
                         }
 
diff --git a/dcae-analytics-cdap-plugins/src/test/java/org/openecomp/dcae/apod/analytics/cdap/plugins/BaseAnalyticsCDAPPluginsUnitTest.java b/dcae-analytics-cdap-plugins/src/test/java/org/openecomp/dcae/apod/analytics/cdap/plugins/BaseAnalyticsCDAPPluginsUnitTest.java
index 34f70f1..54df808 100644
--- a/dcae-analytics-cdap-plugins/src/test/java/org/openecomp/dcae/apod/analytics/cdap/plugins/BaseAnalyticsCDAPPluginsUnitTest.java
+++ b/dcae-analytics-cdap-plugins/src/test/java/org/openecomp/dcae/apod/analytics/cdap/plugins/BaseAnalyticsCDAPPluginsUnitTest.java
@@ -49,7 +49,7 @@ public abstract class BaseAnalyticsCDAPPluginsUnitTest extends BaseDCAEAnalytics
     protected static final String TCA_POLICY_JSON_FILE_LOCATION = "data/json/policy/tca_policy.json";
     protected static final String CEF_MESSAGE_JSON_FILE_LOCATION = "data/json/cef/cef_message.json";
     protected static final String CEF_NON_COMPLIANT_MESSAGE_JSON_FILE_LOCATION =
-            "data/json/cef/non_compliant_cef_message.json";
+            "data/json/cef/cef_message_with_threshold_violation.json";
 
 
     protected static final String DMAAP_MR_SOURCE_PLUGIN_REFERENCE_NAME = "testDMaaPMRSource";
@@ -89,7 +89,7 @@ public abstract class BaseAnalyticsCDAPPluginsUnitTest extends BaseDCAEAnalytics
     protected static final String JSON_PATH_FILTER_PLUGIN_OUTPUT_SCHEMA_FILED_NAME = "filterMatched";
     protected static final String JSON_PATH_FILTER_PLUGIN_JSON_FILTER_MAPPINGS =
             "$.event.commonEventHeader.domain:measurementsForVfScaling," +
-                    "$.event.commonEventHeader.functionalRole:vLoadBalancer;vFirewall";
+                    "$.event.commonEventHeader.eventName:vLoadBalancer;vFirewall";
     protected static final String JSON_PATH_FILTER_PLUGIN_JSON_FILTER_OUTPUT_SCHEMA =
             "{\"type\":\"record\"," +
                     "\"name\":\"etlSchemaBody\",\"fields\":" +
diff --git a/dcae-analytics-cdap-plugins/src/test/resources/data/json/cef/cef_message.json b/dcae-analytics-cdap-plugins/src/test/resources/data/json/cef/cef_message.json
deleted file mode 100644
index 52cf53b..0000000
--- a/dcae-analytics-cdap-plugins/src/test/resources/data/json/cef/cef_message.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "event": {
-    "measurementsForVfScalingFields": {
-      "measurementInterval": 10,
-      "measurementsForVfScalingVersion": 1.1,
-      "vNicUsageArray": [
-        {
-          "bytesIn": 6086,
-          "multicastPacketsIn": 0,
-          "multicastPacketsOut": 0,
-          "unicastPacketsIn": 0,
-          "broadcastPacketsOut": 0,
-          "packetsOut": 42,
-          "bytesOut": 7156,
-          "packetsIn": 93,
-          "broadcastPacketsIn": 0,
-          "vNicIdentifier": "eth0",
-          "unicastPacketsOut": 0
-        }
-      ]
-    },
-    "commonEventHeader": {
-      "reportingEntityName": "vpp-test",
-      "startEpochMicrosec": 1477070210290442,
-      "eventId": "375",
-      "lastEpochMicrosec": 1477070220290442,
-      "priority": "Normal",
-      "sequence": 375,
-      "sourceName": "Dummy VM name - No Metadata available",
-      "domain": "measurementsForVfScaling",
-      "functionalRole": "vFirewall",
-      "reportingEntityId": "No UUID available",
-      "version": 1.1,
-      "sourceId": "Dummy VM UUID - No Metadata available"
-    }
-  }
-}
diff --git a/dcae-analytics-cdap-plugins/src/test/resources/data/json/cef/non_compliant_cef_message.json b/dcae-analytics-cdap-plugins/src/test/resources/data/json/cef/non_compliant_cef_message.json
deleted file mode 100644
index 2fdf202..0000000
--- a/dcae-analytics-cdap-plugins/src/test/resources/data/json/cef/non_compliant_cef_message.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "event": {
-    "measurementsForVfScalingFields": {
-      "measurementInterval": 10,
-      "measurementsForVfScalingVersion": 1.1,
-      "vNicUsageArray": [
-        {
-          "bytesIn": 20001,
-          "multicastPacketsIn": 0,
-          "multicastPacketsOut": 0,
-          "unicastPacketsIn": 0,
-          "broadcastPacketsOut": 0,
-          "packetsOut": 42,
-          "bytesOut": 7156,
-          "packetsIn": 93,
-          "broadcastPacketsIn": 0,
-          "vNicIdentifier": "eth0",
-          "unicastPacketsOut": 0
-        }
-      ]
-    },
-    "commonEventHeader": {
-      "reportingEntityName": "vpp-test",
-      "startEpochMicrosec": 1477070210290442,
-      "eventId": "375",
-      "lastEpochMicrosec": 1477070220290442,
-      "priority": "Normal",
-      "sequence": 375,
-      "sourceName": "Dummy VM name - No Metadata available",
-      "domain": "measurementsForVfScaling",
-      "functionalRole": "vFirewall",
-      "reportingEntityId": "No UUID available",
-      "version": 1.1,
-      "sourceId": "Dummy VM UUID - No Metadata available"
-    }
-  }
-}
diff --git a/dcae-analytics-cdap-plugins/src/test/resources/data/json/policy/tca_policy.json b/dcae-analytics-cdap-plugins/src/test/resources/data/json/policy/tca_policy.json
deleted file mode 100644
index 1bf9e83..0000000
--- a/dcae-analytics-cdap-plugins/src/test/resources/data/json/policy/tca_policy.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "domain": "measurementsForVfScaling",
-  "metricsPerFunctionalRole": [
-    {
-      "functionalRole": "vFirewall",
-      "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",
-          "version": "1.0.2",
-          "fieldPath": "$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn",
-          "thresholdValue": 4000,
-          "direction": "LESS_OR_EQUAL",
-          "severity": "MAJOR"
-        },
-        {
-          "closedLoopControlName": "CL-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09",
-          "version": "1.0.2",
-          "fieldPath": "$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn",
-          "thresholdValue": 20000,
-          "direction": "GREATER_OR_EQUAL",
-          "severity": "CRITICAL"
-        }
-      ]
-    },
-    {
-      "functionalRole": "vLoadBalancer",
-      "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",
-          "version": "1.0.2",
-          "fieldPath": "$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn",
-          "thresholdValue": 500,
-          "direction": "LESS_OR_EQUAL",
-          "severity": "MAJOR"
-        },
-        {
-          "closedLoopControlName": "CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B",
-          "version": "1.0.2",
-          "fieldPath": "$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn",
-          "thresholdValue": 5000,
-          "direction": "GREATER_OR_EQUAL",
-          "severity": "CRITICAL"
-        }
-      ]
-    }
-  ]
-}
-- 
cgit