aboutsummaryrefslogtreecommitdiffstats
path: root/dcae-analytics-model
diff options
context:
space:
mode:
authorLisa Revel <lr0306@att.com>2017-02-20 19:15:19 +0000
committerLisa Revel <lr0306@att.com>2017-02-20 19:59:27 +0000
commite37de6e66c5cc554384a1f27f68f4d27962fe15d (patch)
treed39b5eba26f98a54cc9bae303ff9959909931e5f /dcae-analytics-model
parentaa823a95745de3c42f306609a044e8c9ff459c98 (diff)
Re-add source from correct branch
Change-Id: I515f8378ea1d2baf0aa2434ec46272f1b5bdb229 Signed-off-by: Lisa Revel <lr0306@att.com>
Diffstat (limited to 'dcae-analytics-model')
-rw-r--r--dcae-analytics-model/pom.xml4
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DCAEAnalyticsModel.java28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DynamicPropertiesProvider.java41
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertAction.java28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertType.java41
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/BaseCEFModel.java37
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CEFModel.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Criticality.java27
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventListener.java42
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverity.java32
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/MeasurementsForVfScalingFields.java53
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Priority.java28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/PolicyModel.java29
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java33
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Direction.java52
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicy.java55
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicyModel.java31
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/FacadeModel.java29
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/AAI.java34
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAFacadeModel.java27
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAVESResponse.java45
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/CommonEventFormatModule.java80
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAFacadeModelModule.java45
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAPolicyModule.java57
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java41
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/JsonMixin.java27
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertActionMixin.java26
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixin.java57
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java29
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java23
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CriticalityMixin.java26
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixin.java27
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventMixin.java27
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventSeverityMixin.java26
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java35
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java25
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PriorityMixin.java26
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java25
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java32
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/AAIMixin.java50
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java52
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java26
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java26
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java24
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java24
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java24
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/BaseDynamicPropertiesProvider.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/BaseDynamicPropertiesProvider.java)28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DCAEAnalyticsModel.java32
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DynamicPropertiesProvider.java45
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertAction.java32
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertType.java45
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/BaseCEFModel.java41
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CEFModel.java34
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CommonEventHeader.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CommonEventHeader.java)28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Criticality.java31
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Event.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Event.java)28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventListener.java46
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverity.java36
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/MeasurementsForVfScalingFields.java57
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/PerformanceCounter.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/PerformanceCounter.java)28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Priority.java32
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/ThresholdCrossingAlertFields.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/ThresholdCrossingAlertFields.java)28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/VNicUsageArray.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/VNicUsageArray.java)28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/PolicyModel.java33
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java37
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java56
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java)28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicy.java59
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicyModel.java35
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Threshold.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Threshold.java)30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/FacadeModel.java33
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java38
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAFacadeModel.java31
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponse.java49
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtils.java)28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelJsonUtils.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelJsonUtils.java)30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java)28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/CommonEventFormatModule.java84
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAFacadeModelModule.java49
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAPolicyModule.java61
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java45
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/JsonMixin.java31
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertActionMixin.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixin.java61
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java33
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java27
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CriticalityMixin.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixin.java31
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventMixin.java31
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventSeverityMixin.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java39
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java29
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PriorityMixin.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java29
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java36
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java54
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java56
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java28
-rw-r--r--dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java (renamed from dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/BaseAnalyticsModelUnitTest.java)6
-rw-r--r--dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverityTest.java (renamed from dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverityTest.java)4
-rw-r--r--dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java (renamed from dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtilsTest.java)4
-rw-r--r--dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/ConfigHolder.java (renamed from dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/ConfigHolder.java)2
-rw-r--r--dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java (renamed from dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/TestAppConfig.java)2
-rw-r--r--dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java (renamed from dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java)6
-rw-r--r--dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java (renamed from dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java)10
-rw-r--r--dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java (renamed from dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java)6
-rw-r--r--dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java (renamed from dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java)6
111 files changed, 1965 insertions, 1741 deletions
diff --git a/dcae-analytics-model/pom.xml b/dcae-analytics-model/pom.xml
index 58e1da8..5633267 100644
--- a/dcae-analytics-model/pom.xml
+++ b/dcae-analytics-model/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.dcae.analytics</groupId>
+ <groupId>org.openecomp.dcae.apod.analytics</groupId>
<artifactId>dcae-analytics</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -104,7 +104,7 @@
<!-- TEST DEPENDENCIES -->
<dependency>
- <groupId>org.openecomp.dcae.analytics</groupId>
+ <groupId>org.openecomp.dcae.apod.analytics</groupId>
<artifactId>dcae-analytics-test</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DCAEAnalyticsModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DCAEAnalyticsModel.java
deleted file mode 100644
index 79650b5..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DCAEAnalyticsModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * Marker Interface for all DCAE Analytics Model implementations
- * </p>
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public interface DCAEAnalyticsModel extends Serializable {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DynamicPropertiesProvider.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DynamicPropertiesProvider.java
deleted file mode 100644
index 55eef6b..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DynamicPropertiesProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain;
-
-import java.util.Map;
-
-/**
- * <p>
- * Problem: Many Entities have dynamic properties as well as known properties.
- * Known properites can be binded explicitly with all dynamic properties need
- * to be captured also ensuring that there must not be any loss in information
- * during deserialization / serialization process.
- * </p>
- * <p>
- * This contract allows the deserialization mechanism to catch those dynamic properties
- * in a Map so that deserialization mechanism will not loose any information and
- * can be serialized back with no loss in dynamic properties information
- * </p>
- * @author Rajiv Singla. Creation Date: 10/18/2016.
- */
-public interface DynamicPropertiesProvider extends DCAEAnalyticsModel {
-
-
- void addDynamicProperties(String propertyName, Object propertyValue);
-
- Map<String, Object> getDynamicProperties();
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertAction.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertAction.java
deleted file mode 100644
index a0e68f3..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertAction.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.cef;
-
-/**
- * Common Event Format Alert Action
- *
- * @author Rajiv Singla. Creation Date: 11/3/2016.
- */
-public enum AlertAction implements CEFModel {
-
- CLEAR, CONT, SET;
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertType.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertType.java
deleted file mode 100644
index 2dcce07..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.cef;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/3/2016.
- */
-public enum AlertType implements CEFModel {
-
- CARD_ANOMALY("CARD-ANOMALY"),
- ELEMENT_ANOMALY("ELEMENT-ANOMALY"),
- INTERFACE_ANOMALY("INTERFACE-ANOMALY"),
- SERVICE_ANOMALY("SERVICE-ANOMALY"),
- UNKNOWN(null);
-
- private String name;
-
- AlertType(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/BaseCEFModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/BaseCEFModel.java
deleted file mode 100644
index dbf4e83..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/BaseCEFModel.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.cef;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.openecomp.dcae.analytics.model.domain.BaseDynamicPropertiesProvider;
-
-/**
- * <p>
- * Base CEF Model should be extended by all CEF Model Entities.
- * By extending CEF Model all the additional dynamic Properties
- * can be accumalated in a map.
- * </p>
- *
- * @author Rajiv Singla. Creation Date: 10/18/2016.
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public abstract class BaseCEFModel extends BaseDynamicPropertiesProvider implements CEFModel {
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CEFModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CEFModel.java
deleted file mode 100644
index b7f1328..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CEFModel.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.cef;
-
-import org.openecomp.dcae.analytics.model.domain.DCAEAnalyticsModel;
-
-/**
- * <p>
- * Marker interface for all DCAE Analytics Common Event Format Model implementations
- * </p>
- * @author Rajiv Singla. Creation Date: 10/17/2016.
- */
-public interface CEFModel extends DCAEAnalyticsModel {
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Criticality.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Criticality.java
deleted file mode 100644
index 51b7bee..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Criticality.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.cef;
-
-/**
- * Performance Criticality
- *
- * @author Rajiv Singla. Creation Date: 11/3/2016.
- */
-public enum Criticality implements CEFModel {
-
- CRIT, MAJ;
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventListener.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventListener.java
deleted file mode 100644
index ec9e64b..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.cef;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * Common Event Format - Base Event Listener
- * <p>
- * @author Rajiv Singla. Creation Date: 10/17/2016.
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EventListener extends BaseCEFModel {
-
-
- private static final long serialVersionUID = -2173233681841558721L;
- /**
- * Common Event Format - Event
- *
- * @param event New value for Event
- * @return Common Event Format Event
- */
- private Event event;
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverity.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverity.java
deleted file mode 100644
index 178c49f..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.cef;
-
-/**
- * CEF Event severity or priority
- *
- * @author Rajiv Singla. Creation Date: 11/3/2016.
- */
-public enum EventSeverity implements CEFModel {
-
- //NOTE: enum order must not be changed. Events severity is ordered from high to low
- CRITICAL,
- MAJOR,
- MINOR,
- WARNING,
- NORMAL;
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/MeasurementsForVfScalingFields.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/MeasurementsForVfScalingFields.java
deleted file mode 100644
index d859f97..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/MeasurementsForVfScalingFields.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.cef;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * Common Event Format - MeasurementsForVfScaling fields
- * <p>
- * @author Rajiv Singla. Creation Date: 10/17/2016.
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MeasurementsForVfScalingFields extends BaseCEFModel {
-
-
- private static final long serialVersionUID = 243977479034730554L;
-
- /**
- * Interval over which measurements are being reported in seconds
- *
- * @param measurementInterval New value for measurement Interval
- * @return Interval over which measurements are being reported in seconds
- */
- private Long measurementInterval;
-
- /**
- * Virtual Network Card Usage Array
- *
- * @param vNicUsageArray New value for Virtual Network Card Usage Array
- * @return Virtual Network Card Usage Array
- */
- private List<VNicUsageArray> vNicUsageArray;
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Priority.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Priority.java
deleted file mode 100644
index d6d1a7b..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Priority.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.cef;
-
-/**
- * Common Event Format - Event processing priority
- * <p>
- * @author Rajiv Singla. Creation Date: 10/17/2016.
- */
-public enum Priority implements CEFModel {
-
- High, Medium, Normal, Low;
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/PolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/PolicyModel.java
deleted file mode 100644
index 1825390..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/PolicyModel.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.policy;
-
-import org.openecomp.dcae.analytics.model.domain.DCAEAnalyticsModel;
-
-/**
- * <p>
- * Marker Interface all DCAE Analytics Policy Model implementations
- * </p>
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public interface PolicyModel extends DCAEAnalyticsModel {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java
deleted file mode 100644
index b2a9d21..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.policy.tca;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.openecomp.dcae.analytics.model.domain.BaseDynamicPropertiesProvider;
-
-/**
- * <p>
- * A Base TCA Policy Model which accumulates all dynamic properties in a dynamicProperties Map
- * </p>
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public abstract class BaseTCAPolicyModel extends BaseDynamicPropertiesProvider implements TCAPolicyModel {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Direction.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Direction.java
deleted file mode 100644
index 8d3a8b0..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Direction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.policy.tca;
-
-import javax.annotation.Nonnull;
-
-/**
- * <p>
- * Enum for Threshold Direction
- * </p>
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public enum Direction implements TCAPolicyModel {
-
- LESS {
- public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {
- return value1 < value2;
- }
- },
- LESS_OR_EQUAL {
- public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {
- return value1 <= value2;
- }
- },
- GREATER {
- public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {
- return value1 > value2;
- }
- },
- GREATER_OR_EQUAL {
- public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {
- return value1 >= value2;
- }
- };
-
- public abstract Boolean operate(@Nonnull Long value1, @Nonnull Long value2);
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicy.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicy.java
deleted file mode 100644
index 031ccb0..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicy.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.policy.tca;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.openecomp.dcae.analytics.model.domain.cef.CommonEventHeader;
-
-import java.util.List;
-
-/**
- * <p>
- * TCA (Threshold Crossing Alert) Root
- * </p>
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class TCAPolicy extends BaseTCAPolicyModel {
-
- private static final long serialVersionUID = 9186451218579196970L;
-
- /**
- * TCA Policy domain which is associated with TCA incoming CEF message {@link CommonEventHeader#getDomain()}
- *
- * @param domain New value for domain
- * @return Policy domain which is associated with incoming CEF message
- */
- private String domain;
-
- /**
- * Contains TCA Policy metrics that needs to be applied to each Functional Role
- *
- * @param metricsPerFunctionalRole New value for metrics that needs to be applied to each Functional Role
- * @return Contains TCA Policy metrics that needs to be applied to each Functional Role
- */
- private List<MetricsPerFunctionalRole> metricsPerFunctionalRole;
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicyModel.java
deleted file mode 100644
index ceec46d..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicyModel.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.domain.policy.tca;
-
-import org.openecomp.dcae.analytics.model.domain.policy.PolicyModel;
-
-/**
- * <p>
- * Marker interface for all TCA Policy Models
- * </p>
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public interface TCAPolicyModel extends PolicyModel {
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/FacadeModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/FacadeModel.java
deleted file mode 100644
index abf6d36..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/FacadeModel.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.facade;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * Marker Interface for all Facade (outgoing) DCAE Analytics Model
- * </p>
- *
- * @author Rajiv Singla. Creation Date: 11/9/2016.
- */
-public interface FacadeModel extends Serializable {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/AAI.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/AAI.java
deleted file mode 100644
index fa08f07..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/AAI.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.facade.tca;
-
-import lombok.Data;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/9/2016.
- */
-@Data
-public class AAI implements TCAFacadeModel {
-
- private static final long serialVersionUID = 1255011931120081985L;
-
- private String genericVNFId;
-
- private String genericServerId;
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAFacadeModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAFacadeModel.java
deleted file mode 100644
index 78c4ae7..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAFacadeModel.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.facade.tca;
-
-import org.openecomp.dcae.analytics.model.facade.FacadeModel;
-
-/**
- * Marker Interface for all TCA Facade Models
- *
- * @author Rajiv Singla. Creation Date: 11/9/2016.
- */
-public interface TCAFacadeModel extends FacadeModel {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAVESResponse.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAVESResponse.java
deleted file mode 100644
index f5a5b4e..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAVESResponse.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.facade.tca;
-
-import lombok.Data;
-
-/**
- * Response generated by TCA for VES Message
- *
- * @author Rajiv Singla. Creation Date: 11/9/2016.
- */
-@Data
-public class TCAVESResponse implements TCAFacadeModel {
-
- private static final long serialVersionUID = 8505119543756702710L;
-
- private String closedLoopControlName;
- private String version;
- private String requestID;
- private Long closedLoopAlarmStart;
- private String closedLoopEventClient;
- private String targetType;
- private AAI aai;
- private String target;
- private String from;
- private String policyScope;
- private String policyName;
- private String policyVersion;
- private String closedLoopEventStatus;
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/CommonEventFormatModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/CommonEventFormatModule.java
deleted file mode 100644
index 190289d..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/CommonEventFormatModule.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.openecomp.dcae.analytics.model.domain.cef.AlertAction;
-import org.openecomp.dcae.analytics.model.domain.cef.AlertType;
-import org.openecomp.dcae.analytics.model.domain.cef.BaseCEFModel;
-import org.openecomp.dcae.analytics.model.domain.cef.CommonEventHeader;
-import org.openecomp.dcae.analytics.model.domain.cef.Criticality;
-import org.openecomp.dcae.analytics.model.domain.cef.Event;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity;
-import org.openecomp.dcae.analytics.model.domain.cef.MeasurementsForVfScalingFields;
-import org.openecomp.dcae.analytics.model.domain.cef.PerformanceCounter;
-import org.openecomp.dcae.analytics.model.domain.cef.Priority;
-import org.openecomp.dcae.analytics.model.domain.cef.ThresholdCrossingAlertFields;
-import org.openecomp.dcae.analytics.model.domain.cef.VNicUsageArray;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.AlertActionMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.AlertTypeMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.BaseCEFModelMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.CommonEventHeaderMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.CriticalityMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.EventListenerMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.EventMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.EventSeverityMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.MeasurementsForVfScalingFieldsMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.PerformanceCounterMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.PriorityMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.ThresholdCrossingAlertFieldsMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.cef.VNicUsageArrayMixin;
-
-/**
- * @author Rajiv Singla. Creation Date: 10/18/2016.
- */
-public class CommonEventFormatModule extends SimpleModule {
-
- private static final long serialVersionUID = -6347258586478923257L;
-
- public CommonEventFormatModule() {
- super("Common Event Format",
- new Version(25, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model"));
- }
-
- @Override
- public void setupModule(final SetupContext setupContext) {
-
- setupContext.setMixInAnnotations(AlertAction.class, AlertActionMixin.class);
- setupContext.setMixInAnnotations(AlertType.class, AlertTypeMixin.class);
- setupContext.setMixInAnnotations(BaseCEFModel.class, BaseCEFModelMixin.class);
- setupContext.setMixInAnnotations(CommonEventHeader.class, CommonEventHeaderMixin.class);
- setupContext.setMixInAnnotations(Criticality.class, CriticalityMixin.class);
- setupContext.setMixInAnnotations(EventListener.class, EventListenerMixin.class);
- setupContext.setMixInAnnotations(Event.class, EventMixin.class);
- setupContext.setMixInAnnotations(EventSeverity.class, EventSeverityMixin.class);
- setupContext.setMixInAnnotations(MeasurementsForVfScalingFields.class,
- MeasurementsForVfScalingFieldsMixin.class);
- setupContext.setMixInAnnotations(PerformanceCounter.class, PerformanceCounterMixin.class);
- setupContext.setMixInAnnotations(Priority.class, PriorityMixin.class);
- setupContext.setMixInAnnotations(ThresholdCrossingAlertFields.class, ThresholdCrossingAlertFieldsMixin.class);
- setupContext.setMixInAnnotations(VNicUsageArray.class, VNicUsageArrayMixin.class);
-
- }
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAFacadeModelModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAFacadeModelModule.java
deleted file mode 100644
index 09385f9..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAFacadeModelModule.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.openecomp.dcae.analytics.model.facade.tca.AAI;
-import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse;
-import org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca.AAIMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca.VESCEFMessageResponseMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/9/2016.
- */
-public class TCAFacadeModelModule extends SimpleModule {
-
- private static final long serialVersionUID = -5895573053812042524L;
-
- public TCAFacadeModelModule() {
- super("Threshold Crossing Alert Facade",
- new Version(1, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model"));
- }
-
- @Override
- public void setupModule(final SetupContext setupContext) {
- setupContext.setMixInAnnotations(TCAVESResponse.class, VESCEFMessageResponseMixin.class);
- setupContext.setMixInAnnotations(AAI.class, AAIMixin.class);
- }
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAPolicyModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAPolicyModule.java
deleted file mode 100644
index 0f3bd7f..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAPolicyModule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.BaseTCAPolicyModel;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Direction;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold;
-import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.BaseTCAPolicyModelMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.DirectionMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.MetricsPerFunctionalRoleMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.TCAPolicyMixin;
-import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.ThresholdMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public class TCAPolicyModule extends SimpleModule {
-
- private static final long serialVersionUID = -5895573053812042524L;
-
- public TCAPolicyModule() {
- super("Threshold Crossing Alert Policy",
- new Version(1, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model"));
- }
-
- @Override
- public void setupModule(final SetupContext setupContext) {
-
- setupContext.setMixInAnnotations(BaseTCAPolicyModel.class, BaseTCAPolicyModelMixin.class);
- setupContext.setMixInAnnotations(Direction.class, DirectionMixin.class);
- setupContext.setMixInAnnotations(TCAPolicy.class, TCAPolicyMixin.class);
- setupContext.setMixInAnnotations(MetricsPerFunctionalRole.class, MetricsPerFunctionalRoleMixin.class);
- setupContext.setMixInAnnotations(Threshold.class, ThresholdMixin.class);
- setupContext.setMixInAnnotations(TCAPolicy.class, TCAPolicyMixin.class);
-
-
- }
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java
deleted file mode 100644
index 1b4a5fe..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openecomp.dcae.analytics.model.domain.BaseDynamicPropertiesProvider;
-
-import java.util.Map;
-
-/**
- * Json Mixin for {@link BaseDynamicPropertiesProvider}
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class BaseDynamicPropertiesProviderMixin implements JsonMixin {
-
- @JsonAnySetter
- public abstract void addDynamicProperties(String propertyName, Object propertyValue);
-
- @JsonAnyGetter
- public abstract Map<String, Object> getDynamicProperties();
-
- @JsonIgnore
- public abstract boolean isDynamicPropertiesPresent();
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/JsonMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/JsonMixin.java
deleted file mode 100644
index fab85ba..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/JsonMixin.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin;
-
-import java.io.Serializable;
-
-/**
- * Marker Interface for all Json Mixin classes
- *
- * @author Rajiv Singla. Creation Date: 11/3/2016.
- */
-public interface JsonMixin extends Serializable {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertActionMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertActionMixin.java
deleted file mode 100644
index a94d1f5..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertActionMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class AlertActionMixin implements JsonMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixin.java
deleted file mode 100644
index e7f83a6..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.openecomp.dcae.analytics.model.domain.cef.AlertType;
-import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin;
-
-/**
- * Mixin for Alert Type
- *
- * @author Rajiv Singla. Creation Date: 11/3/2016.
- */
-public abstract class AlertTypeMixin implements JsonMixin {
-
- private String name;
-
- @JsonCreator
- public static AlertType forValue(String name) {
-
- switch (name) {
- case "CARD-ANOMALY":
- return AlertType.CARD_ANOMALY;
- case "ELEMENT-ANOMALY":
- return AlertType.ELEMENT_ANOMALY;
- case "INTERFACE-ANOMALY":
- return AlertType.INTERFACE_ANOMALY;
- case "SERVICE-ANOMALY":
- return AlertType.SERVICE_ANOMALY;
- default:
- return AlertType.UNKNOWN;
- }
-
- }
-
- @JsonValue
- public String getName() {
- return name;
- }
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java
deleted file mode 100644
index 77f4e8e..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-import org.openecomp.dcae.analytics.model.util.json.mixin.BaseDynamicPropertiesProviderMixin;
-
-/**
- * Abstract Mixin for all CEF Model Mixins
- *
- * @author Rajiv Singla. Creation Date: 10/18/2016.
- */
-public abstract class BaseCEFModelMixin extends BaseDynamicPropertiesProviderMixin {
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java
deleted file mode 100644
index 8bee579..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-/**
- * @author Rajiv Singla. Creation Date: 10/18/2016.
- */
-public abstract class CommonEventHeaderMixin extends BaseCEFModelMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CriticalityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CriticalityMixin.java
deleted file mode 100644
index 5a7e983..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CriticalityMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class CriticalityMixin implements JsonMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixin.java
deleted file mode 100644
index 9222909..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixin.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-/**
- * Event Listener Json Mixin class
- * <p>
- * @author Rajiv Singla. Creation Date: 10/18/2016.
- */
-public abstract class EventListenerMixin extends BaseCEFModelMixin {
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventMixin.java
deleted file mode 100644
index fa1090c..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventMixin.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-/**
- * Event Json Mixin class
- * <p>
- * @author Rajiv Singla. Creation Date: 10/18/2016.
- */
-public abstract class EventMixin extends BaseCEFModelMixin {
-
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventSeverityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventSeverityMixin.java
deleted file mode 100644
index 6cc7616..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventSeverityMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class EventSeverityMixin implements JsonMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java
deleted file mode 100644
index f54c844..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonSetter;
-import org.openecomp.dcae.analytics.model.domain.cef.VNicUsageArray;
-
-import java.util.List;
-
-/**
- * @author Rajiv Singla. Creation Date: 10/18/2016.
- */
-public abstract class MeasurementsForVfScalingFieldsMixin extends BaseCEFModelMixin {
-
- @JsonSetter("vNicUsageArray")
- public abstract void setVNicUsageArray(List<VNicUsageArray> vNicUsageArrays);
-
- @JsonGetter("vNicUsageArray")
- public abstract List<VNicUsageArray> getVNicUsageArray();
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java
deleted file mode 100644
index 808c6fd..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-/**
- * CEF Performance Counter Mixin
- *
- * @author Rajiv Singla. Creation Date: 11/3/2016.
- */
-public abstract class PerformanceCounterMixin extends BaseCEFModelMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PriorityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PriorityMixin.java
deleted file mode 100644
index 94460d0..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PriorityMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class PriorityMixin implements JsonMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java
deleted file mode 100644
index f81e3cb..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-/**
- * Mixin class for ThresholdCrossingAlertFields
- *
- * @author Rajiv Singla. Creation Date: 11/3/2016.
- */
-public abstract class ThresholdCrossingAlertFieldsMixin extends BaseCEFModelMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java
deleted file mode 100644
index 6e06f09..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
-
-import com.fasterxml.jackson.annotation.JsonSetter;
-
-/**
- * @author Rajiv Singla. Creation Date: 10/18/2016.
- */
-public abstract class VNicUsageArrayMixin extends BaseCEFModelMixin {
-
- @JsonSetter("vNicIdentifier")
- public abstract void setVNicIdentifier(String name);
-
- @JsonSetter("vNicIdentifier")
- public abstract String setVNicIdentifier();
-
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/AAIMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
deleted file mode 100644
index a2d583b..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca;
-
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonSetter;
-import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/9/2016.
- */
-public abstract class AAIMixin implements JsonMixin {
-
- private String genericVNFId;
- private String genericServerId;
-
- @JsonGetter("generic-vnf.vnf-id")
- public String getGenericVNFId() {
- return genericVNFId;
- }
-
- @JsonSetter("generic-vnf.vnf-id")
- public void setGenericVNFId(String genericVNFId) {
- this.genericVNFId = genericVNFId;
- }
-
- @JsonGetter("vserver.vserver-name")
- public String getGenericServerId() {
- return genericServerId;
- }
- @JsonSetter("vserver.vserver-name")
- public void setGenericServerId(String genericServerId) {
- this.genericServerId = genericServerId;
- }
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java
deleted file mode 100644
index 4852aad..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca;
-
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonSetter;
-import org.openecomp.dcae.analytics.model.facade.tca.AAI;
-import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/9/2016.
- */
-public abstract class VESCEFMessageResponseMixin implements JsonMixin {
-
- private String targetType;
- private AAI aai;
-
- @JsonGetter("target_type")
- public String getTargetType() {
- return targetType;
- }
-
- @JsonSetter("target_type")
- public void setTargetType(String targetType) {
- this.targetType = targetType;
- }
-
- @JsonGetter("AAI")
- public AAI getAai() {
- return aai;
- }
-
- @JsonSetter("AAI")
- public void setAai(AAI aai) {
- this.aai = aai;
- }
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java
deleted file mode 100644
index af12f62..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca;
-
-import org.openecomp.dcae.analytics.model.util.json.mixin.BaseDynamicPropertiesProviderMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class BaseTCAPolicyModelMixin extends BaseDynamicPropertiesProviderMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java
deleted file mode 100644
index 1c364c7..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca;
-
-import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class DirectionMixin implements JsonMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java
deleted file mode 100644
index fc8246b..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class MetricsPerFunctionalRoleMixin extends BaseTCAPolicyModelMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java
deleted file mode 100644
index f27375a..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class TCAPolicyMixin extends BaseTCAPolicyModelMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java
deleted file mode 100644
index 046f336..0000000
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca;
-
-/**
- *
- * @author Rajiv Singla. Creation Date: 11/5/2016.
- */
-public abstract class ThresholdMixin extends BaseTCAPolicyModelMixin {
-}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/BaseDynamicPropertiesProvider.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/BaseDynamicPropertiesProvider.java
index 59c2a46..49ec872 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/BaseDynamicPropertiesProvider.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/BaseDynamicPropertiesProvider.java
@@ -1,20 +1,24 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.domain;
+package org.openecomp.dcae.apod.analytics.model.domain;
import lombok.Data;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DCAEAnalyticsModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DCAEAnalyticsModel.java
new file mode 100644
index 0000000..f7486f5
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DCAEAnalyticsModel.java
@@ -0,0 +1,32 @@
+/*
+ * ============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.model.domain;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * Marker Interface for all DCAE Analytics Model implementations
+ * </p>
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public interface DCAEAnalyticsModel extends Serializable {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DynamicPropertiesProvider.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DynamicPropertiesProvider.java
new file mode 100644
index 0000000..96842c5
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DynamicPropertiesProvider.java
@@ -0,0 +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.model.domain;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * Problem: Many Entities have dynamic properties as well as known properties.
+ * Known properites can be binded explicitly with all dynamic properties need
+ * to be captured also ensuring that there must not be any loss in information
+ * during deserialization / serialization process.
+ * </p>
+ * <p>
+ * This contract allows the deserialization mechanism to catch those dynamic properties
+ * in a Map so that deserialization mechanism will not loose any information and
+ * can be serialized back with no loss in dynamic properties information
+ * </p>
+ * @author Rajiv Singla. Creation Date: 10/18/2016.
+ */
+public interface DynamicPropertiesProvider extends DCAEAnalyticsModel {
+
+
+ void addDynamicProperties(String propertyName, Object propertyValue);
+
+ Map<String, Object> getDynamicProperties();
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertAction.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertAction.java
new file mode 100644
index 0000000..1b4d49a
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertAction.java
@@ -0,0 +1,32 @@
+/*
+ * ============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.model.domain.cef;
+
+/**
+ * Common Event Format Alert Action
+ *
+ * @author Rajiv Singla. Creation Date: 11/3/2016.
+ */
+public enum AlertAction implements CEFModel {
+
+ CLEAR, CONT, SET;
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertType.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertType.java
new file mode 100644
index 0000000..e50c393
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertType.java
@@ -0,0 +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.model.domain.cef;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/3/2016.
+ */
+public enum AlertType implements CEFModel {
+
+ CARD_ANOMALY("CARD-ANOMALY"),
+ ELEMENT_ANOMALY("ELEMENT-ANOMALY"),
+ INTERFACE_ANOMALY("INTERFACE-ANOMALY"),
+ SERVICE_ANOMALY("SERVICE-ANOMALY"),
+ UNKNOWN(null);
+
+ private String name;
+
+ AlertType(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/BaseCEFModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/BaseCEFModel.java
new file mode 100644
index 0000000..fd194bf
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/BaseCEFModel.java
@@ -0,0 +1,41 @@
+/*
+ * ============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.model.domain.cef;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.openecomp.dcae.apod.analytics.model.domain.BaseDynamicPropertiesProvider;
+
+/**
+ * <p>
+ * Base CEF Model should be extended by all CEF Model Entities.
+ * By extending CEF Model all the additional dynamic Properties
+ * can be accumalated in a map.
+ * </p>
+ *
+ * @author Rajiv Singla. Creation Date: 10/18/2016.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public abstract class BaseCEFModel extends BaseDynamicPropertiesProvider implements CEFModel {
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CEFModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CEFModel.java
new file mode 100644
index 0000000..1f413b5
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CEFModel.java
@@ -0,0 +1,34 @@
+/*
+ * ============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.model.domain.cef;
+
+import org.openecomp.dcae.apod.analytics.model.domain.DCAEAnalyticsModel;
+
+/**
+ * <p>
+ * Marker interface for all DCAE Analytics Common Event Format Model implementations
+ * </p>
+ * @author Rajiv Singla. Creation Date: 10/17/2016.
+ */
+public interface CEFModel extends DCAEAnalyticsModel {
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CommonEventHeader.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CommonEventHeader.java
index 427e947..bdc9709 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CommonEventHeader.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CommonEventHeader.java
@@ -1,20 +1,24 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.domain.cef;
+package org.openecomp.dcae.apod.analytics.model.domain.cef;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Criticality.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Criticality.java
new file mode 100644
index 0000000..a3dfad0
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Criticality.java
@@ -0,0 +1,31 @@
+/*
+ * ============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.model.domain.cef;
+
+/**
+ * Performance Criticality
+ *
+ * @author Rajiv Singla. Creation Date: 11/3/2016.
+ */
+public enum Criticality implements CEFModel {
+
+ CRIT, MAJ;
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Event.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Event.java
index 9c5ff2e..afd6210 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Event.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Event.java
@@ -1,20 +1,24 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.domain.cef;
+package org.openecomp.dcae.apod.analytics.model.domain.cef;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventListener.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventListener.java
new file mode 100644
index 0000000..1f68294
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventListener.java
@@ -0,0 +1,46 @@
+/*
+ * ============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.model.domain.cef;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Common Event Format - Base Event Listener
+ * <p>
+ * @author Rajiv Singla. Creation Date: 10/17/2016.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EventListener extends BaseCEFModel {
+
+
+ private static final long serialVersionUID = -2173233681841558721L;
+ /**
+ * Common Event Format - Event
+ *
+ * @param event New value for Event
+ * @return Common Event Format Event
+ */
+ private Event event;
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverity.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverity.java
new file mode 100644
index 0000000..8b8f1a1
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverity.java
@@ -0,0 +1,36 @@
+/*
+ * ============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.model.domain.cef;
+
+/**
+ * CEF Event severity or priority
+ *
+ * @author Rajiv Singla. Creation Date: 11/3/2016.
+ */
+public enum EventSeverity implements CEFModel {
+
+ //NOTE: enum order must not be changed. Events severity is ordered from high to low
+ CRITICAL,
+ MAJOR,
+ MINOR,
+ WARNING,
+ NORMAL;
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/MeasurementsForVfScalingFields.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/MeasurementsForVfScalingFields.java
new file mode 100644
index 0000000..5cfd710
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/MeasurementsForVfScalingFields.java
@@ -0,0 +1,57 @@
+/*
+ * ============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.model.domain.cef;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * Common Event Format - MeasurementsForVfScaling fields
+ * <p>
+ * @author Rajiv Singla. Creation Date: 10/17/2016.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MeasurementsForVfScalingFields extends BaseCEFModel {
+
+
+ private static final long serialVersionUID = 243977479034730554L;
+
+ /**
+ * Interval over which measurements are being reported in seconds
+ *
+ * @param measurementInterval New value for measurement Interval
+ * @return Interval over which measurements are being reported in seconds
+ */
+ private Long measurementInterval;
+
+ /**
+ * Virtual Network Card Usage Array
+ *
+ * @param vNicUsageArray New value for Virtual Network Card Usage Array
+ * @return Virtual Network Card Usage Array
+ */
+ private List<VNicUsageArray> vNicUsageArray;
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/PerformanceCounter.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/PerformanceCounter.java
index 1c8367a..38001e6 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/PerformanceCounter.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/PerformanceCounter.java
@@ -1,20 +1,24 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.domain.cef;
+package org.openecomp.dcae.apod.analytics.model.domain.cef;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Priority.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Priority.java
new file mode 100644
index 0000000..e8cc507
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Priority.java
@@ -0,0 +1,32 @@
+/*
+ * ============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.model.domain.cef;
+
+/**
+ * Common Event Format - Event processing priority
+ * <p>
+ * @author Rajiv Singla. Creation Date: 10/17/2016.
+ */
+public enum Priority implements CEFModel {
+
+ High, Medium, Normal, Low;
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/ThresholdCrossingAlertFields.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/ThresholdCrossingAlertFields.java
index 575d5c6..232890c 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/ThresholdCrossingAlertFields.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/ThresholdCrossingAlertFields.java
@@ -1,20 +1,24 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.domain.cef;
+package org.openecomp.dcae.apod.analytics.model.domain.cef;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/VNicUsageArray.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/VNicUsageArray.java
index c4630ba..d1cdccb 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/VNicUsageArray.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/VNicUsageArray.java
@@ -1,20 +1,24 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.domain.cef;
+package org.openecomp.dcae.apod.analytics.model.domain.cef;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/PolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/PolicyModel.java
new file mode 100644
index 0000000..fe438cc
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/PolicyModel.java
@@ -0,0 +1,33 @@
+/*
+ * ============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.model.domain.policy;
+
+import org.openecomp.dcae.apod.analytics.model.domain.DCAEAnalyticsModel;
+
+/**
+ * <p>
+ * Marker Interface all DCAE Analytics Policy Model implementations
+ * </p>
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public interface PolicyModel extends DCAEAnalyticsModel {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java
new file mode 100644
index 0000000..a706bc9
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java
@@ -0,0 +1,37 @@
+/*
+ * ============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.model.domain.policy.tca;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.openecomp.dcae.apod.analytics.model.domain.BaseDynamicPropertiesProvider;
+
+/**
+ * <p>
+ * A Base TCA Policy Model which accumulates all dynamic properties in a dynamicProperties Map
+ * </p>
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public abstract class BaseTCAPolicyModel extends BaseDynamicPropertiesProvider implements TCAPolicyModel {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java
new file mode 100644
index 0000000..b2e72dc
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java
@@ -0,0 +1,56 @@
+/*
+ * ============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.model.domain.policy.tca;
+
+import javax.annotation.Nonnull;
+
+/**
+ * <p>
+ * Enum for Threshold Direction
+ * </p>
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public enum Direction implements TCAPolicyModel {
+
+ LESS {
+ public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {
+ return value1 < value2;
+ }
+ },
+ LESS_OR_EQUAL {
+ public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {
+ return value1 <= value2;
+ }
+ },
+ GREATER {
+ public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {
+ return value1 > value2;
+ }
+ },
+ GREATER_OR_EQUAL {
+ public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) {
+ return value1 >= value2;
+ }
+ };
+
+ public abstract Boolean operate(@Nonnull Long value1, @Nonnull Long value2);
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java
index 4d35ed4..ca8249c 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java
@@ -1,20 +1,24 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.domain.policy.tca;
+package org.openecomp.dcae.apod.analytics.model.domain.policy.tca;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicy.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicy.java
new file mode 100644
index 0000000..5f04b78
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicy.java
@@ -0,0 +1,59 @@
+/*
+ * ============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.model.domain.policy.tca;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader;
+
+import java.util.List;
+
+/**
+ * <p>
+ * TCA (Threshold Crossing Alert) Root
+ * </p>
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TCAPolicy extends BaseTCAPolicyModel {
+
+ private static final long serialVersionUID = 9186451218579196970L;
+
+ /**
+ * TCA Policy domain which is associated with TCA incoming CEF message {@link CommonEventHeader#getDomain()}
+ *
+ * @param domain New value for domain
+ * @return Policy domain which is associated with incoming CEF message
+ */
+ private String domain;
+
+ /**
+ * Contains TCA Policy metrics that needs to be applied to each Functional Role
+ *
+ * @param metricsPerFunctionalRole New value for metrics that needs to be applied to each Functional Role
+ * @return Contains TCA Policy metrics that needs to be applied to each Functional Role
+ */
+ private List<MetricsPerFunctionalRole> metricsPerFunctionalRole;
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicyModel.java
new file mode 100644
index 0000000..fa5cc83
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicyModel.java
@@ -0,0 +1,35 @@
+/*
+ * ============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.model.domain.policy.tca;
+
+import org.openecomp.dcae.apod.analytics.model.domain.policy.PolicyModel;
+
+/**
+ * <p>
+ * Marker interface for all TCA Policy Models
+ * </p>
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public interface TCAPolicyModel extends PolicyModel {
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Threshold.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Threshold.java
index 0905730..97ee566 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Threshold.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Threshold.java
@@ -1,24 +1,28 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.domain.policy.tca;
+package org.openecomp.dcae.apod.analytics.model.domain.policy.tca;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity;
/**
*
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/FacadeModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/FacadeModel.java
new file mode 100644
index 0000000..dd3c311
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/FacadeModel.java
@@ -0,0 +1,33 @@
+/*
+ * ============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.model.facade;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * Marker Interface for all Facade (outgoing) DCAE Analytics Model
+ * </p>
+ *
+ * @author Rajiv Singla. Creation Date: 11/9/2016.
+ */
+public interface FacadeModel extends Serializable {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java
new file mode 100644
index 0000000..8fb0f70
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java
@@ -0,0 +1,38 @@
+/*
+ * ============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.model.facade.tca;
+
+import lombok.Data;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/9/2016.
+ */
+@Data
+public class AAI implements TCAFacadeModel {
+
+ private static final long serialVersionUID = 1255011931120081985L;
+
+ private String genericVNFId;
+
+ private String genericServerId;
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAFacadeModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAFacadeModel.java
new file mode 100644
index 0000000..13ca650
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAFacadeModel.java
@@ -0,0 +1,31 @@
+/*
+ * ============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.model.facade.tca;
+
+import org.openecomp.dcae.apod.analytics.model.facade.FacadeModel;
+
+/**
+ * Marker Interface for all TCA Facade Models
+ *
+ * @author Rajiv Singla. Creation Date: 11/9/2016.
+ */
+public interface TCAFacadeModel extends FacadeModel {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponse.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponse.java
new file mode 100644
index 0000000..0b26e1c
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponse.java
@@ -0,0 +1,49 @@
+/*
+ * ============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.model.facade.tca;
+
+import lombok.Data;
+
+/**
+ * Response generated by TCA for VES Message
+ *
+ * @author Rajiv Singla. Creation Date: 11/9/2016.
+ */
+@Data
+public class TCAVESResponse implements TCAFacadeModel {
+
+ private static final long serialVersionUID = 8505119543756702710L;
+
+ private String closedLoopControlName;
+ private String version;
+ private String requestID;
+ private Long closedLoopAlarmStart;
+ private String closedLoopEventClient;
+ private String targetType;
+ private AAI aai;
+ private String target;
+ private String from;
+ private String policyScope;
+ private String policyName;
+ private String policyVersion;
+ private String closedLoopEventStatus;
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtils.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java
index 0eddd20..9b97b26 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtils.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java
@@ -1,20 +1,24 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.util;
+package org.openecomp.dcae.apod.analytics.model.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelJsonUtils.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelJsonUtils.java
index 9e6b719..7bb0b55 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelJsonUtils.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelJsonUtils.java
@@ -1,26 +1,30 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.util;
+package org.openecomp.dcae.apod.analytics.model.util;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Suppliers;
-import org.openecomp.dcae.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
+import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
import java.io.IOException;
import java.io.InputStream;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java
index 63857fc..b8dfae0 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java
@@ -1,20 +1,24 @@
/*
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============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
*
- * 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
*
- * 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.
+ * 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.analytics.model.util.json;
+package org.openecomp.dcae.apod.analytics.model.util.json;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.DeserializationFeature;
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/CommonEventFormatModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/CommonEventFormatModule.java
new file mode 100644
index 0000000..5f218cc
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/CommonEventFormatModule.java
@@ -0,0 +1,84 @@
+/*
+ * ============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.model.util.json;
+
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.AlertAction;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.AlertType;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.BaseCEFModel;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.Criticality;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.Event;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.MeasurementsForVfScalingFields;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.PerformanceCounter;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.Priority;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.ThresholdCrossingAlertFields;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.VNicUsageArray;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.AlertActionMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.AlertTypeMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.BaseCEFModelMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.CommonEventHeaderMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.CriticalityMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.EventListenerMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.EventMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.EventSeverityMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.MeasurementsForVfScalingFieldsMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.PerformanceCounterMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.PriorityMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.ThresholdCrossingAlertFieldsMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.VNicUsageArrayMixin;
+
+/**
+ * @author Rajiv Singla. Creation Date: 10/18/2016.
+ */
+public class CommonEventFormatModule extends SimpleModule {
+
+ private static final long serialVersionUID = -6347258586478923257L;
+
+ public CommonEventFormatModule() {
+ super("Common Event Format",
+ new Version(25, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model"));
+ }
+
+ @Override
+ public void setupModule(final SetupContext setupContext) {
+
+ setupContext.setMixInAnnotations(AlertAction.class, AlertActionMixin.class);
+ setupContext.setMixInAnnotations(AlertType.class, AlertTypeMixin.class);
+ setupContext.setMixInAnnotations(BaseCEFModel.class, BaseCEFModelMixin.class);
+ setupContext.setMixInAnnotations(CommonEventHeader.class, CommonEventHeaderMixin.class);
+ setupContext.setMixInAnnotations(Criticality.class, CriticalityMixin.class);
+ setupContext.setMixInAnnotations(EventListener.class, EventListenerMixin.class);
+ setupContext.setMixInAnnotations(Event.class, EventMixin.class);
+ setupContext.setMixInAnnotations(EventSeverity.class, EventSeverityMixin.class);
+ setupContext.setMixInAnnotations(MeasurementsForVfScalingFields.class,
+ MeasurementsForVfScalingFieldsMixin.class);
+ setupContext.setMixInAnnotations(PerformanceCounter.class, PerformanceCounterMixin.class);
+ setupContext.setMixInAnnotations(Priority.class, PriorityMixin.class);
+ setupContext.setMixInAnnotations(ThresholdCrossingAlertFields.class, ThresholdCrossingAlertFieldsMixin.class);
+ setupContext.setMixInAnnotations(VNicUsageArray.class, VNicUsageArrayMixin.class);
+
+ }
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAFacadeModelModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAFacadeModelModule.java
new file mode 100644
index 0000000..e17c617
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAFacadeModelModule.java
@@ -0,0 +1,49 @@
+/*
+ * ============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.model.util.json;
+
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.openecomp.dcae.apod.analytics.model.facade.tca.AAI;
+import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.facade.tca.AAIMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.facade.tca.VESCEFMessageResponseMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/9/2016.
+ */
+public class TCAFacadeModelModule extends SimpleModule {
+
+ private static final long serialVersionUID = -5895573053812042524L;
+
+ public TCAFacadeModelModule() {
+ super("Threshold Crossing Alert Facade",
+ new Version(1, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model"));
+ }
+
+ @Override
+ public void setupModule(final SetupContext setupContext) {
+ setupContext.setMixInAnnotations(TCAVESResponse.class, VESCEFMessageResponseMixin.class);
+ setupContext.setMixInAnnotations(AAI.class, AAIMixin.class);
+ }
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAPolicyModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAPolicyModule.java
new file mode 100644
index 0000000..39cc005
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAPolicyModule.java
@@ -0,0 +1,61 @@
+/*
+ * ============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.model.util.json;
+
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.BaseTCAPolicyModel;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.BaseTCAPolicyModelMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.DirectionMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.MetricsPerFunctionalRoleMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.TCAPolicyMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.ThresholdMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public class TCAPolicyModule extends SimpleModule {
+
+ private static final long serialVersionUID = -5895573053812042524L;
+
+ public TCAPolicyModule() {
+ super("Threshold Crossing Alert Policy",
+ new Version(1, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model"));
+ }
+
+ @Override
+ public void setupModule(final SetupContext setupContext) {
+
+ setupContext.setMixInAnnotations(BaseTCAPolicyModel.class, BaseTCAPolicyModelMixin.class);
+ setupContext.setMixInAnnotations(Direction.class, DirectionMixin.class);
+ setupContext.setMixInAnnotations(TCAPolicy.class, TCAPolicyMixin.class);
+ setupContext.setMixInAnnotations(MetricsPerFunctionalRole.class, MetricsPerFunctionalRoleMixin.class);
+ setupContext.setMixInAnnotations(Threshold.class, ThresholdMixin.class);
+ setupContext.setMixInAnnotations(TCAPolicy.class, TCAPolicyMixin.class);
+
+
+ }
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java
new file mode 100644
index 0000000..4d5ba40
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java
@@ -0,0 +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.model.util.json.mixin;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.openecomp.dcae.apod.analytics.model.domain.BaseDynamicPropertiesProvider;
+
+import java.util.Map;
+
+/**
+ * Json Mixin for {@link BaseDynamicPropertiesProvider}
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class BaseDynamicPropertiesProviderMixin implements JsonMixin {
+
+ @JsonAnySetter
+ public abstract void addDynamicProperties(String propertyName, Object propertyValue);
+
+ @JsonAnyGetter
+ public abstract Map<String, Object> getDynamicProperties();
+
+ @JsonIgnore
+ public abstract boolean isDynamicPropertiesPresent();
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/JsonMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/JsonMixin.java
new file mode 100644
index 0000000..92e0b5a
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/JsonMixin.java
@@ -0,0 +1,31 @@
+/*
+ * ============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.model.util.json.mixin;
+
+import java.io.Serializable;
+
+/**
+ * Marker Interface for all Json Mixin classes
+ *
+ * @author Rajiv Singla. Creation Date: 11/3/2016.
+ */
+public interface JsonMixin extends Serializable {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertActionMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertActionMixin.java
new file mode 100644
index 0000000..ea63dcf
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertActionMixin.java
@@ -0,0 +1,30 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class AlertActionMixin implements JsonMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixin.java
new file mode 100644
index 0000000..181f4df
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixin.java
@@ -0,0 +1,61 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.AlertType;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
+
+/**
+ * Mixin for Alert Type
+ *
+ * @author Rajiv Singla. Creation Date: 11/3/2016.
+ */
+public abstract class AlertTypeMixin implements JsonMixin {
+
+ private String name;
+
+ @JsonCreator
+ public static AlertType forValue(String name) {
+
+ switch (name) {
+ case "CARD-ANOMALY":
+ return AlertType.CARD_ANOMALY;
+ case "ELEMENT-ANOMALY":
+ return AlertType.ELEMENT_ANOMALY;
+ case "INTERFACE-ANOMALY":
+ return AlertType.INTERFACE_ANOMALY;
+ case "SERVICE-ANOMALY":
+ return AlertType.SERVICE_ANOMALY;
+ default:
+ return AlertType.UNKNOWN;
+ }
+
+ }
+
+ @JsonValue
+ public String getName() {
+ return name;
+ }
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java
new file mode 100644
index 0000000..1199de3
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java
@@ -0,0 +1,33 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.BaseDynamicPropertiesProviderMixin;
+
+/**
+ * Abstract Mixin for all CEF Model Mixins
+ *
+ * @author Rajiv Singla. Creation Date: 10/18/2016.
+ */
+public abstract class BaseCEFModelMixin extends BaseDynamicPropertiesProviderMixin {
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java
new file mode 100644
index 0000000..f4d4da3
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java
@@ -0,0 +1,27 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+/**
+ * @author Rajiv Singla. Creation Date: 10/18/2016.
+ */
+public abstract class CommonEventHeaderMixin extends BaseCEFModelMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CriticalityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CriticalityMixin.java
new file mode 100644
index 0000000..be90733
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CriticalityMixin.java
@@ -0,0 +1,30 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class CriticalityMixin implements JsonMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixin.java
new file mode 100644
index 0000000..28014a3
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixin.java
@@ -0,0 +1,31 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+/**
+ * Event Listener Json Mixin class
+ * <p>
+ * @author Rajiv Singla. Creation Date: 10/18/2016.
+ */
+public abstract class EventListenerMixin extends BaseCEFModelMixin {
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventMixin.java
new file mode 100644
index 0000000..7ec077a
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventMixin.java
@@ -0,0 +1,31 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+/**
+ * Event Json Mixin class
+ * <p>
+ * @author Rajiv Singla. Creation Date: 10/18/2016.
+ */
+public abstract class EventMixin extends BaseCEFModelMixin {
+
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventSeverityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventSeverityMixin.java
new file mode 100644
index 0000000..b5d6a69
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventSeverityMixin.java
@@ -0,0 +1,30 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class EventSeverityMixin implements JsonMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java
new file mode 100644
index 0000000..c85249e
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java
@@ -0,0 +1,39 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.VNicUsageArray;
+
+import java.util.List;
+
+/**
+ * @author Rajiv Singla. Creation Date: 10/18/2016.
+ */
+public abstract class MeasurementsForVfScalingFieldsMixin extends BaseCEFModelMixin {
+
+ @JsonSetter("vNicUsageArray")
+ public abstract void setVNicUsageArray(List<VNicUsageArray> vNicUsageArrays);
+
+ @JsonGetter("vNicUsageArray")
+ public abstract List<VNicUsageArray> getVNicUsageArray();
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java
new file mode 100644
index 0000000..2e06403
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java
@@ -0,0 +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.model.util.json.mixin.cef;
+
+/**
+ * CEF Performance Counter Mixin
+ *
+ * @author Rajiv Singla. Creation Date: 11/3/2016.
+ */
+public abstract class PerformanceCounterMixin extends BaseCEFModelMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PriorityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PriorityMixin.java
new file mode 100644
index 0000000..190db14
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PriorityMixin.java
@@ -0,0 +1,30 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class PriorityMixin implements JsonMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java
new file mode 100644
index 0000000..48c4b2d
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java
@@ -0,0 +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.model.util.json.mixin.cef;
+
+/**
+ * Mixin class for ThresholdCrossingAlertFields
+ *
+ * @author Rajiv Singla. Creation Date: 11/3/2016.
+ */
+public abstract class ThresholdCrossingAlertFieldsMixin extends BaseCEFModelMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java
new file mode 100644
index 0000000..cde4923
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java
@@ -0,0 +1,36 @@
+/*
+ * ============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.model.util.json.mixin.cef;
+
+import com.fasterxml.jackson.annotation.JsonSetter;
+
+/**
+ * @author Rajiv Singla. Creation Date: 10/18/2016.
+ */
+public abstract class VNicUsageArrayMixin extends BaseCEFModelMixin {
+
+ @JsonSetter("vNicIdentifier")
+ public abstract void setVNicIdentifier(String name);
+
+ @JsonSetter("vNicIdentifier")
+ public abstract String setVNicIdentifier();
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
new file mode 100644
index 0000000..ea6ffa5
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
@@ -0,0 +1,54 @@
+/*
+ * ============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.model.util.json.mixin.facade.tca;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/9/2016.
+ */
+public abstract class AAIMixin implements JsonMixin {
+
+ private String genericVNFId;
+ private String genericServerId;
+
+ @JsonGetter("generic-vnf.vnf-id")
+ public String getGenericVNFId() {
+ return genericVNFId;
+ }
+
+ @JsonSetter("generic-vnf.vnf-id")
+ public void setGenericVNFId(String genericVNFId) {
+ this.genericVNFId = genericVNFId;
+ }
+
+ @JsonGetter("vserver.vserver-name")
+ public String getGenericServerId() {
+ return genericServerId;
+ }
+ @JsonSetter("vserver.vserver-name")
+ public void setGenericServerId(String genericServerId) {
+ this.genericServerId = genericServerId;
+ }
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java
new file mode 100644
index 0000000..fcd6950
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java
@@ -0,0 +1,56 @@
+/*
+ * ============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.model.util.json.mixin.facade.tca;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import org.openecomp.dcae.apod.analytics.model.facade.tca.AAI;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/9/2016.
+ */
+public abstract class VESCEFMessageResponseMixin implements JsonMixin {
+
+ private String targetType;
+ private AAI aai;
+
+ @JsonGetter("target_type")
+ public String getTargetType() {
+ return targetType;
+ }
+
+ @JsonSetter("target_type")
+ public void setTargetType(String targetType) {
+ this.targetType = targetType;
+ }
+
+ @JsonGetter("AAI")
+ public AAI getAai() {
+ return aai;
+ }
+
+ @JsonSetter("AAI")
+ public void setAai(AAI aai) {
+ this.aai = aai;
+ }
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java
new file mode 100644
index 0000000..5a674cb
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java
@@ -0,0 +1,30 @@
+/*
+ * ============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.model.util.json.mixin.policy.tca;
+
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.BaseDynamicPropertiesProviderMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class BaseTCAPolicyModelMixin extends BaseDynamicPropertiesProviderMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java
new file mode 100644
index 0000000..66401ab
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java
@@ -0,0 +1,30 @@
+/*
+ * ============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.model.util.json.mixin.policy.tca;
+
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class DirectionMixin implements JsonMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java
new file mode 100644
index 0000000..146c957
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java
@@ -0,0 +1,28 @@
+/*
+ * ============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.model.util.json.mixin.policy.tca;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class MetricsPerFunctionalRoleMixin extends BaseTCAPolicyModelMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java
new file mode 100644
index 0000000..4bd04b3
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java
@@ -0,0 +1,28 @@
+/*
+ * ============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.model.util.json.mixin.policy.tca;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class TCAPolicyMixin extends BaseTCAPolicyModelMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java
new file mode 100644
index 0000000..a4053e8
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java
@@ -0,0 +1,28 @@
+/*
+ * ============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.model.util.json.mixin.policy.tca;
+
+/**
+ *
+ * @author Rajiv Singla. Creation Date: 11/5/2016.
+ */
+public abstract class ThresholdMixin extends BaseTCAPolicyModelMixin {
+}
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/BaseAnalyticsModelUnitTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java
index 55e615a..e29136a 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/BaseAnalyticsModelUnitTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.dcae.analytics.model;
+package org.openecomp.dcae.apod.analytics.model;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -26,8 +26,8 @@ import com.google.common.base.Suppliers;
import org.json.JSONException;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.openecomp.dcae.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
-import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest;
+import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
import java.io.IOException;
import java.io.InputStream;
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverityTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverityTest.java
index 5c8d870..492e8e1 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverityTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverityTest.java
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.dcae.analytics.model.domain.cef;
+package org.openecomp.dcae.apod.analytics.model.domain.cef;
import org.junit.Assert;
import org.junit.Test;
-import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest;
+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
import java.util.Collections;
import java.util.Comparator;
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtilsTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java
index ff929ba..39c5e9f 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtilsTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.dcae.analytics.model.util;
+package org.openecomp.dcae.apod.analytics.model.util;
import org.junit.Test;
-import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest;
+import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest;
import java.util.Properties;
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/ConfigHolder.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/ConfigHolder.java
index 35d6c80..6d9dc0c 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/ConfigHolder.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/ConfigHolder.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.dcae.analytics.model.util;
+package org.openecomp.dcae.apod.analytics.model.util;
/**
* Created by Rajiv Singla on 10/5/2016.
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/TestAppConfig.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java
index d5a6a1e..bccc2b0 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/TestAppConfig.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.dcae.analytics.model.util;
+package org.openecomp.dcae.apod.analytics.model.util;
/**
* Created by Rajiv Singla on 10/5/2016.
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java
index 078dae4..d25bbff 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java
@@ -18,12 +18,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
-import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest;
-import org.openecomp.dcae.analytics.model.domain.cef.AlertType;
+import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.AlertType;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java
index 2bf4a6a..a8803d1 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java
@@ -18,14 +18,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.dcae.analytics.model.util.json.mixin.cef;
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
import com.fasterxml.jackson.core.type.TypeReference;
import org.junit.Test;
-import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest;
-import org.openecomp.dcae.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.analytics.model.domain.cef.MeasurementsForVfScalingFields;
-import org.openecomp.dcae.analytics.model.domain.cef.VNicUsageArray;
+import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.MeasurementsForVfScalingFields;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.VNicUsageArray;
import java.util.List;
import java.util.Map;
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java
index c853c57..932eb7d 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca;
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.facade.tca;
import org.junit.Test;
-import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest;
-import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse;
+import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest;
+import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java
index 1490563..a4da4c1 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca;
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca;
import org.junit.Test;
-import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest;
-import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;