aboutsummaryrefslogtreecommitdiffstats
path: root/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json
diff options
context:
space:
mode:
Diffstat (limited to 'dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json')
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java2
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/CommonEventFormatModule.java18
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAControllerConfigModule.java39
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAPolicyModule.java15
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertActionMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixin.java27
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CriticalityMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/DomainMixin.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventSeverityMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/FieldMixin.java28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/InternalHeaderFieldsMixin.java28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java24
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/NamedArrayOfFieldsMixin.java28
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PriorityMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/BaseTCAAppConfigModelMixin.java9
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/BaseTCAHandleMixin.java20
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/DMAAPInfoMixin.java13
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/StreamsPublishesMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/StreamsSubscribesMixin.java14
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/TCAControllerAppConfigMixin.java17
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ControlLoopEventStatusMixin.java30
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ControlLoopSchemaTypeMixin.java9
-rw-r--r--dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/MetricsPerEventNameMixin.java (renamed from dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java)2
30 files changed, 404 insertions, 133 deletions
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java
index 75561a8..d21695a 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java
@@ -67,6 +67,8 @@ public class AnalyticsModelObjectMapperSupplier implements Supplier<ObjectMapper
objectMapper.registerModule(new TCAPolicyModule());
// Register TCA Facade Module
objectMapper.registerModule(new TCAFacadeModelModule());
+ // Register TCA Controller App Config Module
+ objectMapper.registerModule(new TCAControllerConfigModule());
// Setup JsonPath default config
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
index f30cecf..042ac4e 100644
--- 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
@@ -27,23 +27,31 @@ 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.Domain;
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.Field;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.InternalHeaderFields;
import org.openecomp.dcae.apod.analytics.model.domain.cef.MeasurementsForVfScalingFields;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.NamedArrayOfFields;
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.domain.cef.VNicPerformance;
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.DomainMixin;
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.FieldMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.InternalHeaderFieldsMixin;
import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.MeasurementsForVfScalingFieldsMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.NamedArrayOfFieldsMixin;
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;
@@ -58,7 +66,7 @@ public class CommonEventFormatModule extends SimpleModule {
public CommonEventFormatModule() {
super("Common Event Format",
- new Version(25, 0, 0, null, " org.openecomp.dcae.apod.analytics.model", "dcae-analytics-model"));
+ new Version(28, 3, 0, null, " org.openecomp.dcae.apod.analytics.model", "dcae-analytics-model"));
}
@Override
@@ -68,6 +76,10 @@ public class CommonEventFormatModule extends SimpleModule {
setupContext.setMixInAnnotations(AlertType.class, AlertTypeMixin.class);
setupContext.setMixInAnnotations(BaseCEFModel.class, BaseCEFModelMixin.class);
setupContext.setMixInAnnotations(CommonEventHeader.class, CommonEventHeaderMixin.class);
+ setupContext.setMixInAnnotations(Domain.class, DomainMixin.class);
+ setupContext.setMixInAnnotations(InternalHeaderFields.class, InternalHeaderFieldsMixin.class);
+ setupContext.setMixInAnnotations(Field.class, FieldMixin.class);
+ setupContext.setMixInAnnotations(NamedArrayOfFields.class, NamedArrayOfFieldsMixin.class);
setupContext.setMixInAnnotations(Criticality.class, CriticalityMixin.class);
setupContext.setMixInAnnotations(EventListener.class, EventListenerMixin.class);
setupContext.setMixInAnnotations(Event.class, EventMixin.class);
@@ -77,7 +89,7 @@ public class CommonEventFormatModule extends SimpleModule {
setupContext.setMixInAnnotations(PerformanceCounter.class, PerformanceCounterMixin.class);
setupContext.setMixInAnnotations(Priority.class, PriorityMixin.class);
setupContext.setMixInAnnotations(ThresholdCrossingAlertFields.class, ThresholdCrossingAlertFieldsMixin.class);
- setupContext.setMixInAnnotations(VNicUsageArray.class, VNicUsageArrayMixin.class);
+ setupContext.setMixInAnnotations(VNicPerformance.class, VNicUsageArrayMixin.class);
}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAControllerConfigModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAControllerConfigModule.java
new file mode 100644
index 0000000..393f349
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAControllerConfigModule.java
@@ -0,0 +1,39 @@
+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.config.tca.BaseTCAAppConfigModel;
+import org.openecomp.dcae.apod.analytics.model.config.tca.BaseTCAHandle;
+import org.openecomp.dcae.apod.analytics.model.config.tca.DMAAPInfo;
+import org.openecomp.dcae.apod.analytics.model.config.tca.StreamsPublishes;
+import org.openecomp.dcae.apod.analytics.model.config.tca.StreamsSubscribes;
+import org.openecomp.dcae.apod.analytics.model.config.tca.TCAControllerAppConfig;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca.BaseTCAAppConfigModelMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca.BaseTCAHandleMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca.DMAAPInfoMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca.StreamsPublishesMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca.StreamsSubscribesMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca.TCAControllerAppConfigMixin;
+
+/**
+ * Author: rs153v (Rajiv Singla) . Creation Date: 8/25/2017.
+ */
+public class TCAControllerConfigModule extends SimpleModule {
+
+ private static final long serialVersionUID = 1L;
+
+ public TCAControllerConfigModule() {
+ super("Threshold Crossing Alert Controller Config",
+ new Version(1, 0, 0, null, "org.openecomp.dace.apod.analytics.model", "dcae-analytics-model"));
+ }
+
+ @Override
+ public void setupModule(final SetupContext setupContext) {
+ setupContext.setMixInAnnotations(BaseTCAAppConfigModel.class, BaseTCAAppConfigModelMixin.class);
+ setupContext.setMixInAnnotations(BaseTCAHandle.class, BaseTCAHandleMixin.class);
+ setupContext.setMixInAnnotations(DMAAPInfo.class, DMAAPInfoMixin.class);
+ setupContext.setMixInAnnotations(StreamsPublishes.class, StreamsPublishesMixin.class);
+ setupContext.setMixInAnnotations(StreamsSubscribes.class, StreamsSubscribesMixin.class);
+ setupContext.setMixInAnnotations(TCAControllerAppConfig.class, TCAControllerAppConfigMixin.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
index ce8997c..26871c9 100644
--- 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
@@ -23,13 +23,17 @@ 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.ControlLoopEventStatus;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.ControlLoopSchemaType;
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.MetricsPerEventName;
import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.BaseTCAPolicyModelMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.ControlLoopEventStatusMixin;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.ControlLoopSchemaTypeMixin;
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.MetricsPerEventNameMixin;
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;
@@ -48,14 +52,13 @@ public class TCAPolicyModule extends SimpleModule {
@Override
public void setupModule(final SetupContext setupContext) {
-
setupContext.setMixInAnnotations(BaseTCAPolicyModel.class, BaseTCAPolicyModelMixin.class);
+ setupContext.setMixInAnnotations(ControlLoopSchemaType.class, ControlLoopSchemaTypeMixin.class);
setupContext.setMixInAnnotations(Direction.class, DirectionMixin.class);
+ setupContext.setMixInAnnotations(ControlLoopEventStatus.class, ControlLoopEventStatusMixin.class);
setupContext.setMixInAnnotations(TCAPolicy.class, TCAPolicyMixin.class);
- setupContext.setMixInAnnotations(MetricsPerFunctionalRole.class, MetricsPerFunctionalRoleMixin.class);
+ setupContext.setMixInAnnotations(MetricsPerEventName.class, MetricsPerEventNameMixin.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/cef/AlertActionMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertActionMixin.java
index 45577db..d0ce3a0 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -24,7 +24,7 @@ import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
/**
*
- * @author Rajiv Singla . Creation Date: 11/5/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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
index efed8b8..6123f4b 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -28,20 +28,12 @@ import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
/**
* Mixin for Alert Type
*
- * @author Rajiv Singla . Creation Date: 11/3/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
public abstract class AlertTypeMixin implements JsonMixin {
private String name;
- /**
- * Provides hint to Jackson Json to parse alert type string which are not valid java variable names
- * to proper java alert types
- *
- * @param name name of Alert coming from incoming Json
- *
- * @return java representation of alert type
- */
@JsonCreator
public static AlertType forValue(String name) {
@@ -60,11 +52,6 @@ public abstract class AlertTypeMixin implements JsonMixin {
}
- /**
- * Provide hint to Jackson Json to parse java object variable name to CEF specification alert String
- *
- * @return alert string in CEF format
- */
@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
index b332867..092d554 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -25,7 +25,7 @@ import org.openecomp.dcae.apod.analytics.model.util.json.mixin.BaseDynamicProper
/**
* Abstract Mixin for all CEF Model Mixins
*
- * @author Rajiv Singla . Creation Date: 10/18/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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
index 87fd396..4542021 100644
--- 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
@@ -1,27 +1,27 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
/**
- * @author Rajiv Singla . Creation Date: 10/18/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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
index a47e4f0..c0ef6f1 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -24,7 +24,7 @@ import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
/**
*
- * @author Rajiv Singla . Creation Date: 11/5/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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/DomainMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/DomainMixin.java
new file mode 100644
index 0000000..14183a6
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/DomainMixin.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: rs153v (Rajiv Singla) . Creation Date: 08/15/2017.
+ */
+public abstract class DomainMixin 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
index c19d386..9f92bd7 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -23,7 +23,7 @@ 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.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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
index 9e9c96a..269ddb7 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -23,7 +23,7 @@ package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
/**
* Event Json Mixin class
* <p>
- * @author Rajiv Singla . Creation Date: 10/18/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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
index 48aafcf..2c93ffe 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -24,7 +24,7 @@ import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
/**
*
- * @author Rajiv Singla . Creation Date: 11/5/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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/FieldMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/FieldMixin.java
new file mode 100644
index 0000000..abb58df
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/FieldMixin.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.cef;
+
+/**
+ * @author Rajiv Singla . Creation Date: 08/15/2017.
+ */
+public abstract class FieldMixin extends BaseCEFModelMixin {
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/InternalHeaderFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/InternalHeaderFieldsMixin.java
new file mode 100644
index 0000000..0204962
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/InternalHeaderFieldsMixin.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.cef;
+
+/**
+ * @author Rajiv Singla . Creation Date: 08/15/2017.
+ */
+public abstract class InternalHeaderFieldsMixin extends BaseCEFModelMixin {
+
+}
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
index 8cde5d6..4b761a7 100644
--- 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
@@ -1,39 +1,39 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============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 org.openecomp.dcae.apod.analytics.model.domain.cef.VNicPerformance;
import java.util.List;
/**
- * @author Rajiv Singla . Creation Date: 10/18/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
public abstract class MeasurementsForVfScalingFieldsMixin extends BaseCEFModelMixin {
- @JsonSetter("vNicUsageArray")
- public abstract void setVNicUsageArray(List<VNicUsageArray> vNicUsageArrays);
+ @JsonSetter("vNicPerformanceArray")
+ public abstract void setVNicPerformanceArray(List<VNicPerformance> vNicPerformances);
- @JsonGetter("vNicUsageArray")
- public abstract List<VNicUsageArray> getVNicUsageArray();
+ @JsonGetter("vNicPerformanceArray")
+ public abstract List<VNicPerformance> getVNicPerformanceArray();
}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/NamedArrayOfFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/NamedArrayOfFieldsMixin.java
new file mode 100644
index 0000000..603b6b9
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/NamedArrayOfFieldsMixin.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.cef;
+
+/**
+ * @author Rajiv Singla . Creation Date: 08/15/2017.
+ */
+public abstract class NamedArrayOfFieldsMixin extends BaseCEFModelMixin {
+
+}
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
index 2c049fe..b133318 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -23,7 +23,7 @@ package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
/**
* CEF Performance Counter Mixin
*
- * @author Rajiv Singla . Creation Date: 11/3/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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
index ee2404e..f095cb2 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -24,7 +24,7 @@ import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
/**
*
- * @author Rajiv Singla . Creation Date: 11/5/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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
index 44e17ac..97c6be8 100644
--- 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
@@ -1,21 +1,21 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============LICENSE_END=========================================================
*/
package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
@@ -23,7 +23,7 @@ package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef;
/**
* Mixin class for ThresholdCrossingAlertFields
*
- * @author Rajiv Singla . Creation Date: 11/3/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
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
index e882183..295c8c8 100644
--- 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
@@ -1,48 +1,36 @@
/*
- * ===============================LICENSE_START======================================
- * dcae-analytics
+ * ============LICENSE_START=========================================================
+ * dcae-analytics
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * 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
+ * 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.
- * ============================LICENSE_END===========================================
+ * ============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;
/**
- * @author Rajiv Singla . Creation Date: 10/18/2016.
+ * @author Rajiv Singla. Creation Date: 08/15/2017.
*/
public abstract class VNicUsageArrayMixin extends BaseCEFModelMixin {
- /**
- * Provides hint to Jackson Jackson deserialization to bind "vNicIdentifier" string to "vNicIdentifier"
- * variable in CEF parsed Java Object
- *
- * @param name of the vNicIdentifier
- */
@JsonSetter("vNicIdentifier")
public abstract void setVNicIdentifier(String name);
- /**
- * Provides hint to Jackson Jackson serialization to bind "vNicIdentifier" field to "vNicIdentifier" in json
- *
- * @return name of vNicIdentifier
- */
- @JsonGetter("vNicIdentifier")
- public abstract String getVNicIdentifier();
+ @JsonSetter("vNicIdentifier")
+ public abstract String setVNicIdentifier();
}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/BaseTCAAppConfigModelMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/BaseTCAAppConfigModelMixin.java
new file mode 100644
index 0000000..2fa82a2
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/BaseTCAAppConfigModelMixin.java
@@ -0,0 +1,9 @@
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca;
+
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.BaseDynamicPropertiesProviderMixin;
+
+/**
+ * Author: rs153v (Rajiv Singla) . Creation Date: 8/25/2017.
+ */
+public abstract class BaseTCAAppConfigModelMixin extends BaseDynamicPropertiesProviderMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/BaseTCAHandleMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/BaseTCAHandleMixin.java
new file mode 100644
index 0000000..6963b9c
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/BaseTCAHandleMixin.java
@@ -0,0 +1,20 @@
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.openecomp.dcae.apod.analytics.model.config.tca.DMAAPInfo;
+
+/**
+ * Author: rs153v (Rajiv Singla) . Creation Date: 8/25/2017.
+ */
+public abstract class BaseTCAHandleMixin extends BaseTCAAppConfigModelMixin {
+
+ @JsonProperty("aaf_password")
+ String aafPassword;
+ @JsonProperty("aaf_username")
+ String aafUserName;
+ @JsonProperty("dmaap_info")
+ DMAAPInfo dmaapInfo;
+ @JsonProperty("type")
+ String type;
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/DMAAPInfoMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/DMAAPInfoMixin.java
new file mode 100644
index 0000000..bed8c4e
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/DMAAPInfoMixin.java
@@ -0,0 +1,13 @@
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Author: rs153v (Rajiv Singla) . Creation Date: 8/25/2017.
+ */
+
+public abstract class DMAAPInfoMixin extends BaseTCAAppConfigModelMixin {
+
+ @JsonProperty("topic_url")
+ String topicUrl;
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/StreamsPublishesMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/StreamsPublishesMixin.java
new file mode 100644
index 0000000..fb074e5
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/StreamsPublishesMixin.java
@@ -0,0 +1,14 @@
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.openecomp.dcae.apod.analytics.model.config.tca.TCAHandleOut;
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.BaseTCAPolicyModelMixin;
+
+/**
+ * Author: rs153v (Rajiv Singla) . Creation Date: 8/25/2017.
+ */
+public abstract class StreamsPublishesMixin extends BaseTCAPolicyModelMixin {
+
+ @JsonProperty("tca_handle_out")
+ TCAHandleOut tcaHandleOut;
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/StreamsSubscribesMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/StreamsSubscribesMixin.java
new file mode 100644
index 0000000..1593389
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/StreamsSubscribesMixin.java
@@ -0,0 +1,14 @@
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.openecomp.dcae.apod.analytics.model.config.tca.TCAHandleIn;
+
+/**
+ * Author: rs153v (Rajiv Singla) . Creation Date: 8/25/2017.
+ */
+public abstract class StreamsSubscribesMixin extends BaseTCAAppConfigModelMixin {
+
+ @JsonProperty("tca_handle_in")
+ TCAHandleIn tcaHandleIn;
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/TCAControllerAppConfigMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/TCAControllerAppConfigMixin.java
new file mode 100644
index 0000000..98a77ec
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/config/tca/TCAControllerAppConfigMixin.java
@@ -0,0 +1,17 @@
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.config.tca;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.openecomp.dcae.apod.analytics.model.config.tca.StreamsPublishes;
+import org.openecomp.dcae.apod.analytics.model.config.tca.StreamsSubscribes;
+
+/**
+ * Author: rs153v (Rajiv Singla) . Creation Date: 8/25/2017.
+ */
+public abstract class TCAControllerAppConfigMixin extends BaseTCAAppConfigModelMixin {
+
+ @JsonProperty("streams_publishes")
+ StreamsPublishes streamsPublishes;
+ @JsonProperty("streams_subscribes")
+ StreamsSubscribes streamsSubscribes;
+
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ControlLoopEventStatusMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ControlLoopEventStatusMixin.java
new file mode 100644
index 0000000..28798be
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ControlLoopEventStatusMixin.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: 9/11/2017.
+ */
+public abstract class ControlLoopEventStatusMixin implements JsonMixin {
+}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ControlLoopSchemaTypeMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ControlLoopSchemaTypeMixin.java
new file mode 100644
index 0000000..f0538ea
--- /dev/null
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ControlLoopSchemaTypeMixin.java
@@ -0,0 +1,9 @@
+package org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca;
+
+import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin;
+
+/**
+ * Author: rs153v (Rajiv Singla) . Creation Date: 8/24/2017.
+ */
+public abstract class ControlLoopSchemaTypeMixin 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/MetricsPerEventNameMixin.java
index 8ca10fc..0017a39 100644
--- 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/MetricsPerEventNameMixin.java
@@ -24,5 +24,5 @@ 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 {
+public abstract class MetricsPerEventNameMixin extends BaseTCAPolicyModelMixin {
}