summaryrefslogtreecommitdiffstats
path: root/dcae-analytics-test/src
diff options
context:
space:
mode:
Diffstat (limited to 'dcae-analytics-test/src')
-rw-r--r--dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java486
-rw-r--r--dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsIT.java58
-rw-r--r--dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java58
-rw-r--r--dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/annotation/GuiceModules.java90
-rw-r--r--dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java200
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/aai/aai_vnf_enrichment.json39
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/aai/aai_vserver_enrichment.json10
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/aai/aai_vserver_resource_data.json8
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/cef/cef_message.json152
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/cef/cef_message_with_threshold_violation.json152
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/cef/cef_messages.json66
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/config/controller_app_config.json66
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/config/invalidJsonConfig.json12
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/config/testAppConfig.json12
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/facade/tca_ves_cef_response.json36
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/policy/tca_policy.json154
-rw-r--r--dcae-analytics-test/src/main/resources/data/json/tca/ves_mock_messages.json353
-rw-r--r--dcae-analytics-test/src/main/resources/data/properties/quartz-test.properties48
-rw-r--r--dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy.properties156
-rw-r--r--dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy_from_json.properties84
-rw-r--r--dcae-analytics-test/src/main/resources/data/properties/testApp.properties44
-rw-r--r--dcae-analytics-test/src/main/resources/logback-test.xml110
22 files changed, 1063 insertions, 1331 deletions
diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java
index 4698f21..4f5015b 100644
--- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java
+++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java
@@ -1,243 +1,243 @@
-/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
- * ================================================================================
- * Copyright © 2017 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===========================================
- */
-
-package org.openecomp.dcae.apod.analytics.test;
-
-import org.json.JSONException;
-import org.junit.Assert;
-import org.skyscreamer.jsonassert.JSONAssert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectOutputStream;
-import java.io.OutputStreamWriter;
-import java.lang.reflect.Field;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.file.Paths;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Arrays;
-
-import static java.nio.file.Files.deleteIfExists;
-import static java.nio.file.Files.exists;
-
-/**
- * Base common test class for all DCAE Analytics Test e.g. unit tests, integration test, CDAP tests etc.
- * <p>
- * @author Rajiv Singla . Creation Date: 10/19/2016.
- */
-abstract class BaseDCAEAnalyticsCommonTest {
-
- protected static final Logger LOG = LoggerFactory.getLogger(BaseDCAEAnalyticsCommonTest.class);
-
- /**
- * Asserts if expected Json String and actual Json String contain the same properties ignoring
- * property order. Simple String assertion might fail as property order during serialization and deserialization
- * is generally non-deterministic. Also proper error message are generated more missing or unexpected
- * properties
- *
- * @param expectedJsonString expected Json String
- * @param actualJsonString actual Json String
- * @throws JSONException Json Exception
- */
- public static void assertJson(String expectedJsonString, String actualJsonString) throws JSONException {
- JSONAssert.assertEquals(expectedJsonString, actualJsonString, true);
- }
-
- /**
- * Converts given file location to String
- *
- * @param fileLocation location of the file which needs to be converted to String
- * @return Contents of file as string
- * @throws IOException IOException
- */
- public static String fromStream(String fileLocation) throws IOException {
- final InputStream jsonFileInputStream =
- BaseDCAEAnalyticsCommonTest.class.getClassLoader().getResourceAsStream(fileLocation);
- Assert.assertNotNull("Json File Location must be valid", jsonFileInputStream);
- try (BufferedReader reader =
- new BufferedReader(new InputStreamReader(jsonFileInputStream, Charset.forName("UTF-8")))) {
- final StringBuilder result = new StringBuilder();
- final String newLine = System.getProperty("line.separator");
- String line = reader.readLine();
- while (line != null) {
- result.append(line)
- .append(newLine);
- line = reader.readLine();
- }
- jsonFileInputStream.close();
- return result.toString();
- }
- }
-
-
- /**
- * Checks if object can be serialized properly
- *
- * @param object input object
- * @param callingClass calling class
- * @throws IOException IOException
- */
- public static void testSerialization(Object object, Class<?> callingClass) throws IOException {
- final URL location = callingClass.getProtectionDomain().getCodeSource().getLocation();
- final File serializedOutputFile =
- new File(location.getPath() + String.format("serialization/%s.ser", object.getClass().getSimpleName()));
-
- // Maybe file already try deleting it first
- final boolean deleteIfExists = deleteIfExists(Paths.get(serializedOutputFile.getPath()));
-
- if (deleteIfExists) {
- LOG.warn("Previous serialization file was overwritten at location: {}", serializedOutputFile.getPath());
- }
-
- boolean mkdirs = true;
- if (!exists(Paths.get(serializedOutputFile.getParentFile().getPath()))) {
- mkdirs = serializedOutputFile.getParentFile().mkdirs();
- }
- if (mkdirs) {
- try (FileOutputStream fileOutputStream = new FileOutputStream(serializedOutputFile);
- ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream)) {
- objectOutputStream.writeObject(object);
- LOG.debug("Successfully created serialization file at location: {}", serializedOutputFile.getPath());
- }
- } else {
- throw new IllegalStateException(
- String.format("Failed to create location to store serialization file: %s",
- serializedOutputFile));
- }
- }
-
- /**
- * Writes Text to Output file
- *
- * @param textFileLocation - location of text file e.g. textfiles/fileName.json
- * @param content - file content
- * @param callingClass - calling class
- * @throws IOException - ioException
- */
- public static void writeToOutputTextFile(String textFileLocation, String content, Class<?> callingClass) throws
- IOException {
- final URL location = callingClass.getProtectionDomain().getCodeSource().getLocation();
- final File fileLocation = new File(location.getPath() + textFileLocation);
-
- // Maybe file already try deleting it first
- final boolean deleteIfExists = deleteIfExists(Paths.get(fileLocation.getPath()));
-
- if (deleteIfExists) {
- LOG.warn("Previous file will be overwritten at location: {}", fileLocation.getPath());
- }
-
- boolean mkdirs = true;
- if (!exists(Paths.get(fileLocation.getParentFile().getPath()))) {
- mkdirs = fileLocation.getParentFile().mkdirs();
- }
- if (mkdirs) {
- try (
- FileOutputStream fileOutputStream = new FileOutputStream(fileLocation);
- OutputStreamWriter outputStream =
- new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"))) {
- outputStream.write(content);
- LOG.debug("Successfully created text file at location: {}", fileLocation.getPath());
- }
- } else {
- throw new IllegalStateException(
- String.format("Failed to create location to store text file: %s", fileLocation));
- }
-
- }
-
-
- /**
- * For testing purposes only we may sometime we may want to access private fields of underlying
- * object to confirm the values are setup correctly.
- * <p>
- * This method uses java reflection to get the value to private object in the class
- *
- * @param object Actual object which has the private field you want to check
- * @param fieldName Field name in the Actual Object you want to get the value of
- * @param privateFieldClass Type of the private field
- * @param <T> Class of Actual Object
- * @param <U> Class of private field
- * @return value of the private field
- */
- public static <T, U> U getPrivateFiledValue(T object, String fieldName, Class<U> privateFieldClass) {
-
- final Class<?> objectClass = object.getClass();
- try {
- final Field privateField = objectClass.getDeclaredField(fieldName);
- try {
-
- // mark private field to be accessible for testing purposes
- AccessController.doPrivileged(new PrivilegedAction() {
- @Override
- public Object run() {
- privateField.setAccessible(true);
- return null;
- }
- });
-
-
- return privateFieldClass.cast(privateField.get(object));
-
- } catch (IllegalAccessException e) {
- LOG.error("Unable to access field: {}", fieldName);
- throw new IllegalStateException(e);
- }
- } catch (NoSuchFieldException e) {
- LOG.error("Unable to locate field name: {} in class: {}", fieldName, objectClass.getSimpleName());
- throw new IllegalStateException(e);
- }
-
-
- }
-
-
- /**
- * Prints classpath jars which are visible inside the class
- *
- * @param classLoader classloader of the calling class
- */
- public static void dumpClasspath(ClassLoader classLoader) {
-
- LOG.info("Dumping ClassPath for classloader: {}", classLoader);
-
- if (classLoader instanceof URLClassLoader) {
-
- URLClassLoader ucl = (URLClassLoader) classLoader;
- LOG.info("\t ==========>>>" + Arrays.toString(ucl.getURLs()));
-
- } else {
- LOG.info("\t(cannot display components as not a URLClassLoader)");
- }
-
- if (classLoader.getParent() != null) {
- dumpClasspath(classLoader.getParent());
- }
- }
-
-}
+/*
+ * ===============================LICENSE_START======================================
+ * dcae-analytics
+ * ================================================================================
+ * Copyright © 2017 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===========================================
+ */
+
+package org.openecomp.dcae.apod.analytics.test;
+
+import org.json.JSONException;
+import org.junit.Assert;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.ObjectOutputStream;
+import java.io.OutputStreamWriter;
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.charset.Charset;
+import java.nio.file.Paths;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Arrays;
+
+import static java.nio.file.Files.deleteIfExists;
+import static java.nio.file.Files.exists;
+
+/**
+ * Base common test class for all DCAE Analytics Test e.g. unit tests, integration test, CDAP tests etc.
+ * <p>
+ * @author Rajiv Singla . Creation Date: 10/19/2016.
+ */
+abstract class BaseDCAEAnalyticsCommonTest {
+
+ protected static final Logger LOG = LoggerFactory.getLogger(BaseDCAEAnalyticsCommonTest.class);
+
+ /**
+ * Asserts if expected Json String and actual Json String contain the same properties ignoring
+ * property order. Simple String assertion might fail as property order during serialization and deserialization
+ * is generally non-deterministic. Also proper error message are generated more missing or unexpected
+ * properties
+ *
+ * @param expectedJsonString expected Json String
+ * @param actualJsonString actual Json String
+ * @throws JSONException Json Exception
+ */
+ public static void assertJson(String expectedJsonString, String actualJsonString) throws JSONException {
+ JSONAssert.assertEquals(expectedJsonString, actualJsonString, true);
+ }
+
+ /**
+ * Converts given file location to String
+ *
+ * @param fileLocation location of the file which needs to be converted to String
+ * @return Contents of file as string
+ * @throws IOException IOException
+ */
+ public static String fromStream(String fileLocation) throws IOException {
+ final InputStream jsonFileInputStream =
+ BaseDCAEAnalyticsCommonTest.class.getClassLoader().getResourceAsStream(fileLocation);
+ Assert.assertNotNull("Json File Location must be valid", jsonFileInputStream);
+ try (BufferedReader reader =
+ new BufferedReader(new InputStreamReader(jsonFileInputStream, Charset.forName("UTF-8")))) {
+ final StringBuilder result = new StringBuilder();
+ final String newLine = System.getProperty("line.separator");
+ String line = reader.readLine();
+ while (line != null) {
+ result.append(line)
+ .append(newLine);
+ line = reader.readLine();
+ }
+ jsonFileInputStream.close();
+ return result.toString();
+ }
+ }
+
+
+ /**
+ * Checks if object can be serialized properly
+ *
+ * @param object input object
+ * @param callingClass calling class
+ * @throws IOException IOException
+ */
+ public static void testSerialization(Object object, Class<?> callingClass) throws IOException {
+ final URL location = callingClass.getProtectionDomain().getCodeSource().getLocation();
+ final File serializedOutputFile =
+ new File(location.getPath() + String.format("serialization/%s.ser", object.getClass().getSimpleName()));
+
+ // Maybe file already try deleting it first
+ final boolean deleteIfExists = deleteIfExists(Paths.get(serializedOutputFile.getPath()));
+
+ if (deleteIfExists) {
+ LOG.warn("Previous serialization file was overwritten at location: {}", serializedOutputFile.getPath());
+ }
+
+ boolean mkdirs = true;
+ if (!exists(Paths.get(serializedOutputFile.getParentFile().getPath()))) {
+ mkdirs = serializedOutputFile.getParentFile().mkdirs();
+ }
+ if (mkdirs) {
+ try (FileOutputStream fileOutputStream = new FileOutputStream(serializedOutputFile);
+ ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream)) {
+ objectOutputStream.writeObject(object);
+ LOG.debug("Successfully created serialization file at location: {}", serializedOutputFile.getPath());
+ }
+ } else {
+ throw new IllegalStateException(
+ String.format("Failed to create location to store serialization file: %s",
+ serializedOutputFile));
+ }
+ }
+
+ /**
+ * Writes Text to Output file
+ *
+ * @param textFileLocation - location of text file e.g. textfiles/fileName.json
+ * @param content - file content
+ * @param callingClass - calling class
+ * @throws IOException - ioException
+ */
+ public static void writeToOutputTextFile(String textFileLocation, String content, Class<?> callingClass) throws
+ IOException {
+ final URL location = callingClass.getProtectionDomain().getCodeSource().getLocation();
+ final File fileLocation = new File(location.getPath() + textFileLocation);
+
+ // Maybe file already try deleting it first
+ final boolean deleteIfExists = deleteIfExists(Paths.get(fileLocation.getPath()));
+
+ if (deleteIfExists) {
+ LOG.warn("Previous file will be overwritten at location: {}", fileLocation.getPath());
+ }
+
+ boolean mkdirs = true;
+ if (!exists(Paths.get(fileLocation.getParentFile().getPath()))) {
+ mkdirs = fileLocation.getParentFile().mkdirs();
+ }
+ if (mkdirs) {
+ try (
+ FileOutputStream fileOutputStream = new FileOutputStream(fileLocation);
+ OutputStreamWriter outputStream =
+ new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"))) {
+ outputStream.write(content);
+ LOG.debug("Successfully created text file at location: {}", fileLocation.getPath());
+ }
+ } else {
+ throw new IllegalStateException(
+ String.format("Failed to create location to store text file: %s", fileLocation));
+ }
+
+ }
+
+
+ /**
+ * For testing purposes only we may sometime we may want to access private fields of underlying
+ * object to confirm the values are setup correctly.
+ * <p>
+ * This method uses java reflection to get the value to private object in the class
+ *
+ * @param object Actual object which has the private field you want to check
+ * @param fieldName Field name in the Actual Object you want to get the value of
+ * @param privateFieldClass Type of the private field
+ * @param <T> Class of Actual Object
+ * @param <U> Class of private field
+ * @return value of the private field
+ */
+ public static <T, U> U getPrivateFiledValue(T object, String fieldName, Class<U> privateFieldClass) {
+
+ final Class<?> objectClass = object.getClass();
+ try {
+ final Field privateField = objectClass.getDeclaredField(fieldName);
+ try {
+
+ // mark private field to be accessible for testing purposes
+ AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
+ public Object run() {
+ privateField.setAccessible(true);
+ return null;
+ }
+ });
+
+
+ return privateFieldClass.cast(privateField.get(object));
+
+ } catch (IllegalAccessException e) {
+ LOG.error("Unable to access field: {}", fieldName);
+ throw new IllegalStateException(e);
+ }
+ } catch (NoSuchFieldException e) {
+ LOG.error("Unable to locate field name: {} in class: {}", fieldName, objectClass.getSimpleName());
+ throw new IllegalStateException(e);
+ }
+
+
+ }
+
+
+ /**
+ * Prints classpath jars which are visible inside the class
+ *
+ * @param classLoader classloader of the calling class
+ */
+ public static void dumpClasspath(ClassLoader classLoader) {
+
+ LOG.info("Dumping ClassPath for classloader: {}", classLoader);
+
+ if (classLoader instanceof URLClassLoader) {
+
+ URLClassLoader ucl = (URLClassLoader) classLoader;
+ LOG.info("\t ==========>>>" + Arrays.toString(ucl.getURLs()));
+
+ } else {
+ LOG.info("\t(cannot display components as not a URLClassLoader)");
+ }
+
+ if (classLoader.getParent() != null) {
+ dumpClasspath(classLoader.getParent());
+ }
+ }
+
+}
diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsIT.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsIT.java
index cbc7f1c..a63d32c 100644
--- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsIT.java
+++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsIT.java
@@ -1,29 +1,29 @@
-/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
- * ================================================================================
- * Copyright © 2017 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===========================================
- */
-
-package org.openecomp.dcae.apod.analytics.test;
-
-/**
- * Base class for all DCAE Analytics Integration Tests
- * <p>
- * @author Rajiv Singla . Creation Date: 10/6/2016.
- */
-public abstract class BaseDCAEAnalyticsIT extends BaseDCAEAnalyticsCommonTest {
-}
+/*
+ * ===============================LICENSE_START======================================
+ * dcae-analytics
+ * ================================================================================
+ * Copyright © 2017 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===========================================
+ */
+
+package org.openecomp.dcae.apod.analytics.test;
+
+/**
+ * Base class for all DCAE Analytics Integration Tests
+ * <p>
+ * @author Rajiv Singla . Creation Date: 10/6/2016.
+ */
+public abstract class BaseDCAEAnalyticsIT extends BaseDCAEAnalyticsCommonTest {
+}
diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java
index ddc996a..6b7cc9d 100644
--- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java
+++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java
@@ -1,29 +1,29 @@
-/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
- * ================================================================================
- * Copyright © 2017 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===========================================
- */
-
-package org.openecomp.dcae.apod.analytics.test;
-
-/**
- * Base class for all DCAE Analytics Unit Tests
- * <p>
- * @author Rajiv Singla . Creation Date: 10/6/2016.
- */
-public abstract class BaseDCAEAnalyticsUnitTest extends BaseDCAEAnalyticsCommonTest {
-}
+/*
+ * ===============================LICENSE_START======================================
+ * dcae-analytics
+ * ================================================================================
+ * Copyright © 2017 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===========================================
+ */
+
+package org.openecomp.dcae.apod.analytics.test;
+
+/**
+ * Base class for all DCAE Analytics Unit Tests
+ * <p>
+ * @author Rajiv Singla . Creation Date: 10/6/2016.
+ */
+public abstract class BaseDCAEAnalyticsUnitTest extends BaseDCAEAnalyticsCommonTest {
+}
diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/annotation/GuiceModules.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/annotation/GuiceModules.java
index 8c62db2..1c20f17 100644
--- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/annotation/GuiceModules.java
+++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/annotation/GuiceModules.java
@@ -1,45 +1,45 @@
-/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
- * ================================================================================
- * Copyright © 2017 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===========================================
- */
-
-package org.openecomp.dcae.apod.analytics.test.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation which can be used to provide test guice modules
- * <p>
- * @author Rajiv Singla . Creation Date: 10/20/2016.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-public @interface GuiceModules {
-
- /**
- * Test Modules
- *
- * @return module classes
- */
- Class<?>[] value();
-}
+/*
+ * ===============================LICENSE_START======================================
+ * dcae-analytics
+ * ================================================================================
+ * Copyright © 2017 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===========================================
+ */
+
+package org.openecomp.dcae.apod.analytics.test.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation which can be used to provide test guice modules
+ * <p>
+ * @author Rajiv Singla . Creation Date: 10/20/2016.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface GuiceModules {
+
+ /**
+ * Test Modules
+ *
+ * @return module classes
+ */
+ Class<?>[] value();
+}
diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java
index 6353442..93ef603 100644
--- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java
+++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java
@@ -1,100 +1,100 @@
-/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
- * ================================================================================
- * Copyright © 2017 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===========================================
- */
-
-package org.openecomp.dcae.apod.analytics.test.runner;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.InitializationError;
-import org.openecomp.dcae.apod.analytics.test.annotation.GuiceModules;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-
-/**
- * A custom Junit Runner which can be used to run Guice Test with custom Test Modules
- * <p>
- * @author Rajiv Singla . Creation Date: 10/20/2016.
- */
-public class GuiceJUnitRunner extends BlockJUnit4ClassRunner {
-
- private static final Logger LOG = LoggerFactory.getLogger(GuiceJUnitRunner.class);
-
- private final Injector injector;
-
- public GuiceJUnitRunner(Class<?> klass) throws InitializationError {
- super(klass);
- Class<?>[] classes = getModulesFor(klass);
- injector = createInjectorFor(classes);
- }
-
-
- /**
- * Returns a new fixture for running a test. Injects Guice members
- */
- @Override
- public Object createTest() throws Exception {
- Object obj = super.createTest();
- injector.injectMembers(obj);
- return obj;
- }
-
-
- /**
- * Creates new Guice Injector and registers Guice test modules
- *
- * @param classes test module classes
- * @return Guice injector with test modules
- * @throws InitializationError
- */
- private Injector createInjectorFor(Class<?>[] classes) throws InitializationError {
- Module[] modules = new Module[classes.length];
- for (int i = 0; i < classes.length; i++) {
- try {
- modules[i] = (Module) classes[i].newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
- throw new InitializationError(e);
- }
- }
- LOG.debug("Creating Junit Test Runner with Guice Test Modules: {}", Arrays.toString(modules));
- return Guice.createInjector(modules);
- }
-
- /**
- * Extract user provide test modules from the {@link GuiceModules} annotation
- *
- * @param klass Target class which is running the test
- * @return Guice modules contained passed in annotation of Guice Modules
- * @throws InitializationError
- */
- private Class<?>[] getModulesFor(Class<?> klass) throws InitializationError {
- GuiceModules annotation = klass.getAnnotation(GuiceModules.class);
- if (annotation == null) {
- throw new InitializationError(
- "Missing @GuiceModules annotation for unit test '" + klass.getName()
- + "'");
- }
- return annotation.value();
- }
-
-}
+/*
+ * ===============================LICENSE_START======================================
+ * dcae-analytics
+ * ================================================================================
+ * Copyright © 2017 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===========================================
+ */
+
+package org.openecomp.dcae.apod.analytics.test.runner;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.InitializationError;
+import org.openecomp.dcae.apod.analytics.test.annotation.GuiceModules;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+
+/**
+ * A custom Junit Runner which can be used to run Guice Test with custom Test Modules
+ * <p>
+ * @author Rajiv Singla . Creation Date: 10/20/2016.
+ */
+public class GuiceJUnitRunner extends BlockJUnit4ClassRunner {
+
+ private static final Logger LOG = LoggerFactory.getLogger(GuiceJUnitRunner.class);
+
+ private final Injector injector;
+
+ public GuiceJUnitRunner(Class<?> klass) throws InitializationError {
+ super(klass);
+ Class<?>[] classes = getModulesFor(klass);
+ injector = createInjectorFor(classes);
+ }
+
+
+ /**
+ * Returns a new fixture for running a test. Injects Guice members
+ */
+ @Override
+ public Object createTest() throws Exception {
+ Object obj = super.createTest();
+ injector.injectMembers(obj);
+ return obj;
+ }
+
+
+ /**
+ * Creates new Guice Injector and registers Guice test modules
+ *
+ * @param classes test module classes
+ * @return Guice injector with test modules
+ * @throws InitializationError
+ */
+ private Injector createInjectorFor(Class<?>[] classes) throws InitializationError {
+ Module[] modules = new Module[classes.length];
+ for (int i = 0; i < classes.length; i++) {
+ try {
+ modules[i] = (Module) classes[i].newInstance();
+ } catch (InstantiationException | IllegalAccessException e) {
+ throw new InitializationError(e);
+ }
+ }
+ LOG.debug("Creating Junit Test Runner with Guice Test Modules: {}", Arrays.toString(modules));
+ return Guice.createInjector(modules);
+ }
+
+ /**
+ * Extract user provide test modules from the {@link GuiceModules} annotation
+ *
+ * @param klass Target class which is running the test
+ * @return Guice modules contained passed in annotation of Guice Modules
+ * @throws InitializationError
+ */
+ private Class<?>[] getModulesFor(Class<?> klass) throws InitializationError {
+ GuiceModules annotation = klass.getAnnotation(GuiceModules.class);
+ if (annotation == null) {
+ throw new InitializationError(
+ "Missing @GuiceModules annotation for unit test '" + klass.getName()
+ + "'");
+ }
+ return annotation.value();
+ }
+
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/aai/aai_vnf_enrichment.json b/dcae-analytics-test/src/main/resources/data/json/aai/aai_vnf_enrichment.json
new file mode 100644
index 0000000..ee9a528
--- /dev/null
+++ b/dcae-analytics-test/src/main/resources/data/json/aai/aai_vnf_enrichment.json
@@ -0,0 +1,39 @@
+{
+ "vnf-id": "63b31229-9a3a-444f-9159-04ce2dca3be9",
+ "vnf-name": "vCPEInfraVNF13",
+ "vnf-type": "vCPEInfraService10/vCPEInfraService10 0",
+ "service-id": "e8cb8968-5411-478b-906a-f28747de72cd",
+ "prov-status": "PREPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "1504896046185",
+ "relationship-list": {
+ "relationship": [
+ {
+ "related-to": "service-instance",
+ "related-link": "/aai/v11/business/customers/customer/Demonstration3/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/e8feceb6-28ae-480a-bfbc-1985ce333526",
+ "relationship-data": [
+ {
+ "relationship-key": "customer.global-customer-id",
+ "relationship-value": "Demonstration3"
+ },
+ {
+ "relationship-key": "service-subscription.service-type",
+ "relationship-value": "vCPE"
+ },
+ {
+ "relationship-key": "service-instance.service-instance-id",
+ "relationship-value": "e8feceb6-28ae-480a-bfbc-1985ce333526"
+ }
+ ],
+ "related-to-property": [
+ {
+ "property-key": "service-instance.service-instance-name",
+ "property-value": "vCPEInfraSI13"
+ }
+ ]
+ }
+ ]
+ }
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/aai/aai_vserver_enrichment.json b/dcae-analytics-test/src/main/resources/data/json/aai/aai_vserver_enrichment.json
new file mode 100644
index 0000000..ce63b97
--- /dev/null
+++ b/dcae-analytics-test/src/main/resources/data/json/aai/aai_vserver_enrichment.json
@@ -0,0 +1,10 @@
+{
+ "vserver-id": "example-vserver-id-val-2",
+ "vserver-name": "example-vserver-name-val-2",
+ "vserver-name2": "example-vserver-name2-val-2",
+ "prov-status": "example-prov-status-val-2",
+ "vserver-selflink": "example-vserver-selflink-val-2",
+ "in-maint": true,
+ "is-closed-loop-disabled": true,
+ "resource-version": "1504912891060"
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/aai/aai_vserver_resource_data.json b/dcae-analytics-test/src/main/resources/data/json/aai/aai_vserver_resource_data.json
new file mode 100644
index 0000000..fc39037
--- /dev/null
+++ b/dcae-analytics-test/src/main/resources/data/json/aai/aai_vserver_resource_data.json
@@ -0,0 +1,8 @@
+{
+ "result-data": [
+ {
+ "resource-type": "vserver",
+ "resource-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/DFW/tenants/tenant/1031120/vservers/vserver/example-vserver-id-val-2"
+ }
+ ]
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/cef/cef_message.json b/dcae-analytics-test/src/main/resources/data/json/cef/cef_message.json
index e3be937..84773b4 100644
--- a/dcae-analytics-test/src/main/resources/data/json/cef/cef_message.json
+++ b/dcae-analytics-test/src/main/resources/data/json/cef/cef_message.json
@@ -1,76 +1,76 @@
-{
- "event": {
- "commonEventHeader": {
- "domain": "measurementsForVfScaling",
- "eventId": "UC1-SCL01081-1492639920787",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "lastEpochMicrosec": 1492639920787,
- "nfNamingCode": "ENBE",
- "priority": "Normal",
- "reportingEntityId": "",
- "reportingEntityName": "vtc2e7admn2",
- "sequence": 0,
- "sourceId": "SCL01081_9B_1",
- "sourceName": "SCL01081",
- "startEpochMicrosec": 1492639920787,
- "version": 3.0
- },
- "measurementsForVfScalingFields": {
- "additionalFields": [
- {
- "name": "software_version ",
- "value": "version1"
- },
- {
- "name": "vendor ",
- "value": "Ericsson "
- }
- ],
- "additionalMeasurements": [
- {
- "name": "OaaS_UC1_EricssonSleepingCell",
- "arrayOfFields": [
- {
- "name": "PMRAATTCBRA",
- "value": "1353"
- },
- {
- "name": "PMRASUCCCBRA",
- "value": "1351"
- },
- {
- "name": "PMCELLDOWNTIMEAUTO",
- "value": "0"
- },
- {
- "name": "PMCELLDOWNTIMEMAN",
- "value": "0"
- },
- {
- "name": "PMRRCCONNESTABATT",
- "value": "297"
- },
- {
- "name": "PMRRCCONNESTABSUCC",
- "value": "297"
- }
- ]
- }
- ],
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated" : 5000,
- "receivedBroadcastPacketsDelta" : 5,
- "receivedDiscardedPacketsAccumulated" : 12,
- "receivedDiscardedPacketsDelta" : 2,
- "receivedErrorPacketsAccumulated" : 2,
- "receivedErrorPacketsDelta" : 1,
- "valuesAreSuspect" : false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 900,
- "measurementsForVfScalingVersion": 2.0
- }
- }
-}
+{
+ "event": {
+ "commonEventHeader": {
+ "domain": "measurementsForVfScaling",
+ "eventId": "UC1-SCL01081-1492639920787",
+ "eventName": "Mfvs_eNodeB_RANKPI",
+ "lastEpochMicrosec": 1492639920787,
+ "nfNamingCode": "ENBE",
+ "priority": "Normal",
+ "reportingEntityId": "",
+ "reportingEntityName": "vtc2e7admn2",
+ "sequence": 0,
+ "sourceId": "SCL01081_9B_1",
+ "sourceName": "SCL01081",
+ "startEpochMicrosec": 1492639920787,
+ "version": 3.0
+ },
+ "measurementsForVfScalingFields": {
+ "additionalFields": [
+ {
+ "name": "software_version ",
+ "value": "version1"
+ },
+ {
+ "name": "vendor ",
+ "value": "Ericsson "
+ }
+ ],
+ "additionalMeasurements": [
+ {
+ "name": "OaaS_UC1_EricssonSleepingCell",
+ "arrayOfFields": [
+ {
+ "name": "PMRAATTCBRA",
+ "value": "1353"
+ },
+ {
+ "name": "PMRASUCCCBRA",
+ "value": "1351"
+ },
+ {
+ "name": "PMCELLDOWNTIMEAUTO",
+ "value": "0"
+ },
+ {
+ "name": "PMCELLDOWNTIMEMAN",
+ "value": "0"
+ },
+ {
+ "name": "PMRRCCONNESTABATT",
+ "value": "297"
+ },
+ {
+ "name": "PMRRCCONNESTABSUCC",
+ "value": "297"
+ }
+ ]
+ }
+ ],
+ "vNicPerformanceArray": [
+ {
+ "receivedBroadcastPacketsAccumulated" : 5000,
+ "receivedBroadcastPacketsDelta" : 5,
+ "receivedDiscardedPacketsAccumulated" : 12,
+ "receivedDiscardedPacketsDelta" : 2,
+ "receivedErrorPacketsAccumulated" : 2,
+ "receivedErrorPacketsDelta" : 1,
+ "valuesAreSuspect" : false,
+ "vNicIdentifier": "someVNicIdentifier"
+ }
+ ],
+ "measurementInterval": 900,
+ "measurementsForVfScalingVersion": 2.0
+ }
+ }
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/cef/cef_message_with_threshold_violation.json b/dcae-analytics-test/src/main/resources/data/json/cef/cef_message_with_threshold_violation.json
index 9dba3cd..8bd5e45 100644
--- a/dcae-analytics-test/src/main/resources/data/json/cef/cef_message_with_threshold_violation.json
+++ b/dcae-analytics-test/src/main/resources/data/json/cef/cef_message_with_threshold_violation.json
@@ -1,76 +1,76 @@
-{
- "event": {
- "commonEventHeader": {
- "domain": "measurementsForVfScaling",
- "eventId": "UC1-SCL01081-1492639920787",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "lastEpochMicrosec": 1492639920787,
- "nfNamingCode": "ENBE",
- "priority": "Normal",
- "reportingEntityId": "",
- "reportingEntityName": "vtc2e7admn2",
- "sequence": 0,
- "sourceId": "SCL01081_9B_1",
- "sourceName": "SCL01081",
- "startEpochMicrosec": 1492639920787,
- "version": 3.0
- },
- "measurementsForVfScalingFields": {
- "additionalFields": [
- {
- "name": "software_version ",
- "value": "version1"
- },
- {
- "name": "vendor ",
- "value": "Ericsson "
- }
- ],
- "additionalMeasurements": [
- {
- "name": "OaaS_UC1_EricssonSleepingCell",
- "arrayOfFields": [
- {
- "name": "PMRAATTCBRA",
- "value": "1353"
- },
- {
- "name": "PMRASUCCCBRA",
- "value": "1351"
- },
- {
- "name": "PMCELLDOWNTIMEAUTO",
- "value": "0"
- },
- {
- "name": "PMCELLDOWNTIMEMAN",
- "value": "0"
- },
- {
- "name": "PMRRCCONNESTABATT",
- "value": "297"
- },
- {
- "name": "PMRRCCONNESTABSUCC",
- "value": "297"
- }
- ]
- }
- ],
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated" : 21000,
- "receivedBroadcastPacketsDelta" : 5,
- "receivedDiscardedPacketsAccumulated" : 12,
- "receivedDiscardedPacketsDelta" : 2,
- "receivedErrorPacketsAccumulated" : 2,
- "receivedErrorPacketsDelta" : 1,
- "valuesAreSuspect" : false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 900,
- "measurementsForVfScalingVersion": 2.0
- }
- }
-}
+{
+ "event": {
+ "commonEventHeader": {
+ "domain": "measurementsForVfScaling",
+ "eventId": "UC1-SCL01081-1492639920787",
+ "eventName": "Mfvs_eNodeB_RANKPI",
+ "lastEpochMicrosec": 1492639920787,
+ "nfNamingCode": "ENBE",
+ "priority": "Normal",
+ "reportingEntityId": "",
+ "reportingEntityName": "vtc2e7admn2",
+ "sequence": 0,
+ "sourceId": "SCL01081_9B_1",
+ "sourceName": "SCL01081",
+ "startEpochMicrosec": 1492639920787,
+ "version": 3.0
+ },
+ "measurementsForVfScalingFields": {
+ "additionalFields": [
+ {
+ "name": "software_version ",
+ "value": "version1"
+ },
+ {
+ "name": "vendor ",
+ "value": "Ericsson "
+ }
+ ],
+ "additionalMeasurements": [
+ {
+ "name": "OaaS_UC1_EricssonSleepingCell",
+ "arrayOfFields": [
+ {
+ "name": "PMRAATTCBRA",
+ "value": "1353"
+ },
+ {
+ "name": "PMRASUCCCBRA",
+ "value": "1351"
+ },
+ {
+ "name": "PMCELLDOWNTIMEAUTO",
+ "value": "0"
+ },
+ {
+ "name": "PMCELLDOWNTIMEMAN",
+ "value": "0"
+ },
+ {
+ "name": "PMRRCCONNESTABATT",
+ "value": "297"
+ },
+ {
+ "name": "PMRRCCONNESTABSUCC",
+ "value": "297"
+ }
+ ]
+ }
+ ],
+ "vNicPerformanceArray": [
+ {
+ "receivedBroadcastPacketsAccumulated" : 21000,
+ "receivedBroadcastPacketsDelta" : 5,
+ "receivedDiscardedPacketsAccumulated" : 12,
+ "receivedDiscardedPacketsDelta" : 2,
+ "receivedErrorPacketsAccumulated" : 2,
+ "receivedErrorPacketsDelta" : 1,
+ "valuesAreSuspect" : false,
+ "vNicIdentifier": "someVNicIdentifier"
+ }
+ ],
+ "measurementInterval": 900,
+ "measurementsForVfScalingVersion": 2.0
+ }
+ }
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/cef/cef_messages.json b/dcae-analytics-test/src/main/resources/data/json/cef/cef_messages.json
index 26dfd63..5fbb955 100644
--- a/dcae-analytics-test/src/main/resources/data/json/cef/cef_messages.json
+++ b/dcae-analytics-test/src/main/resources/data/json/cef/cef_messages.json
@@ -1,33 +1,33 @@
-[
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"Name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/301:fclustr-301:FGroup-308:femto-34179","reportingEntityName":"1085190","startEpochMicrosec":1493393250722,"eventId":"UC2-BRHMALM02001-1493393250722","lastEpochMicrosec":1493393250722,"priority":"Normal","sequence":0,"sourceName":"BRHMALM02001","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4860","reportingEntityName":"75160","startEpochMicrosec":1493393250717,"eventId":"UC2-PTLDORM58217-1493393250717","lastEpochMicrosec":1493393250717,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58217","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-7558","reportingEntityName":"96140","startEpochMicrosec":1493393250712,"eventId":"UC2-PTLDORM58210-1493393250712","lastEpochMicrosec":1493393250712,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58210","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/203:fclustr-203:FGroup-310:femto-37457","reportingEntityName":"1373204","startEpochMicrosec":1493393250718,"eventId":"UC2-BSTNVTM06013-1493393250718","lastEpochMicrosec":1493393250718,"priority":"Normal","sequence":0,"sourceName":"BSTNVTM06013","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/203:fclustr-203:FGroup-223:femto-39355","reportingEntityName":"1060176","startEpochMicrosec":1493393250721,"eventId":"UC2-BSTNVTM06103-1493393250721","lastEpochMicrosec":1493393250721,"priority":"Normal","sequence":0,"sourceName":"BSTNVTM06103","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/158:fclustr-158:FGroup-28:femto-30166","reportingEntityName":"954175","startEpochMicrosec":1493393250720,"eventId":"UC2-PITBPAM38246-1493393250720","lastEpochMicrosec":1493393250720,"priority":"Normal","sequence":0,"sourceName":"PITBPAM38246","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/203:fclustr-203:FGroup-223:femto-33673","reportingEntityName":"1060173","startEpochMicrosec":1493393250723,"eventId":"UC2-BSTNVTM06066-1493393250723","lastEpochMicrosec":1493393250723,"priority":"Normal","sequence":0,"sourceName":"BSTNVTM06066","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/3:fclustr-3:FGroup-47:femto-34309","reportingEntityName":"1185198","startEpochMicrosec":1493393250724,"eventId":"UC2-SCRMCNM29032-1493393250724","lastEpochMicrosec":1493393250724,"priority":"Normal","sequence":0,"sourceName":"SCRMCNM29032","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4855","reportingEntityName":"75138","startEpochMicrosec":1493393250714,"eventId":"UC2-PTLDORM58212-1493393250714","lastEpochMicrosec":1493393250714,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58212","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-10466","reportingEntityName":"133734","startEpochMicrosec":1493393250715,"eventId":"UC2-PTLDORM58925-1493393250715","lastEpochMicrosec":1493393250715,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58925","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/201:fclustr-201:FGroup-218:femto-29721","reportingEntityName":"844171","startEpochMicrosec":1493393250719,"eventId":"UC2-NYCMNYM23031-1493393250719","lastEpochMicrosec":1493393250719,"priority":"Normal","sequence":0,"sourceName":"NYCMNYM23031","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4858","reportingEntityName":"75137","startEpochMicrosec":1493393250715,"eventId":"UC2-PTLDORM58215-1493393250715","lastEpochMicrosec":1493393250715,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58215","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4852","reportingEntityName":"75173","startEpochMicrosec":1493393250726,"eventId":"UC2-PTLDORM58014-1493393250726","lastEpochMicrosec":1493393250726,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58014","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/3:fclustr-3:FGroup-282:femto-36109","reportingEntityName":"1085174","startEpochMicrosec":1493393250725,"eventId":"UC2-SLKCUTM08059-1493393250725","lastEpochMicrosec":1493393250725,"priority":"Normal","sequence":0,"sourceName":"SLKCUTM08059","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/3:fclustr-3:FGroup-366:femto-37721","reportingEntityName":"1385173","startEpochMicrosec":1493393250720,"eventId":"UC2-SLKCUTM08083-1493393250720","lastEpochMicrosec":1493393250720,"priority":"Normal","sequence":0,"sourceName":"SLKCUTM08083","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/158:fclustr-158:FGroup-105:femto-33105","reportingEntityName":"1064173","startEpochMicrosec":1493393250722,"eventId":"UC2-STLSMOM29030-1493393250722","lastEpochMicrosec":1493393250722,"priority":"Normal","sequence":0,"sourceName":"STLSMOM29030","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/152:fclustr-152:FGroup-45:femto-8549","reportingEntityName":"165395","startEpochMicrosec":1493393250727,"eventId":"UC2-MILWWIM04202-1493393250727","lastEpochMicrosec":1493393250727,"priority":"Normal","sequence":0,"sourceName":"MILWWIM04202","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/3:fclustr-3:FGroup-42:femto-30554","reportingEntityName":"1304171","startEpochMicrosec":1493393250723,"eventId":"UC2-DNVRCOM04034-1493393250723","lastEpochMicrosec":1493393250723,"priority":"Normal","sequence":0,"sourceName":"DNVRCOM04034","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4856","reportingEntityName":"75139","startEpochMicrosec":1493393250714,"eventId":"UC2-PTLDORM58213-1493393250714","lastEpochMicrosec":1493393250714,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58213","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4862","reportingEntityName":"75158","startEpochMicrosec":1493393250718,"eventId":"UC2-PTLDORM58219-1493393250718","lastEpochMicrosec":1493393250718,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58219","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-9407","reportingEntityName":"114953","startEpochMicrosec":1493393250713,"eventId":"UC2-PTLDORM58211-1493393250713","lastEpochMicrosec":1493393250713,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58211","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/252:fclustr-252:FGroup-141:femto-36114","reportingEntityName":"1253171","startEpochMicrosec":1493393250721,"eventId":"UC2-BLTMMDM00025-1493393250721","lastEpochMicrosec":1493393250721,"priority":"Normal","sequence":0,"sourceName":"BLTMMDM00025","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4861","reportingEntityName":"75159","startEpochMicrosec":1493393250718,"eventId":"UC2-PTLDORM58218-1493393250718","lastEpochMicrosec":1493393250718,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58218","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/203:fclustr-203:FGroup-309:femto-37456","reportingEntityName":"1373227","startEpochMicrosec":1493393250717,"eventId":"UC2-BSTNVTM06011-1493393250717","lastEpochMicrosec":1493393250717,"priority":"Normal","sequence":0,"sourceName":"BSTNVTM06011","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4859","reportingEntityName":"75166","startEpochMicrosec":1493393250716,"eventId":"UC2-PTLDORM58216-1493393250716","lastEpochMicrosec":1493393250716,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58216","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/251:fclustr-251:FGroup-50:femto-11763","reportingEntityName":"165383","startEpochMicrosec":1493393250724,"eventId":"UC2-BLTMMDM00367-1493393250724","lastEpochMicrosec":1493393250724,"priority":"Normal","sequence":0,"sourceName":"BLTMMDM00367","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4857","reportingEntityName":"75142","startEpochMicrosec":1493393250714,"eventId":"UC2-PTLDORM58214-1493393250714","lastEpochMicrosec":1493393250714,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58214","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-10465","reportingEntityName":"133740","startEpochMicrosec":1493393250716,"eventId":"UC2-PTLDORM58924-1493393250716","lastEpochMicrosec":1493393250716,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58924","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/53:fclustr-53:FGroup-165:femto-32607","reportingEntityName":"977200","startEpochMicrosec":1493393250726,"eventId":"UC2-LSANCLM30038-1493393250726","lastEpochMicrosec":1493393250726,"priority":"Normal","sequence":0,"sourceName":"LSANCLM30038","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/53:fclustr-53:FGroup-165:femto-32555","reportingEntityName":"977174","startEpochMicrosec":1493393250725,"eventId":"UC2-LSANCLM30037-1493393250725","lastEpochMicrosec":1493393250725,"priority":"Normal","sequence":0,"sourceName":"LSANCLM30037","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
- {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-14:femto-5578","reportingEntityName":"70120","startEpochMicrosec":1493393250720,"eventId":"UC2-DNVRCOM04230-1493393250720","lastEpochMicrosec":1493393250720,"priority":"Normal","sequence":0,"sourceName":"DNVRCOM04230","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}}
-]
+[
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"Name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/301:fclustr-301:FGroup-308:femto-34179","reportingEntityName":"1085190","startEpochMicrosec":1493393250722,"eventId":"UC2-BRHMALM02001-1493393250722","lastEpochMicrosec":1493393250722,"priority":"Normal","sequence":0,"sourceName":"BRHMALM02001","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4860","reportingEntityName":"75160","startEpochMicrosec":1493393250717,"eventId":"UC2-PTLDORM58217-1493393250717","lastEpochMicrosec":1493393250717,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58217","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-7558","reportingEntityName":"96140","startEpochMicrosec":1493393250712,"eventId":"UC2-PTLDORM58210-1493393250712","lastEpochMicrosec":1493393250712,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58210","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/203:fclustr-203:FGroup-310:femto-37457","reportingEntityName":"1373204","startEpochMicrosec":1493393250718,"eventId":"UC2-BSTNVTM06013-1493393250718","lastEpochMicrosec":1493393250718,"priority":"Normal","sequence":0,"sourceName":"BSTNVTM06013","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/203:fclustr-203:FGroup-223:femto-39355","reportingEntityName":"1060176","startEpochMicrosec":1493393250721,"eventId":"UC2-BSTNVTM06103-1493393250721","lastEpochMicrosec":1493393250721,"priority":"Normal","sequence":0,"sourceName":"BSTNVTM06103","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/158:fclustr-158:FGroup-28:femto-30166","reportingEntityName":"954175","startEpochMicrosec":1493393250720,"eventId":"UC2-PITBPAM38246-1493393250720","lastEpochMicrosec":1493393250720,"priority":"Normal","sequence":0,"sourceName":"PITBPAM38246","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/203:fclustr-203:FGroup-223:femto-33673","reportingEntityName":"1060173","startEpochMicrosec":1493393250723,"eventId":"UC2-BSTNVTM06066-1493393250723","lastEpochMicrosec":1493393250723,"priority":"Normal","sequence":0,"sourceName":"BSTNVTM06066","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/3:fclustr-3:FGroup-47:femto-34309","reportingEntityName":"1185198","startEpochMicrosec":1493393250724,"eventId":"UC2-SCRMCNM29032-1493393250724","lastEpochMicrosec":1493393250724,"priority":"Normal","sequence":0,"sourceName":"SCRMCNM29032","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4855","reportingEntityName":"75138","startEpochMicrosec":1493393250714,"eventId":"UC2-PTLDORM58212-1493393250714","lastEpochMicrosec":1493393250714,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58212","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-10466","reportingEntityName":"133734","startEpochMicrosec":1493393250715,"eventId":"UC2-PTLDORM58925-1493393250715","lastEpochMicrosec":1493393250715,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58925","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/201:fclustr-201:FGroup-218:femto-29721","reportingEntityName":"844171","startEpochMicrosec":1493393250719,"eventId":"UC2-NYCMNYM23031-1493393250719","lastEpochMicrosec":1493393250719,"priority":"Normal","sequence":0,"sourceName":"NYCMNYM23031","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4858","reportingEntityName":"75137","startEpochMicrosec":1493393250715,"eventId":"UC2-PTLDORM58215-1493393250715","lastEpochMicrosec":1493393250715,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58215","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4852","reportingEntityName":"75173","startEpochMicrosec":1493393250726,"eventId":"UC2-PTLDORM58014-1493393250726","lastEpochMicrosec":1493393250726,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58014","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/3:fclustr-3:FGroup-282:femto-36109","reportingEntityName":"1085174","startEpochMicrosec":1493393250725,"eventId":"UC2-SLKCUTM08059-1493393250725","lastEpochMicrosec":1493393250725,"priority":"Normal","sequence":0,"sourceName":"SLKCUTM08059","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/3:fclustr-3:FGroup-366:femto-37721","reportingEntityName":"1385173","startEpochMicrosec":1493393250720,"eventId":"UC2-SLKCUTM08083-1493393250720","lastEpochMicrosec":1493393250720,"priority":"Normal","sequence":0,"sourceName":"SLKCUTM08083","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/158:fclustr-158:FGroup-105:femto-33105","reportingEntityName":"1064173","startEpochMicrosec":1493393250722,"eventId":"UC2-STLSMOM29030-1493393250722","lastEpochMicrosec":1493393250722,"priority":"Normal","sequence":0,"sourceName":"STLSMOM29030","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/152:fclustr-152:FGroup-45:femto-8549","reportingEntityName":"165395","startEpochMicrosec":1493393250727,"eventId":"UC2-MILWWIM04202-1493393250727","lastEpochMicrosec":1493393250727,"priority":"Normal","sequence":0,"sourceName":"MILWWIM04202","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/3:fclustr-3:FGroup-42:femto-30554","reportingEntityName":"1304171","startEpochMicrosec":1493393250723,"eventId":"UC2-DNVRCOM04034-1493393250723","lastEpochMicrosec":1493393250723,"priority":"Normal","sequence":0,"sourceName":"DNVRCOM04034","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4856","reportingEntityName":"75139","startEpochMicrosec":1493393250714,"eventId":"UC2-PTLDORM58213-1493393250714","lastEpochMicrosec":1493393250714,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58213","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4862","reportingEntityName":"75158","startEpochMicrosec":1493393250718,"eventId":"UC2-PTLDORM58219-1493393250718","lastEpochMicrosec":1493393250718,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58219","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-9407","reportingEntityName":"114953","startEpochMicrosec":1493393250713,"eventId":"UC2-PTLDORM58211-1493393250713","lastEpochMicrosec":1493393250713,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58211","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/252:fclustr-252:FGroup-141:femto-36114","reportingEntityName":"1253171","startEpochMicrosec":1493393250721,"eventId":"UC2-BLTMMDM00025-1493393250721","lastEpochMicrosec":1493393250721,"priority":"Normal","sequence":0,"sourceName":"BLTMMDM00025","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4861","reportingEntityName":"75159","startEpochMicrosec":1493393250718,"eventId":"UC2-PTLDORM58218-1493393250718","lastEpochMicrosec":1493393250718,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58218","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/203:fclustr-203:FGroup-309:femto-37456","reportingEntityName":"1373227","startEpochMicrosec":1493393250717,"eventId":"UC2-BSTNVTM06011-1493393250717","lastEpochMicrosec":1493393250717,"priority":"Normal","sequence":0,"sourceName":"BSTNVTM06011","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4859","reportingEntityName":"75166","startEpochMicrosec":1493393250716,"eventId":"UC2-PTLDORM58216-1493393250716","lastEpochMicrosec":1493393250716,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58216","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/251:fclustr-251:FGroup-50:femto-11763","reportingEntityName":"165383","startEpochMicrosec":1493393250724,"eventId":"UC2-BLTMMDM00367-1493393250724","lastEpochMicrosec":1493393250724,"priority":"Normal","sequence":0,"sourceName":"BLTMMDM00367","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-4857","reportingEntityName":"75142","startEpochMicrosec":1493393250714,"eventId":"UC2-PTLDORM58214-1493393250714","lastEpochMicrosec":1493393250714,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58214","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-70:femto-10465","reportingEntityName":"133740","startEpochMicrosec":1493393250716,"eventId":"UC2-PTLDORM58924-1493393250716","lastEpochMicrosec":1493393250716,"priority":"Normal","sequence":0,"sourceName":"PTLDORM58924","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/53:fclustr-53:FGroup-165:femto-32607","reportingEntityName":"977200","startEpochMicrosec":1493393250726,"eventId":"UC2-LSANCLM30038-1493393250726","lastEpochMicrosec":1493393250726,"priority":"Normal","sequence":0,"sourceName":"LSANCLM30038","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/53:fclustr-53:FGroup-165:femto-32555","reportingEntityName":"977174","startEpochMicrosec":1493393250725,"eventId":"UC2-LSANCLM30037-1493393250725","lastEpochMicrosec":1493393250725,"priority":"Normal","sequence":0,"sourceName":"LSANCLM30037","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}},
+ {"event":{"measurementsForVfScalingFields":{"measurementInterval":600,"additionalMeasurements":[{"arrayOfFields":[{"name":"BS_Reset_Needed","value":"1"}],"name":"OaaS_UC2_ALUMetrocellBackhaul"}],"measurementsForVfScalingVersion":2.0,"additionalFields":[{"name":"software_version","value":""},{"name":"vendor","value":"ALU"},{"name":"datetime","value":""}]},"commonEventHeader":{"nfNamingCode":"MEAP","version":3.0,"sourceId":"network:FemtoCluster\/1:fclustr-1:FGroup-14:femto-5578","reportingEntityName":"70120","startEpochMicrosec":1493393250720,"eventId":"UC2-DNVRCOM04230-1493393250720","lastEpochMicrosec":1493393250720,"priority":"Normal","sequence":0,"sourceName":"DNVRCOM04230","domain":"measurementsForVfScaling","eventName":"Mfvs_eNodeB_RANKPI","reportingEntityId":""}}}
+]
diff --git a/dcae-analytics-test/src/main/resources/data/json/config/controller_app_config.json b/dcae-analytics-test/src/main/resources/data/json/config/controller_app_config.json
index 0a82d6b..5e82344 100644
--- a/dcae-analytics-test/src/main/resources/data/json/config/controller_app_config.json
+++ b/dcae-analytics-test/src/main/resources/data/json/config/controller_app_config.json
@@ -1,33 +1,33 @@
-{
- "appName":"dcae-tca",
- "appDescription": "DCAE Analytics Threshold Crossing Alert Application",
- "tcaVESMessageStatusTableName": "TCAVESMessageStatusTable",
- "tcaVESMessageStatusTableTTLSeconds": 86400.0,
- "tcaAlertsAbatementTableName": "TCAAlertsAbatementTable",
- "tcaAlertsAbatementTableTTLSeconds": 1728000.0,
- "tcaVESAlertsTableName": "TCAVESAlertsTable",
- "tcaVESAlertsTableTTLSeconds": 1728000.0,
- "thresholdCalculatorFlowletInstances": 2.0,
- "tcaSubscriberOutputStreamName": "TCASubscriberOutputStream",
- "services_calls": {},
- "streams_publishes":{
- "tca_handle_out":{
- "type": "message_router",
- "aaf_username": "USER",
- "aaf_password":"PASSWORD",
- "dmaap_info": {
- "topic_url": "https://HOSTNAME:3905/events/com.att.dcae.dmaap.mtnje2.DcaeTestVESPub"
- }
- }
- },
- "streams_subscribes":{
- "tca_handle_in":{
- "type": "message_router",
- "aaf_username": "USER",
- "aaf_password":"PASSWORD",
- "dmaap_info":{
- "topic_url":"https://HOSTNAME:3905/events/com.att.dcae.dmaap.mtnje2.DcaeTestVESSub"
- }
- }
- }
-}
+{
+ "appName":"dcae-tca",
+ "appDescription": "DCAE Analytics Threshold Crossing Alert Application",
+ "tcaVESMessageStatusTableName": "TCAVESMessageStatusTable",
+ "tcaVESMessageStatusTableTTLSeconds": 86400.0,
+ "tcaAlertsAbatementTableName": "TCAAlertsAbatementTable",
+ "tcaAlertsAbatementTableTTLSeconds": 1728000.0,
+ "tcaVESAlertsTableName": "TCAVESAlertsTable",
+ "tcaVESAlertsTableTTLSeconds": 1728000.0,
+ "thresholdCalculatorFlowletInstances": 2.0,
+ "tcaSubscriberOutputStreamName": "TCASubscriberOutputStream",
+ "services_calls": {},
+ "streams_publishes":{
+ "tca_handle_out":{
+ "type": "message_router",
+ "aaf_username": "USER",
+ "aaf_password":"PASSWORD",
+ "dmaap_info": {
+ "topic_url": "https://HOSTNAME:3905/events/com.att.dcae.dmaap.mtnje2.DcaeTestVESPub"
+ }
+ }
+ },
+ "streams_subscribes":{
+ "tca_handle_in":{
+ "type": "message_router",
+ "aaf_username": "USER",
+ "aaf_password":"PASSWORD",
+ "dmaap_info":{
+ "topic_url":"https://HOSTNAME:3905/events/com.att.dcae.dmaap.mtnje2.DcaeTestVESSub"
+ }
+ }
+ }
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/config/invalidJsonConfig.json b/dcae-analytics-test/src/main/resources/data/json/config/invalidJsonConfig.json
index b706da0..742e263 100644
--- a/dcae-analytics-test/src/main/resources/data/json/config/invalidJsonConfig.json
+++ b/dcae-analytics-test/src/main/resources/data/json/config/invalidJsonConfig.json
@@ -1,6 +1,6 @@
-{
- "config": {
- "appName": "TestAppName",
- "appDescription": "Test App Description",
- }
-}
+{
+ "config": {
+ "appName": "TestAppName",
+ "appDescription": "Test App Description",
+ }
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/config/testAppConfig.json b/dcae-analytics-test/src/main/resources/data/json/config/testAppConfig.json
index cdad420..45e6523 100644
--- a/dcae-analytics-test/src/main/resources/data/json/config/testAppConfig.json
+++ b/dcae-analytics-test/src/main/resources/data/json/config/testAppConfig.json
@@ -1,6 +1,6 @@
-{
- "config": {
- "appName": "TestAppName",
- "appDescription": "Test App Description"
- }
-}
+{
+ "config": {
+ "appName": "TestAppName",
+ "appDescription": "Test App Description"
+ }
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/facade/tca_ves_cef_response.json b/dcae-analytics-test/src/main/resources/data/json/facade/tca_ves_cef_response.json
index 98135ec..7058876 100644
--- a/dcae-analytics-test/src/main/resources/data/json/facade/tca_ves_cef_response.json
+++ b/dcae-analytics-test/src/main/resources/data/json/facade/tca_ves_cef_response.json
@@ -1,18 +1,18 @@
-{
- "closedLoopControlName": "CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8",
- "version": "1.0.2",
- "requestID": "0138afac-b032-4e4b-bd30-88260f444888",
- "closedLoopAlarmStart": 1478189220547,
- "closedLoopEventClient": "tca.instance00001",
- "target_type": "VNF",
- "target": "generic-vnf.vnf-id",
- "AAI": {
- "generic-vnf.vnf-id" : "vpp-test(?)",
- "vserver.vserver-name": "dfw1lb01lb01"
- },
- "from": "DCAE",
- "policyScope": "resource=vFirewall;type=configuration",
- "policyName": "configuration.dcae.microservice.tca.xml",
- "policyVersion": "v0.0.1",
- "closedLoopEventStatus": "ONSET"
-}
+{
+ "closedLoopControlName": "CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8",
+ "version": "1.0.2",
+ "requestID": "0138afac-b032-4e4b-bd30-88260f444888",
+ "closedLoopAlarmStart": 1478189220547,
+ "closedLoopEventClient": "tca.instance00001",
+ "target_type": "VNF",
+ "target": "generic-vnf.vnf-id",
+ "AAI": {
+ "generic-vnf.vnf-id" : "vpp-test(?)",
+ "vserver.vserver-name": "dfw1lb01lb01"
+ },
+ "from": "DCAE",
+ "policyScope": "resource=vFirewall;type=configuration",
+ "policyName": "configuration.dcae.microservice.tca.xml",
+ "policyVersion": "v0.0.1",
+ "closedLoopEventStatus": "ONSET"
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/policy/tca_policy.json b/dcae-analytics-test/src/main/resources/data/json/policy/tca_policy.json
index c5ab94c..f1b9ebd 100644
--- a/dcae-analytics-test/src/main/resources/data/json/policy/tca_policy.json
+++ b/dcae-analytics-test/src/main/resources/data/json/policy/tca_policy.json
@@ -1,68 +1,86 @@
-{
- "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"
- }
- ]
- }
- ]
-}
+{
+ "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"
+ }
+ ]
+ }
+ ]
+}
diff --git a/dcae-analytics-test/src/main/resources/data/json/tca/ves_mock_messages.json b/dcae-analytics-test/src/main/resources/data/json/tca/ves_mock_messages.json
deleted file mode 100644
index 9d3b408..0000000
--- a/dcae-analytics-test/src/main/resources/data/json/tca/ves_mock_messages.json
+++ /dev/null
@@ -1,353 +0,0 @@
-[
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 5000,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- },
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 4000,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- },
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 3999,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- },
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 19999,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- },
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 20000,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- },
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 20001,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- },
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 0,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- },
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 0,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- },
-
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 20001,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- },
- {
- "event": {
- "measurementsForVfScalingFields": {
- "vNicPerformanceArray": [
- {
- "receivedBroadcastPacketsAccumulated": 0,
- "receivedBroadcastPacketsDelta": 5,
- "receivedDiscardedPacketsAccumulated": 12,
- "receivedDiscardedPacketsDelta": 2,
- "receivedErrorPacketsAccumulated": 2,
- "receivedErrorPacketsDelta": 1,
- "valuesAreSuspect": false,
- "vNicIdentifier": "someVNicIdentifier"
- }
- ],
- "measurementInterval": 600,
- "measurementsForVfScalingVersion": 2.0
- },
- "commonEventHeader": {
- "nfNamingCode": "MEAP",
- "version": 3.0,
- "sourceId": "network1",
- "reportingEntityName": "1085190",
- "startEpochMicrosec": 1493393250722,
- "eventId": "UC22",
- "lastEpochMicrosec": 1493393250722,
- "priority": "Normal",
- "sequence": 0,
- "sourceName": "BRHMALM02001",
- "domain": "measurementsForVfScaling",
- "eventName": "Mfvs_eNodeB_RANKPI",
- "reportingEntityId": ""
- }
- }
- }
-]
diff --git a/dcae-analytics-test/src/main/resources/data/properties/quartz-test.properties b/dcae-analytics-test/src/main/resources/data/properties/quartz-test.properties
index d4ad8f3..e684ef2 100644
--- a/dcae-analytics-test/src/main/resources/data/properties/quartz-test.properties
+++ b/dcae-analytics-test/src/main/resources/data/properties/quartz-test.properties
@@ -1,24 +1,24 @@
-#
-# ===============================LICENSE_START======================================
-# dcae-analytics
-# ================================================================================
-# Copyright © 2017 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===========================================
-#
-
-org.quartz.scheduler.instanceName=TCA_DMaaPMRPublisher_Scheduler
-org.quartz.threadPool.threadCount=3
-org.quartz.jobStore.class=org.quartz.simpl.RAMJobStore
-org.quartz.scheduler.skipUpdateCheck=true
+#
+# ===============================LICENSE_START======================================
+# dcae-analytics
+# ================================================================================
+# Copyright © 2017 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===========================================
+#
+
+org.quartz.scheduler.instanceName=TCA_DMaaPMRPublisher_Scheduler
+org.quartz.threadPool.threadCount=3
+org.quartz.jobStore.class=org.quartz.simpl.RAMJobStore
+org.quartz.scheduler.skipUpdateCheck=true
diff --git a/dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy.properties b/dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy.properties
index 7f9ff20..5465488 100644
--- a/dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy.properties
+++ b/dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy.properties
@@ -1,78 +1,78 @@
-#
-# ===============================LICENSE_START======================================
-# dcae-analytics
-# ================================================================================
-# Copyright © 2017 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===========================================
-#
-
-
-subscriberContentType=application/json
-subscriberConsumerId=c12
-subscriberConsumerGroup=OpenDCAE-c12
-subscriberTimeoutMS=-1
-subscriberMessageLimit=-1
-subscriberPollingInterval=20000
-publisherContentType=application/json
-publisherMaxBatchSize=10
-publisherMaxRecoveryQueueSize=100000
-publisherPollingInterval=20000
-enableAlertCEFFormat=false
-
-domain=measurementsForVfScaling
-
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.policy.eventName=Mfvs_eNodeB_RANKPI
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.policyName=configuration.dcae.microservice.tca.xml
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.policyVersion=v0.0.1
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.policyScope=resource=Mfvs_eNodeB_RANKPI;type=configuration
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.closedLoopControlName=VNF
-
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.closedLoopControlName=CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.thresholdValue=4000
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.direction=LESS_OR_EQUAL
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.severity=MAJOR
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.version=1.0.2
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.closedLoopEventStatus=ONSET
-
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.closedLoopControlName=L-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.thresholdValue=20000
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.direction=GREATER_OR_EQUAL
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.severity=CRITICAL
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.version=1.0.2
-configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.closedLoopEventStatus=ONSET
-
-configuration.metricsPerEventName.vLoadBalancer.policy.eventName=vLoadBalancer
-configuration.metricsPerEventName.vLoadBalancer.policyName=configuration.dcae.microservice.tca.xml
-configuration.metricsPerEventName.vLoadBalancer.policyVersion=v0.0.1
-configuration.metricsPerEventName.vLoadBalancer.policyScope=resource=vLoadBalancer;type=configuration
-configuration.metricsPerEventName.vLoadBalancer.closedLoopControlName=VNF
-
-configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.closedLoopControlName=CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A
-configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.thresholdValue=500
-configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.direction=LESS_OR_EQUAL
-configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.severity=MAJOR
-configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.version=1.0.2
-configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.closedLoopEventStatus=ONSET
-
-configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.closedLoopControlName=CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B
-configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.thresholdValue=5000
-configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.direction=GREATER_OR_EQUAL
-configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.severity=CRITICAL
-configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.version=1.0.2
-configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.closedLoopEventStatus=ONSET
+#
+# ===============================LICENSE_START======================================
+# dcae-analytics
+# ================================================================================
+# Copyright © 2017 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===========================================
+#
+
+
+subscriberContentType=application/json
+subscriberConsumerId=c12
+subscriberConsumerGroup=OpenDCAE-c12
+subscriberTimeoutMS=-1
+subscriberMessageLimit=-1
+subscriberPollingInterval=20000
+publisherContentType=application/json
+publisherMaxBatchSize=10
+publisherMaxRecoveryQueueSize=100000
+publisherPollingInterval=20000
+enableAlertCEFFormat=false
+
+domain=measurementsForVfScaling
+
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.policy.eventName=Mfvs_eNodeB_RANKPI
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.policyName=configuration.dcae.microservice.tca.xml
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.policyVersion=v0.0.1
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.policyScope=resource=Mfvs_eNodeB_RANKPI;type=configuration
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.controlLoopSchemaType=VNF
+
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.closedLoopControlName=CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.thresholdValue=4000
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.direction=LESS_OR_EQUAL
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.severity=MAJOR
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.version=1.0.2
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.0.policy.closedLoopEventStatus=ONSET
+
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.closedLoopControlName=L-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.thresholdValue=20000
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.direction=GREATER_OR_EQUAL
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.severity=CRITICAL
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.version=1.0.2
+configuration.metricsPerEventName.Mfvs_eNodeB_RANKPI.thresholds.1.policy.closedLoopEventStatus=ONSET
+
+configuration.metricsPerEventName.vLoadBalancer.policy.eventName=vLoadBalancer
+configuration.metricsPerEventName.vLoadBalancer.policyName=configuration.dcae.microservice.tca.xml
+configuration.metricsPerEventName.vLoadBalancer.policyVersion=v0.0.1
+configuration.metricsPerEventName.vLoadBalancer.policyScope=resource=vLoadBalancer;type=configuration
+configuration.metricsPerEventName.vLoadBalancer.controlLoopSchemaType=VNF
+
+configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.closedLoopControlName=CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A
+configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
+configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.thresholdValue=500
+configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.direction=LESS_OR_EQUAL
+configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.severity=MAJOR
+configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.version=1.0.2
+configuration.metricsPerEventName.vLoadBalancer.thresholds.0.policy.closedLoopEventStatus=ONSET
+
+configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.closedLoopControlName=CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B
+configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.fieldPath=$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
+configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.thresholdValue=5000
+configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.direction=GREATER_OR_EQUAL
+configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.severity=CRITICAL
+configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.version=1.0.2
+configuration.metricsPerEventName.vLoadBalancer.thresholds.1.policy.closedLoopEventStatus=ONSET
diff --git a/dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy_from_json.properties b/dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy_from_json.properties
index 1a8034b..92354f5 100644
--- a/dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy_from_json.properties
+++ b/dcae-analytics-test/src/main/resources/data/properties/tca_controller_policy_from_json.properties
@@ -1,37 +1,47 @@
-# ============LICENSE_START=========================================================
-# dcae-analytics
-# ================================================================================
-# Copyright © 2017 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=========================================================
-#
-
-subscriberContentType=application/json
-subscriberConsumerId=c12
-subscriberConsumerGroup=OpenDCAE-c12
-subscriberTimeoutMS=-1
-subscriberMessageLimit=-1
-subscriberPollingInterval=20000
-
-publisherContentType=application/json
-publisherMaxBatchSize=10
-publisherMaxRecoveryQueueSize=100000
-publisherPollingInterval=20000
-enableAlertCEFFormat=false
-
-tca_policy={\"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\"}]},{\"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\"}]}]}
-
-
-
-
+#
+# ===============================LICENSE_START======================================
+# dcae-analytics
+# ================================================================================
+# Copyright © 2017 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===========================================
+#
+
+subscriberContentType=application/json
+subscriberConsumerId=c12
+subscriberConsumerGroup=OpenDCAE-c12
+subscriberTimeoutMS=-1
+subscriberMessageLimit=-1
+subscriberPollingInterval=20000
+
+publisherContentType=application/json
+publisherMaxBatchSize=10
+publisherMaxRecoveryQueueSize=100000
+publisherPollingInterval=20000
+enableAlertCEFFormat=false
+
+enableAAIEnrichment=true
+aaiEnrichmentHost=209.61.160.97
+aaiEnrichmentPortNumber=8443
+aaiEnrichmentProtocol=https
+aaiEnrichmentUserName=DCAE
+aaiEnrichmentUserPassword=DCAE
+aaiEnrichmentIgnoreSSLCertificateErrors=true
+aaiVNFEnrichmentAPIPath=/aai/v11/network/generic-vnfs/generic-vnf
+aaiVMEnrichmentAPIPath=/aai/v11/search/nodes-query
+
+aaiEnrichmentProxyURL=http://username:password@proxyhost.com:8080
+
+tca_policy={\"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\"}]},{\"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\"}]}]}
+
diff --git a/dcae-analytics-test/src/main/resources/data/properties/testApp.properties b/dcae-analytics-test/src/main/resources/data/properties/testApp.properties
index 0161060..c9c02e6 100644
--- a/dcae-analytics-test/src/main/resources/data/properties/testApp.properties
+++ b/dcae-analytics-test/src/main/resources/data/properties/testApp.properties
@@ -1,22 +1,22 @@
-#
-# ===============================LICENSE_START======================================
-# dcae-analytics
-# ================================================================================
-# Copyright © 2017 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===========================================
-#
-
-testProp1="testPropValue1"
-testProp2="testPropValue2"
+#
+# ===============================LICENSE_START======================================
+# dcae-analytics
+# ================================================================================
+# Copyright © 2017 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===========================================
+#
+
+testProp1="testPropValue1"
+testProp2="testPropValue2"
diff --git a/dcae-analytics-test/src/main/resources/logback-test.xml b/dcae-analytics-test/src/main/resources/logback-test.xml
index 68d2f3d..4857522 100644
--- a/dcae-analytics-test/src/main/resources/logback-test.xml
+++ b/dcae-analytics-test/src/main/resources/logback-test.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ ===============================LICENSE_START======================================
- ~ dcae-analytics
- ~ ================================================================================
- ~ Copyright © 2017 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===========================================
- -->
-<configuration debug="false">
-
- <!--
- Disabling some chatty loggers.
- -->
- <logger name="org.apache.commons.beanutils" level="ERROR"/>
- <logger name="org.apache.zookeeper.server" level="ERROR"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="com.ning" level="WARN"/>
- <logger name="org.apache.spark" level="WARN"/>
- <logger name="org.spark-project" level="WARN"/>
- <logger name="org.apache.hadoop" level="WARN"/>
- <logger name="org.apache.hive" level="WARN"/>
- <logger name="org.quartz.core" level="WARN"/>
- <logger name="org.eclipse.jetty" level="WARN"/>
- <logger name="io.netty.util.internal" level="WARN"/>
-
- <logger name="org.apache.twill" level="WARN"/>
- <logger name="co.cask.cdap" level="INFO"/>
- <logger name="org.openecomp.dcae.apod.analytics" level="DEBUG"/>
-
- <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n</pattern>
- </encoder>
- </appender>
-
- <root level="ERROR">
- <appender-ref ref="Console"/>
- </root>
-
-
-</configuration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ ===============================LICENSE_START======================================
+ ~ dcae-analytics
+ ~ ================================================================================
+ ~ Copyright © 2017 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===========================================
+ -->
+<configuration debug="false">
+
+ <!--
+ Disabling some chatty loggers.
+ -->
+ <logger name="org.apache.commons.beanutils" level="ERROR"/>
+ <logger name="org.apache.zookeeper.server" level="ERROR"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="com.ning" level="WARN"/>
+ <logger name="org.apache.spark" level="WARN"/>
+ <logger name="org.spark-project" level="WARN"/>
+ <logger name="org.apache.hadoop" level="WARN"/>
+ <logger name="org.apache.hive" level="WARN"/>
+ <logger name="org.quartz.core" level="WARN"/>
+ <logger name="org.eclipse.jetty" level="WARN"/>
+ <logger name="io.netty.util.internal" level="WARN"/>
+
+ <logger name="org.apache.twill" level="WARN"/>
+ <logger name="co.cask.cdap" level="INFO"/>
+ <logger name="org.openecomp.dcae.apod.analytics" level="DEBUG"/>
+
+ <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="ERROR">
+ <appender-ref ref="Console"/>
+ </root>
+
+
+</configuration>
+