Upgraded to Support VES 7.0

Upgraded Universal VES Adapter to support VES Version 7.0

Issue-ID: DCAEGEN2-1005
Change-Id: Ib52f71957be8bb16ea84b19c9264d6fa042f2db0
Signed-off-by: Pooja03 <pm00501616@techmahindra.com>

126 files changed, 17377 insertions, 14955 deletions

diff --git a/UniversalVesAdapter/kv.json b/UniversalVesAdapter/kv.json
new file mode 100644
index 0000000..1c16b5e
--- /dev/null
+++ b/UniversalVesAdapter/kv.json
@@ -0,0 +1,5 @@
+{"app_preferences": {"collectors": [{
+    "identifier": "notification-id",
+    "subscriberTopic": "ONAP-COLLECTOR-RESTCONFTRAP",
+    "mapping-files": [{"defaultMappingFile-ONAP-COLLECTOR-RESTCONFTRAP": "<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /><\/json:keyMap><\/json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Version._4_0_1<\/jb:expression><jb:expression property='eventType'>'pnfRegistration'<\/jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1<\/jb:expression><jb:expression property='reportingEntityName'>'VESMapper'<\/jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain<\/jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Priority.NORMAL<\/jb:expression><jb:value property='sourceName' data='notification/message/target' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves7_0.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><jb:value property='serialNumber' data='notification/message/content/onu/sn' /><\/jb:bean><\/smooks-resource-list>"}]
+}]}}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalField.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalField.java
deleted file mode 100644
index a191fc9..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalField.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-public class AdditionalField {
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalParameter.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalParameter.java
deleted file mode 100644
index 43bd6a9..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalParameter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "criticality",
-    "name",
-    "thresholdCrossed",
-    "value"
-})
-public class AdditionalParameter {
-
-    @JsonProperty("criticality")
-    private String criticality;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("thresholdCrossed")
-    private String thresholdCrossed;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("criticality")
-    public String getCriticality() {
-        return criticality;
-    }
-
-    @JsonProperty("criticality")
-    public void setCriticality(String criticality) {
-        this.criticality = criticality;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("thresholdCrossed")
-    public String getThresholdCrossed() {
-        return thresholdCrossed;
-    }
-
-    @JsonProperty("thresholdCrossed")
-    public void setThresholdCrossed(String thresholdCrossed) {
-        this.thresholdCrossed = thresholdCrossed;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("criticality", criticality).append("name", name).append("thresholdCrossed", thresholdCrossed).append("value", value).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(criticality).append(additionalProperties).append(name).append(value).append(thresholdCrossed).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof AdditionalParameter) == false) {
-            return false;
-        }
-        AdditionalParameter rhs = ((AdditionalParameter) other);
-        return new EqualsBuilder().append(criticality, rhs.criticality).append(additionalProperties, rhs.additionalProperties).append(name, rhs.name).append(value, rhs.value).append(thresholdCrossed, rhs.thresholdCrossed).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AlarmAdditionalInformation.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AlarmAdditionalInformation.java
deleted file mode 100644
index fe60761..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AlarmAdditionalInformation.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-public class AlarmAdditionalInformation {
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("name", name).append("value", value).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(additionalProperties).append(name).append(value).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof AlarmAdditionalInformation) == false) {
-            return false;
-        }
-        AlarmAdditionalInformation rhs = ((AlarmAdditionalInformation) other);
-        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).append(name, rhs.name).append(value, rhs.value).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ArrayOfField.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ArrayOfField.java
deleted file mode 100644
index 43b16ff..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ArrayOfField.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-public class ArrayOfField {
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("name", name).append("value", value).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(additionalProperties).append(name).append(value).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof ArrayOfField) == false) {
-            return false;
-        }
-        ArrayOfField rhs = ((ArrayOfField) other);
-        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).append(name, rhs.name).append(value, rhs.value).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ArrayOfField_.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ArrayOfField_.java
deleted file mode 100644
index 4e28be7..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ArrayOfField_.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-public class ArrayOfField_ {
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("name", name).append("value", value).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(additionalProperties).append(name).append(value).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof ArrayOfField_) == false) {
-            return false;
-        }
-        ArrayOfField_ rhs = ((ArrayOfField_) other);
-        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).append(name, rhs.name).append(value, rhs.value).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/CommonEventHeader.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/CommonEventHeader.java
deleted file mode 100644
index f5d56a4..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/CommonEventHeader.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "domain",
-    "eventId",
-    "eventName",
-    "lastEpochMicrosec",
-    "priority",
-    "reportingEntityName",
-    "sequence",
-    "sourceName",
-    "startEpochMicrosec",
-    "version",
-    "eventType",
-    "internalHeaderFields",
-    "nfcNamingCode",
-    "nfNamingCode",
-    "reportingEntityId",
-    "sourceId"
-})
-public class CommonEventHeader {
-
-    @JsonProperty("domain")
-    private String domain;
-    @JsonProperty("eventId")
-    private String eventId;
-    @JsonProperty("eventName")
-    private String eventName;
-    @JsonProperty("lastEpochMicrosec")
-    private Double lastEpochMicrosec;
-    @JsonProperty("priority")
-    private String priority;
-    @JsonProperty("reportingEntityName")
-    private String reportingEntityName;
-    @JsonProperty("sequence")
-    private Long sequence;
-    @JsonProperty("sourceName")
-    private String sourceName;
-    @JsonProperty("startEpochMicrosec")
-    private Double startEpochMicrosec;
-    @JsonProperty("version")
-    private Double version;
-    @JsonProperty("eventType")
-    private String eventType;
-    @JsonProperty("internalHeaderFields")
-    private InternalHeaderFields internalHeaderFields;
-    @JsonProperty("nfcNamingCode")
-    private String nfcNamingCode;
-    @JsonProperty("nfNamingCode")
-    private String nfNamingCode;
-    @JsonProperty("reportingEntityId")
-    private String reportingEntityId;
-    @JsonProperty("sourceId")
-    private String sourceId;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("domain")
-    public String getDomain() {
-        return domain;
-    }
-
-    @JsonProperty("domain")
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
-    @JsonProperty("eventId")
-    public String getEventId() {
-        return eventId;
-    }
-
-    @JsonProperty("eventId")
-    public void setEventId(String eventId) {
-        this.eventId = eventId;
-    }
-
-    @JsonProperty("eventName")
-    public String getEventName() {
-        return eventName;
-    }
-
-    @JsonProperty("eventName")
-    public void setEventName(String eventName) {
-        this.eventName = eventName;
-    }
-
-    @JsonProperty("lastEpochMicrosec")
-    public Double getLastEpochMicrosec() {
-        return lastEpochMicrosec;
-    }
-
-    @JsonProperty("lastEpochMicrosec")
-    public void setLastEpochMicrosec(Double lastEpochMicrosec) {
-        this.lastEpochMicrosec = lastEpochMicrosec;
-    }
-
-    @JsonProperty("priority")
-    public String getPriority() {
-        return priority;
-    }
-
-    @JsonProperty("priority")
-    public void setPriority(String priority) {
-        this.priority = priority;
-    }
-
-    @JsonProperty("reportingEntityName")
-    public String getReportingEntityName() {
-        return reportingEntityName;
-    }
-
-    @JsonProperty("reportingEntityName")
-    public void setReportingEntityName(String reportingEntityName) {
-        this.reportingEntityName = reportingEntityName;
-    }
-
-    @JsonProperty("sequence")
-    public Long getSequence() {
-        return sequence;
-    }
-
-    @JsonProperty("sequence")
-    public void setSequence(Long sequence) {
-        this.sequence = sequence;
-    }
-
-    @JsonProperty("sourceName")
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    @JsonProperty("sourceName")
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
-    }
-
-    @JsonProperty("startEpochMicrosec")
-    public Double getStartEpochMicrosec() {
-        return startEpochMicrosec;
-    }
-
-    @JsonProperty("startEpochMicrosec")
-    public void setStartEpochMicrosec(Double startEpochMicrosec) {
-        this.startEpochMicrosec = startEpochMicrosec;
-    }
-
-    @JsonProperty("version")
-    public Double getVersion() {
-        return version;
-    }
-
-    @JsonProperty("version")
-    public void setVersion(Double version) {
-        this.version = version;
-    }
-
-    @JsonProperty("eventType")
-    public String getEventType() {
-        return eventType;
-    }
-
-    @JsonProperty("eventType")
-    public void setEventType(String eventType) {
-        this.eventType = eventType;
-    }
-
-    @JsonProperty("internalHeaderFields")
-    public InternalHeaderFields getInternalHeaderFields() {
-        return internalHeaderFields;
-    }
-
-    @JsonProperty("internalHeaderFields")
-    public void setInternalHeaderFields(InternalHeaderFields internalHeaderFields) {
-        this.internalHeaderFields = internalHeaderFields;
-    }
-
-    @JsonProperty("nfcNamingCode")
-    public String getNfcNamingCode() {
-        return nfcNamingCode;
-    }
-
-    @JsonProperty("nfcNamingCode")
-    public void setNfcNamingCode(String nfcNamingCode) {
-        this.nfcNamingCode = nfcNamingCode;
-    }
-
-    @JsonProperty("nfNamingCode")
-    public String getNfNamingCode() {
-        return nfNamingCode;
-    }
-
-    @JsonProperty("nfNamingCode")
-    public void setNfNamingCode(String nfNamingCode) {
-        this.nfNamingCode = nfNamingCode;
-    }
-
-    @JsonProperty("reportingEntityId")
-    public String getReportingEntityId() {
-        return reportingEntityId;
-    }
-
-    @JsonProperty("reportingEntityId")
-    public void setReportingEntityId(String reportingEntityId) {
-        this.reportingEntityId = reportingEntityId;
-    }
-
-    @JsonProperty("sourceId")
-    public String getSourceId() {
-        return sourceId;
-    }
-
-    @JsonProperty("sourceId")
-    public void setSourceId(String sourceId) {
-        this.sourceId = sourceId;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("domain", domain).append("eventId", eventId).append("eventName", eventName).append("lastEpochMicrosec", lastEpochMicrosec).append("priority", priority).append("reportingEntityName", reportingEntityName).append("sequence", sequence).append("sourceName", sourceName).append("startEpochMicrosec", startEpochMicrosec).append("version", version).append("eventType", eventType).append("internalHeaderFields", internalHeaderFields).append("nfcNamingCode", nfcNamingCode).append("nfNamingCode", nfNamingCode).append("reportingEntityId", reportingEntityId).append("sourceId", sourceId).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(nfNamingCode).append(eventType).append(sourceId).append(version).append(reportingEntityName).append(startEpochMicrosec).append(lastEpochMicrosec).append(eventId).append(nfcNamingCode).append(additionalProperties).append(sourceName).append(sequence).append(priority).append(domain).append(internalHeaderFields).append(eventName).append(reportingEntityId).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof CommonEventHeader) == false) {
-            return false;
-        }
-        CommonEventHeader rhs = ((CommonEventHeader) other);
-        return new EqualsBuilder().append(nfNamingCode, rhs.nfNamingCode).append(eventType, rhs.eventType).append(sourceId, rhs.sourceId).append(version, rhs.version).append(reportingEntityName, rhs.reportingEntityName).append(startEpochMicrosec, rhs.startEpochMicrosec).append(lastEpochMicrosec, rhs.lastEpochMicrosec).append(eventId, rhs.eventId).append(nfcNamingCode, rhs.nfcNamingCode).append(additionalProperties, rhs.additionalProperties).append(sourceName, rhs.sourceName).append(sequence, rhs.sequence).append(priority, rhs.priority).append(domain, rhs.domain).append(internalHeaderFields, rhs.internalHeaderFields).append(eventName, rhs.eventName).append(reportingEntityId, rhs.reportingEntityId).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/CpuUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/CpuUsageArray.java
deleted file mode 100644
index eaec232..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/CpuUsageArray.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "cpuIdentifier",
-    "percentUsage",
-    "cpuIdle",
-    "cpuUsageInterrupt",
-    "cpuUsageNice",
-    "cpuUsageSoftIrq",
-    "cpuUsageSteal",
-    "cpuUsageSystem",
-    "cpuUsageUser",
-    "cpuWait"
-})
-public class CpuUsageArray {
-
-    @JsonProperty("cpuIdentifier")
-    private String cpuIdentifier;
-    @JsonProperty("percentUsage")
-    private Double percentUsage;
-    @JsonProperty("cpuIdle")
-    private Double cpuIdle;
-    @JsonProperty("cpuUsageInterrupt")
-    private Double cpuUsageInterrupt;
-    @JsonProperty("cpuUsageNice")
-    private Double cpuUsageNice;
-    @JsonProperty("cpuUsageSoftIrq")
-    private Double cpuUsageSoftIrq;
-    @JsonProperty("cpuUsageSteal")
-    private Double cpuUsageSteal;
-    @JsonProperty("cpuUsageSystem")
-    private Double cpuUsageSystem;
-    @JsonProperty("cpuUsageUser")
-    private Double cpuUsageUser;
-    @JsonProperty("cpuWait")
-    private Double cpuWait;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("cpuIdentifier")
-    public String getCpuIdentifier() {
-        return cpuIdentifier;
-    }
-
-    @JsonProperty("cpuIdentifier")
-    public void setCpuIdentifier(String cpuIdentifier) {
-        this.cpuIdentifier = cpuIdentifier;
-    }
-
-    @JsonProperty("percentUsage")
-    public Double getPercentUsage() {
-        return percentUsage;
-    }
-
-    @JsonProperty("percentUsage")
-    public void setPercentUsage(Double percentUsage) {
-        this.percentUsage = percentUsage;
-    }
-
-    @JsonProperty("cpuIdle")
-    public Double getCpuIdle() {
-        return cpuIdle;
-    }
-
-    @JsonProperty("cpuIdle")
-    public void setCpuIdle(Double cpuIdle) {
-        this.cpuIdle = cpuIdle;
-    }
-
-    @JsonProperty("cpuUsageInterrupt")
-    public Double getCpuUsageInterrupt() {
-        return cpuUsageInterrupt;
-    }
-
-    @JsonProperty("cpuUsageInterrupt")
-    public void setCpuUsageInterrupt(Double cpuUsageInterrupt) {
-        this.cpuUsageInterrupt = cpuUsageInterrupt;
-    }
-
-    @JsonProperty("cpuUsageNice")
-    public Double getCpuUsageNice() {
-        return cpuUsageNice;
-    }
-
-    @JsonProperty("cpuUsageNice")
-    public void setCpuUsageNice(Double cpuUsageNice) {
-        this.cpuUsageNice = cpuUsageNice;
-    }
-
-    @JsonProperty("cpuUsageSoftIrq")
-    public Double getCpuUsageSoftIrq() {
-        return cpuUsageSoftIrq;
-    }
-
-    @JsonProperty("cpuUsageSoftIrq")
-    public void setCpuUsageSoftIrq(Double cpuUsageSoftIrq) {
-        this.cpuUsageSoftIrq = cpuUsageSoftIrq;
-    }
-
-    @JsonProperty("cpuUsageSteal")
-    public Double getCpuUsageSteal() {
-        return cpuUsageSteal;
-    }
-
-    @JsonProperty("cpuUsageSteal")
-    public void setCpuUsageSteal(Double cpuUsageSteal) {
-        this.cpuUsageSteal = cpuUsageSteal;
-    }
-
-    @JsonProperty("cpuUsageSystem")
-    public Double getCpuUsageSystem() {
-        return cpuUsageSystem;
-    }
-
-    @JsonProperty("cpuUsageSystem")
-    public void setCpuUsageSystem(Double cpuUsageSystem) {
-        this.cpuUsageSystem = cpuUsageSystem;
-    }
-
-    @JsonProperty("cpuUsageUser")
-    public Double getCpuUsageUser() {
-        return cpuUsageUser;
-    }
-
-    @JsonProperty("cpuUsageUser")
-    public void setCpuUsageUser(Double cpuUsageUser) {
-        this.cpuUsageUser = cpuUsageUser;
-    }
-
-    @JsonProperty("cpuWait")
-    public Double getCpuWait() {
-        return cpuWait;
-    }
-
-    @JsonProperty("cpuWait")
-    public void setCpuWait(Double cpuWait) {
-        this.cpuWait = cpuWait;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("cpuIdentifier", cpuIdentifier).append("percentUsage", percentUsage).append("cpuIdle", cpuIdle).append("cpuUsageInterrupt", cpuUsageInterrupt).append("cpuUsageNice", cpuUsageNice).append("cpuUsageSoftIrq", cpuUsageSoftIrq).append("cpuUsageSteal", cpuUsageSteal).append("cpuUsageSystem", cpuUsageSystem).append("cpuUsageUser", cpuUsageUser).append("cpuWait", cpuWait).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(cpuUsageNice).append(cpuUsageSteal).append(cpuUsageInterrupt).append(cpuUsageSoftIrq).append(cpuIdentifier).append(additionalProperties).append(cpuWait).append(cpuUsageSystem).append(cpuUsageUser).append(cpuIdle).append(percentUsage).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof CpuUsageArray) == false) {
-            return false;
-        }
-        CpuUsageArray rhs = ((CpuUsageArray) other);
-        return new EqualsBuilder().append(cpuUsageNice, rhs.cpuUsageNice).append(cpuUsageSteal, rhs.cpuUsageSteal).append(cpuUsageInterrupt, rhs.cpuUsageInterrupt).append(cpuUsageSoftIrq, rhs.cpuUsageSoftIrq).append(cpuIdentifier, rhs.cpuIdentifier).append(additionalProperties, rhs.additionalProperties).append(cpuWait, rhs.cpuWait).append(cpuUsageSystem, rhs.cpuUsageSystem).append(cpuUsageUser, rhs.cpuUsageUser).append(cpuIdle, rhs.cpuIdle).append(percentUsage, rhs.percentUsage).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/DiskUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/DiskUsageArray.java
deleted file mode 100644
index 8aafa0c..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/DiskUsageArray.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "diskIdentifier",
-    "diskIoTimeAvg",
-    "diskIoTimeLast",
-    "diskIoTimeMax",
-    "diskIoTimeMin",
-    "diskMergedReadAvg",
-    "diskMergedReadLast",
-    "diskMergedReadMax",
-    "diskMergedReadMin",
-    "diskMergedWriteAvg",
-    "diskMergedWriteLast",
-    "diskMergedWriteMax",
-    "diskMergedWriteMin",
-    "diskOctetsReadAvg",
-    "diskOctetsReadLast",
-    "diskOctetsReadMax",
-    "diskOctetsReadMin",
-    "diskOctetsWriteAvg",
-    "diskOctetsWriteLast",
-    "diskOctetsWriteMax",
-    "diskOctetsWriteMin",
-    "diskOpsReadAvg",
-    "diskOpsReadLast",
-    "diskOpsReadMax",
-    "diskOpsReadMin",
-    "diskOpsWriteAvg",
-    "diskOpsWriteLast",
-    "diskOpsWriteMax",
-    "diskOpsWriteMin",
-    "diskPendingOperationsAvg",
-    "diskPendingOperationsLast",
-    "diskPendingOperationsMax",
-    "diskPendingOperationsMin",
-    "diskTimeReadAvg",
-    "diskTimeReadLast",
-    "diskTimeReadMax",
-    "diskTimeReadMin",
-    "diskTimeWriteAvg",
-    "diskTimeWriteLast",
-    "diskTimeWriteMax",
-    "diskTimeWriteMin"
-})
-public class DiskUsageArray {
-
-    @JsonProperty("diskIdentifier")
-    private String diskIdentifier;
-    @JsonProperty("diskIoTimeAvg")
-    private Double diskIoTimeAvg;
-    @JsonProperty("diskIoTimeLast")
-    private Double diskIoTimeLast;
-    @JsonProperty("diskIoTimeMax")
-    private Double diskIoTimeMax;
-    @JsonProperty("diskIoTimeMin")
-    private Double diskIoTimeMin;
-    @JsonProperty("diskMergedReadAvg")
-    private Double diskMergedReadAvg;
-    @JsonProperty("diskMergedReadLast")
-    private Double diskMergedReadLast;
-    @JsonProperty("diskMergedReadMax")
-    private Double diskMergedReadMax;
-    @JsonProperty("diskMergedReadMin")
-    private Double diskMergedReadMin;
-    @JsonProperty("diskMergedWriteAvg")
-    private Double diskMergedWriteAvg;
-    @JsonProperty("diskMergedWriteLast")
-    private Double diskMergedWriteLast;
-    @JsonProperty("diskMergedWriteMax")
-    private Double diskMergedWriteMax;
-    @JsonProperty("diskMergedWriteMin")
-    private Double diskMergedWriteMin;
-    @JsonProperty("diskOctetsReadAvg")
-    private Double diskOctetsReadAvg;
-    @JsonProperty("diskOctetsReadLast")
-    private Double diskOctetsReadLast;
-    @JsonProperty("diskOctetsReadMax")
-    private Double diskOctetsReadMax;
-    @JsonProperty("diskOctetsReadMin")
-    private Double diskOctetsReadMin;
-    @JsonProperty("diskOctetsWriteAvg")
-    private Double diskOctetsWriteAvg;
-    @JsonProperty("diskOctetsWriteLast")
-    private Double diskOctetsWriteLast;
-    @JsonProperty("diskOctetsWriteMax")
-    private Double diskOctetsWriteMax;
-    @JsonProperty("diskOctetsWriteMin")
-    private Double diskOctetsWriteMin;
-    @JsonProperty("diskOpsReadAvg")
-    private Double diskOpsReadAvg;
-    @JsonProperty("diskOpsReadLast")
-    private Double diskOpsReadLast;
-    @JsonProperty("diskOpsReadMax")
-    private Double diskOpsReadMax;
-    @JsonProperty("diskOpsReadMin")
-    private Double diskOpsReadMin;
-    @JsonProperty("diskOpsWriteAvg")
-    private Double diskOpsWriteAvg;
-    @JsonProperty("diskOpsWriteLast")
-    private Double diskOpsWriteLast;
-    @JsonProperty("diskOpsWriteMax")
-    private Double diskOpsWriteMax;
-    @JsonProperty("diskOpsWriteMin")
-    private Double diskOpsWriteMin;
-    @JsonProperty("diskPendingOperationsAvg")
-    private Double diskPendingOperationsAvg;
-    @JsonProperty("diskPendingOperationsLast")
-    private Double diskPendingOperationsLast;
-    @JsonProperty("diskPendingOperationsMax")
-    private Double diskPendingOperationsMax;
-    @JsonProperty("diskPendingOperationsMin")
-    private Double diskPendingOperationsMin;
-    @JsonProperty("diskTimeReadAvg")
-    private Double diskTimeReadAvg;
-    @JsonProperty("diskTimeReadLast")
-    private Double diskTimeReadLast;
-    @JsonProperty("diskTimeReadMax")
-    private Double diskTimeReadMax;
-    @JsonProperty("diskTimeReadMin")
-    private Double diskTimeReadMin;
-    @JsonProperty("diskTimeWriteAvg")
-    private Double diskTimeWriteAvg;
-    @JsonProperty("diskTimeWriteLast")
-    private Double diskTimeWriteLast;
-    @JsonProperty("diskTimeWriteMax")
-    private Double diskTimeWriteMax;
-    @JsonProperty("diskTimeWriteMin")
-    private Double diskTimeWriteMin;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("diskIdentifier")
-    public String getDiskIdentifier() {
-        return diskIdentifier;
-    }
-
-    @JsonProperty("diskIdentifier")
-    public void setDiskIdentifier(String diskIdentifier) {
-        this.diskIdentifier = diskIdentifier;
-    }
-
-    @JsonProperty("diskIoTimeAvg")
-    public Double getDiskIoTimeAvg() {
-        return diskIoTimeAvg;
-    }
-
-    @JsonProperty("diskIoTimeAvg")
-    public void setDiskIoTimeAvg(Double diskIoTimeAvg) {
-        this.diskIoTimeAvg = diskIoTimeAvg;
-    }
-
-    @JsonProperty("diskIoTimeLast")
-    public Double getDiskIoTimeLast() {
-        return diskIoTimeLast;
-    }
-
-    @JsonProperty("diskIoTimeLast")
-    public void setDiskIoTimeLast(Double diskIoTimeLast) {
-        this.diskIoTimeLast = diskIoTimeLast;
-    }
-
-    @JsonProperty("diskIoTimeMax")
-    public Double getDiskIoTimeMax() {
-        return diskIoTimeMax;
-    }
-
-    @JsonProperty("diskIoTimeMax")
-    public void setDiskIoTimeMax(Double diskIoTimeMax) {
-        this.diskIoTimeMax = diskIoTimeMax;
-    }
-
-    @JsonProperty("diskIoTimeMin")
-    public Double getDiskIoTimeMin() {
-        return diskIoTimeMin;
-    }
-
-    @JsonProperty("diskIoTimeMin")
-    public void setDiskIoTimeMin(Double diskIoTimeMin) {
-        this.diskIoTimeMin = diskIoTimeMin;
-    }
-
-    @JsonProperty("diskMergedReadAvg")
-    public Double getDiskMergedReadAvg() {
-        return diskMergedReadAvg;
-    }
-
-    @JsonProperty("diskMergedReadAvg")
-    public void setDiskMergedReadAvg(Double diskMergedReadAvg) {
-        this.diskMergedReadAvg = diskMergedReadAvg;
-    }
-
-    @JsonProperty("diskMergedReadLast")
-    public Double getDiskMergedReadLast() {
-        return diskMergedReadLast;
-    }
-
-    @JsonProperty("diskMergedReadLast")
-    public void setDiskMergedReadLast(Double diskMergedReadLast) {
-        this.diskMergedReadLast = diskMergedReadLast;
-    }
-
-    @JsonProperty("diskMergedReadMax")
-    public Double getDiskMergedReadMax() {
-        return diskMergedReadMax;
-    }
-
-    @JsonProperty("diskMergedReadMax")
-    public void setDiskMergedReadMax(Double diskMergedReadMax) {
-        this.diskMergedReadMax = diskMergedReadMax;
-    }
-
-    @JsonProperty("diskMergedReadMin")
-    public Double getDiskMergedReadMin() {
-        return diskMergedReadMin;
-    }
-
-    @JsonProperty("diskMergedReadMin")
-    public void setDiskMergedReadMin(Double diskMergedReadMin) {
-        this.diskMergedReadMin = diskMergedReadMin;
-    }
-
-    @JsonProperty("diskMergedWriteAvg")
-    public Double getDiskMergedWriteAvg() {
-        return diskMergedWriteAvg;
-    }
-
-    @JsonProperty("diskMergedWriteAvg")
-    public void setDiskMergedWriteAvg(Double diskMergedWriteAvg) {
-        this.diskMergedWriteAvg = diskMergedWriteAvg;
-    }
-
-    @JsonProperty("diskMergedWriteLast")
-    public Double getDiskMergedWriteLast() {
-        return diskMergedWriteLast;
-    }
-
-    @JsonProperty("diskMergedWriteLast")
-    public void setDiskMergedWriteLast(Double diskMergedWriteLast) {
-        this.diskMergedWriteLast = diskMergedWriteLast;
-    }
-
-    @JsonProperty("diskMergedWriteMax")
-    public Double getDiskMergedWriteMax() {
-        return diskMergedWriteMax;
-    }
-
-    @JsonProperty("diskMergedWriteMax")
-    public void setDiskMergedWriteMax(Double diskMergedWriteMax) {
-        this.diskMergedWriteMax = diskMergedWriteMax;
-    }
-
-    @JsonProperty("diskMergedWriteMin")
-    public Double getDiskMergedWriteMin() {
-        return diskMergedWriteMin;
-    }
-
-    @JsonProperty("diskMergedWriteMin")
-    public void setDiskMergedWriteMin(Double diskMergedWriteMin) {
-        this.diskMergedWriteMin = diskMergedWriteMin;
-    }
-
-    @JsonProperty("diskOctetsReadAvg")
-    public Double getDiskOctetsReadAvg() {
-        return diskOctetsReadAvg;
-    }
-
-    @JsonProperty("diskOctetsReadAvg")
-    public void setDiskOctetsReadAvg(Double diskOctetsReadAvg) {
-        this.diskOctetsReadAvg = diskOctetsReadAvg;
-    }
-
-    @JsonProperty("diskOctetsReadLast")
-    public Double getDiskOctetsReadLast() {
-        return diskOctetsReadLast;
-    }
-
-    @JsonProperty("diskOctetsReadLast")
-    public void setDiskOctetsReadLast(Double diskOctetsReadLast) {
-        this.diskOctetsReadLast = diskOctetsReadLast;
-    }
-
-    @JsonProperty("diskOctetsReadMax")
-    public Double getDiskOctetsReadMax() {
-        return diskOctetsReadMax;
-    }
-
-    @JsonProperty("diskOctetsReadMax")
-    public void setDiskOctetsReadMax(Double diskOctetsReadMax) {
-        this.diskOctetsReadMax = diskOctetsReadMax;
-    }
-
-    @JsonProperty("diskOctetsReadMin")
-    public Double getDiskOctetsReadMin() {
-        return diskOctetsReadMin;
-    }
-
-    @JsonProperty("diskOctetsReadMin")
-    public void setDiskOctetsReadMin(Double diskOctetsReadMin) {
-        this.diskOctetsReadMin = diskOctetsReadMin;
-    }
-
-    @JsonProperty("diskOctetsWriteAvg")
-    public Double getDiskOctetsWriteAvg() {
-        return diskOctetsWriteAvg;
-    }
-
-    @JsonProperty("diskOctetsWriteAvg")
-    public void setDiskOctetsWriteAvg(Double diskOctetsWriteAvg) {
-        this.diskOctetsWriteAvg = diskOctetsWriteAvg;
-    }
-
-    @JsonProperty("diskOctetsWriteLast")
-    public Double getDiskOctetsWriteLast() {
-        return diskOctetsWriteLast;
-    }
-
-    @JsonProperty("diskOctetsWriteLast")
-    public void setDiskOctetsWriteLast(Double diskOctetsWriteLast) {
-        this.diskOctetsWriteLast = diskOctetsWriteLast;
-    }
-
-    @JsonProperty("diskOctetsWriteMax")
-    public Double getDiskOctetsWriteMax() {
-        return diskOctetsWriteMax;
-    }
-
-    @JsonProperty("diskOctetsWriteMax")
-    public void setDiskOctetsWriteMax(Double diskOctetsWriteMax) {
-        this.diskOctetsWriteMax = diskOctetsWriteMax;
-    }
-
-    @JsonProperty("diskOctetsWriteMin")
-    public Double getDiskOctetsWriteMin() {
-        return diskOctetsWriteMin;
-    }
-
-    @JsonProperty("diskOctetsWriteMin")
-    public void setDiskOctetsWriteMin(Double diskOctetsWriteMin) {
-        this.diskOctetsWriteMin = diskOctetsWriteMin;
-    }
-
-    @JsonProperty("diskOpsReadAvg")
-    public Double getDiskOpsReadAvg() {
-        return diskOpsReadAvg;
-    }
-
-    @JsonProperty("diskOpsReadAvg")
-    public void setDiskOpsReadAvg(Double diskOpsReadAvg) {
-        this.diskOpsReadAvg = diskOpsReadAvg;
-    }
-
-    @JsonProperty("diskOpsReadLast")
-    public Double getDiskOpsReadLast() {
-        return diskOpsReadLast;
-    }
-
-    @JsonProperty("diskOpsReadLast")
-    public void setDiskOpsReadLast(Double diskOpsReadLast) {
-        this.diskOpsReadLast = diskOpsReadLast;
-    }
-
-    @JsonProperty("diskOpsReadMax")
-    public Double getDiskOpsReadMax() {
-        return diskOpsReadMax;
-    }
-
-    @JsonProperty("diskOpsReadMax")
-    public void setDiskOpsReadMax(Double diskOpsReadMax) {
-        this.diskOpsReadMax = diskOpsReadMax;
-    }
-
-    @JsonProperty("diskOpsReadMin")
-    public Double getDiskOpsReadMin() {
-        return diskOpsReadMin;
-    }
-
-    @JsonProperty("diskOpsReadMin")
-    public void setDiskOpsReadMin(Double diskOpsReadMin) {
-        this.diskOpsReadMin = diskOpsReadMin;
-    }
-
-    @JsonProperty("diskOpsWriteAvg")
-    public Double getDiskOpsWriteAvg() {
-        return diskOpsWriteAvg;
-    }
-
-    @JsonProperty("diskOpsWriteAvg")
-    public void setDiskOpsWriteAvg(Double diskOpsWriteAvg) {
-        this.diskOpsWriteAvg = diskOpsWriteAvg;
-    }
-
-    @JsonProperty("diskOpsWriteLast")
-    public Double getDiskOpsWriteLast() {
-        return diskOpsWriteLast;
-    }
-
-    @JsonProperty("diskOpsWriteLast")
-    public void setDiskOpsWriteLast(Double diskOpsWriteLast) {
-        this.diskOpsWriteLast = diskOpsWriteLast;
-    }
-
-    @JsonProperty("diskOpsWriteMax")
-    public Double getDiskOpsWriteMax() {
-        return diskOpsWriteMax;
-    }
-
-    @JsonProperty("diskOpsWriteMax")
-    public void setDiskOpsWriteMax(Double diskOpsWriteMax) {
-        this.diskOpsWriteMax = diskOpsWriteMax;
-    }
-
-    @JsonProperty("diskOpsWriteMin")
-    public Double getDiskOpsWriteMin() {
-        return diskOpsWriteMin;
-    }
-
-    @JsonProperty("diskOpsWriteMin")
-    public void setDiskOpsWriteMin(Double diskOpsWriteMin) {
-        this.diskOpsWriteMin = diskOpsWriteMin;
-    }
-
-    @JsonProperty("diskPendingOperationsAvg")
-    public Double getDiskPendingOperationsAvg() {
-        return diskPendingOperationsAvg;
-    }
-
-    @JsonProperty("diskPendingOperationsAvg")
-    public void setDiskPendingOperationsAvg(Double diskPendingOperationsAvg) {
-        this.diskPendingOperationsAvg = diskPendingOperationsAvg;
-    }
-
-    @JsonProperty("diskPendingOperationsLast")
-    public Double getDiskPendingOperationsLast() {
-        return diskPendingOperationsLast;
-    }
-
-    @JsonProperty("diskPendingOperationsLast")
-    public void setDiskPendingOperationsLast(Double diskPendingOperationsLast) {
-        this.diskPendingOperationsLast = diskPendingOperationsLast;
-    }
-
-    @JsonProperty("diskPendingOperationsMax")
-    public Double getDiskPendingOperationsMax() {
-        return diskPendingOperationsMax;
-    }
-
-    @JsonProperty("diskPendingOperationsMax")
-    public void setDiskPendingOperationsMax(Double diskPendingOperationsMax) {
-        this.diskPendingOperationsMax = diskPendingOperationsMax;
-    }
-
-    @JsonProperty("diskPendingOperationsMin")
-    public Double getDiskPendingOperationsMin() {
-        return diskPendingOperationsMin;
-    }
-
-    @JsonProperty("diskPendingOperationsMin")
-    public void setDiskPendingOperationsMin(Double diskPendingOperationsMin) {
-        this.diskPendingOperationsMin = diskPendingOperationsMin;
-    }
-
-    @JsonProperty("diskTimeReadAvg")
-    public Double getDiskTimeReadAvg() {
-        return diskTimeReadAvg;
-    }
-
-    @JsonProperty("diskTimeReadAvg")
-    public void setDiskTimeReadAvg(Double diskTimeReadAvg) {
-        this.diskTimeReadAvg = diskTimeReadAvg;
-    }
-
-    @JsonProperty("diskTimeReadLast")
-    public Double getDiskTimeReadLast() {
-        return diskTimeReadLast;
-    }
-
-    @JsonProperty("diskTimeReadLast")
-    public void setDiskTimeReadLast(Double diskTimeReadLast) {
-        this.diskTimeReadLast = diskTimeReadLast;
-    }
-
-    @JsonProperty("diskTimeReadMax")
-    public Double getDiskTimeReadMax() {
-        return diskTimeReadMax;
-    }
-
-    @JsonProperty("diskTimeReadMax")
-    public void setDiskTimeReadMax(Double diskTimeReadMax) {
-        this.diskTimeReadMax = diskTimeReadMax;
-    }
-
-    @JsonProperty("diskTimeReadMin")
-    public Double getDiskTimeReadMin() {
-        return diskTimeReadMin;
-    }
-
-    @JsonProperty("diskTimeReadMin")
-    public void setDiskTimeReadMin(Double diskTimeReadMin) {
-        this.diskTimeReadMin = diskTimeReadMin;
-    }
-
-    @JsonProperty("diskTimeWriteAvg")
-    public Double getDiskTimeWriteAvg() {
-        return diskTimeWriteAvg;
-    }
-
-    @JsonProperty("diskTimeWriteAvg")
-    public void setDiskTimeWriteAvg(Double diskTimeWriteAvg) {
-        this.diskTimeWriteAvg = diskTimeWriteAvg;
-    }
-
-    @JsonProperty("diskTimeWriteLast")
-    public Double getDiskTimeWriteLast() {
-        return diskTimeWriteLast;
-    }
-
-    @JsonProperty("diskTimeWriteLast")
-    public void setDiskTimeWriteLast(Double diskTimeWriteLast) {
-        this.diskTimeWriteLast = diskTimeWriteLast;
-    }
-
-    @JsonProperty("diskTimeWriteMax")
-    public Double getDiskTimeWriteMax() {
-        return diskTimeWriteMax;
-    }
-
-    @JsonProperty("diskTimeWriteMax")
-    public void setDiskTimeWriteMax(Double diskTimeWriteMax) {
-        this.diskTimeWriteMax = diskTimeWriteMax;
-    }
-
-    @JsonProperty("diskTimeWriteMin")
-    public Double getDiskTimeWriteMin() {
-        return diskTimeWriteMin;
-    }
-
-    @JsonProperty("diskTimeWriteMin")
-    public void setDiskTimeWriteMin(Double diskTimeWriteMin) {
-        this.diskTimeWriteMin = diskTimeWriteMin;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("diskIdentifier", diskIdentifier).append("diskIoTimeAvg", diskIoTimeAvg).append("diskIoTimeLast", diskIoTimeLast).append("diskIoTimeMax", diskIoTimeMax).append("diskIoTimeMin", diskIoTimeMin).append("diskMergedReadAvg", diskMergedReadAvg).append("diskMergedReadLast", diskMergedReadLast).append("diskMergedReadMax", diskMergedReadMax).append("diskMergedReadMin", diskMergedReadMin).append("diskMergedWriteAvg", diskMergedWriteAvg).append("diskMergedWriteLast", diskMergedWriteLast).append("diskMergedWriteMax", diskMergedWriteMax).append("diskMergedWriteMin", diskMergedWriteMin).append("diskOctetsReadAvg", diskOctetsReadAvg).append("diskOctetsReadLast", diskOctetsReadLast).append("diskOctetsReadMax", diskOctetsReadMax).append("diskOctetsReadMin", diskOctetsReadMin).append("diskOctetsWriteAvg", diskOctetsWriteAvg).append("diskOctetsWriteLast", diskOctetsWriteLast).append("diskOctetsWriteMax", diskOctetsWriteMax).append("diskOctetsWriteMin", diskOctetsWriteMin).append("diskOpsReadAvg", diskOpsReadAvg).append("diskOpsReadLast", diskOpsReadLast).append("diskOpsReadMax", diskOpsReadMax).append("diskOpsReadMin", diskOpsReadMin).append("diskOpsWriteAvg", diskOpsWriteAvg).append("diskOpsWriteLast", diskOpsWriteLast).append("diskOpsWriteMax", diskOpsWriteMax).append("diskOpsWriteMin", diskOpsWriteMin).append("diskPendingOperationsAvg", diskPendingOperationsAvg).append("diskPendingOperationsLast", diskPendingOperationsLast).append("diskPendingOperationsMax", diskPendingOperationsMax).append("diskPendingOperationsMin", diskPendingOperationsMin).append("diskTimeReadAvg", diskTimeReadAvg).append("diskTimeReadLast", diskTimeReadLast).append("diskTimeReadMax", diskTimeReadMax).append("diskTimeReadMin", diskTimeReadMin).append("diskTimeWriteAvg", diskTimeWriteAvg).append("diskTimeWriteLast", diskTimeWriteLast).append("diskTimeWriteMax", diskTimeWriteMax).append("diskTimeWriteMin", diskTimeWriteMin).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(diskIoTimeLast).append(diskMergedReadMin).append(diskMergedReadLast).append(diskTimeWriteAvg).append(diskIoTimeAvg).append(diskOpsReadLast).append(diskOctetsWriteAvg).append(diskOctetsReadMin).append(diskTimeWriteLast).append(diskOpsWriteMin).append(diskOpsWriteAvg).append(diskTimeWriteMax).append(diskTimeReadMax).append(diskOctetsWriteMin).append(diskMergedWriteAvg).append(diskTimeWriteMin).append(diskTimeReadAvg).append(diskMergedWriteMax).append(diskMergedReadAvg).append(diskPendingOperationsMax).append(diskIdentifier).append(diskPendingOperationsMin).append(diskTimeReadLast).append(diskOpsReadAvg).append(diskMergedWriteMin).append(diskIoTimeMax).append(diskPendingOperationsAvg).append(diskMergedWriteLast).append(diskMergedReadMax).append(diskIoTimeMin).append(diskTimeReadMin).append(diskPendingOperationsLast).append(diskOpsReadMin).append(diskOctetsReadLast).append(diskOctetsReadAvg).append(diskOpsWriteMax).append(additionalProperties).append(diskOctetsReadMax).append(diskOctetsWriteMax).append(diskOctetsWriteLast).append(diskOpsWriteLast).append(diskOpsReadMax).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof DiskUsageArray) == false) {
-            return false;
-        }
-        DiskUsageArray rhs = ((DiskUsageArray) other);
-        return new EqualsBuilder().append(diskIoTimeLast, rhs.diskIoTimeLast).append(diskMergedReadMin, rhs.diskMergedReadMin).append(diskMergedReadLast, rhs.diskMergedReadLast).append(diskTimeWriteAvg, rhs.diskTimeWriteAvg).append(diskIoTimeAvg, rhs.diskIoTimeAvg).append(diskOpsReadLast, rhs.diskOpsReadLast).append(diskOctetsWriteAvg, rhs.diskOctetsWriteAvg).append(diskOctetsReadMin, rhs.diskOctetsReadMin).append(diskTimeWriteLast, rhs.diskTimeWriteLast).append(diskOpsWriteMin, rhs.diskOpsWriteMin).append(diskOpsWriteAvg, rhs.diskOpsWriteAvg).append(diskTimeWriteMax, rhs.diskTimeWriteMax).append(diskTimeReadMax, rhs.diskTimeReadMax).append(diskOctetsWriteMin, rhs.diskOctetsWriteMin).append(diskMergedWriteAvg, rhs.diskMergedWriteAvg).append(diskTimeWriteMin, rhs.diskTimeWriteMin).append(diskTimeReadAvg, rhs.diskTimeReadAvg).append(diskMergedWriteMax, rhs.diskMergedWriteMax).append(diskMergedReadAvg, rhs.diskMergedReadAvg).append(diskPendingOperationsMax, rhs.diskPendingOperationsMax).append(diskIdentifier, rhs.diskIdentifier).append(diskPendingOperationsMin, rhs.diskPendingOperationsMin).append(diskTimeReadLast, rhs.diskTimeReadLast).append(diskOpsReadAvg, rhs.diskOpsReadAvg).append(diskMergedWriteMin, rhs.diskMergedWriteMin).append(diskIoTimeMax, rhs.diskIoTimeMax).append(diskPendingOperationsAvg, rhs.diskPendingOperationsAvg).append(diskMergedWriteLast, rhs.diskMergedWriteLast).append(diskMergedReadMax, rhs.diskMergedReadMax).append(diskIoTimeMin, rhs.diskIoTimeMin).append(diskTimeReadMin, rhs.diskTimeReadMin).append(diskPendingOperationsLast, rhs.diskPendingOperationsLast).append(diskOpsReadMin, rhs.diskOpsReadMin).append(diskOctetsReadLast, rhs.diskOctetsReadLast).append(diskOctetsReadAvg, rhs.diskOctetsReadAvg).append(diskOpsWriteMax, rhs.diskOpsWriteMax).append(additionalProperties, rhs.additionalProperties).append(diskOctetsReadMax, rhs.diskOctetsReadMax).append(diskOctetsWriteMax, rhs.diskOctetsWriteMax).append(diskOctetsWriteLast, rhs.diskOctetsWriteLast).append(diskOpsWriteLast, rhs.diskOpsWriteLast).append(diskOpsReadMax, rhs.diskOpsReadMax).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/EndOfCallVqmSummaries.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/EndOfCallVqmSummaries.java
deleted file mode 100644
index 01a2a80..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/EndOfCallVqmSummaries.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "adjacencyName",
-    "endpointDescription",
-    "endpointJitter",
-    "endpointRtpOctetsDiscarded",
-    "endpointRtpOctetsReceived",
-    "endpointRtpOctetsSent",
-    "endpointRtpPacketsDiscarded",
-    "endpointRtpPacketsReceived",
-    "endpointRtpPacketsSent",
-    "localJitter",
-    "localRtpOctetsDiscarded",
-    "localRtpOctetsReceived",
-    "localRtpOctetsSent",
-    "localRtpPacketsDiscarded",
-    "localRtpPacketsReceived",
-    "localRtpPacketsSent",
-    "mosCqe",
-    "packetsLost",
-    "packetLossPercent",
-    "rFactor",
-    "roundTripDelay"
-})
-public class EndOfCallVqmSummaries {
-
-    @JsonProperty("adjacencyName")
-    private String adjacencyName;
-    @JsonProperty("endpointDescription")
-    private String endpointDescription;
-    @JsonProperty("endpointJitter")
-    private Double endpointJitter;
-    @JsonProperty("endpointRtpOctetsDiscarded")
-    private Double endpointRtpOctetsDiscarded;
-    @JsonProperty("endpointRtpOctetsReceived")
-    private Double endpointRtpOctetsReceived;
-    @JsonProperty("endpointRtpOctetsSent")
-    private Double endpointRtpOctetsSent;
-    @JsonProperty("endpointRtpPacketsDiscarded")
-    private Double endpointRtpPacketsDiscarded;
-    @JsonProperty("endpointRtpPacketsReceived")
-    private Double endpointRtpPacketsReceived;
-    @JsonProperty("endpointRtpPacketsSent")
-    private Double endpointRtpPacketsSent;
-    @JsonProperty("localJitter")
-    private Double localJitter;
-    @JsonProperty("localRtpOctetsDiscarded")
-    private Double localRtpOctetsDiscarded;
-    @JsonProperty("localRtpOctetsReceived")
-    private Double localRtpOctetsReceived;
-    @JsonProperty("localRtpOctetsSent")
-    private Double localRtpOctetsSent;
-    @JsonProperty("localRtpPacketsDiscarded")
-    private Double localRtpPacketsDiscarded;
-    @JsonProperty("localRtpPacketsReceived")
-    private Double localRtpPacketsReceived;
-    @JsonProperty("localRtpPacketsSent")
-    private Double localRtpPacketsSent;
-    @JsonProperty("mosCqe")
-    private Double mosCqe;
-    @JsonProperty("packetsLost")
-    private Double packetsLost;
-    @JsonProperty("packetLossPercent")
-    private Double packetLossPercent;
-    @JsonProperty("rFactor")
-    private Double rFactor;
-    @JsonProperty("roundTripDelay")
-    private Double roundTripDelay;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("adjacencyName")
-    public String getAdjacencyName() {
-        return adjacencyName;
-    }
-
-    @JsonProperty("adjacencyName")
-    public void setAdjacencyName(String adjacencyName) {
-        this.adjacencyName = adjacencyName;
-    }
-
-    @JsonProperty("endpointDescription")
-    public String getEndpointDescription() {
-        return endpointDescription;
-    }
-
-    @JsonProperty("endpointDescription")
-    public void setEndpointDescription(String endpointDescription) {
-        this.endpointDescription = endpointDescription;
-    }
-
-    @JsonProperty("endpointJitter")
-    public Double getEndpointJitter() {
-        return endpointJitter;
-    }
-
-    @JsonProperty("endpointJitter")
-    public void setEndpointJitter(Double endpointJitter) {
-        this.endpointJitter = endpointJitter;
-    }
-
-    @JsonProperty("endpointRtpOctetsDiscarded")
-    public Double getEndpointRtpOctetsDiscarded() {
-        return endpointRtpOctetsDiscarded;
-    }
-
-    @JsonProperty("endpointRtpOctetsDiscarded")
-    public void setEndpointRtpOctetsDiscarded(Double endpointRtpOctetsDiscarded) {
-        this.endpointRtpOctetsDiscarded = endpointRtpOctetsDiscarded;
-    }
-
-    @JsonProperty("endpointRtpOctetsReceived")
-    public Double getEndpointRtpOctetsReceived() {
-        return endpointRtpOctetsReceived;
-    }
-
-    @JsonProperty("endpointRtpOctetsReceived")
-    public void setEndpointRtpOctetsReceived(Double endpointRtpOctetsReceived) {
-        this.endpointRtpOctetsReceived = endpointRtpOctetsReceived;
-    }
-
-    @JsonProperty("endpointRtpOctetsSent")
-    public Double getEndpointRtpOctetsSent() {
-        return endpointRtpOctetsSent;
-    }
-
-    @JsonProperty("endpointRtpOctetsSent")
-    public void setEndpointRtpOctetsSent(Double endpointRtpOctetsSent) {
-        this.endpointRtpOctetsSent = endpointRtpOctetsSent;
-    }
-
-    @JsonProperty("endpointRtpPacketsDiscarded")
-    public Double getEndpointRtpPacketsDiscarded() {
-        return endpointRtpPacketsDiscarded;
-    }
-
-    @JsonProperty("endpointRtpPacketsDiscarded")
-    public void setEndpointRtpPacketsDiscarded(Double endpointRtpPacketsDiscarded) {
-        this.endpointRtpPacketsDiscarded = endpointRtpPacketsDiscarded;
-    }
-
-    @JsonProperty("endpointRtpPacketsReceived")
-    public Double getEndpointRtpPacketsReceived() {
-        return endpointRtpPacketsReceived;
-    }
-
-    @JsonProperty("endpointRtpPacketsReceived")
-    public void setEndpointRtpPacketsReceived(Double endpointRtpPacketsReceived) {
-        this.endpointRtpPacketsReceived = endpointRtpPacketsReceived;
-    }
-
-    @JsonProperty("endpointRtpPacketsSent")
-    public Double getEndpointRtpPacketsSent() {
-        return endpointRtpPacketsSent;
-    }
-
-    @JsonProperty("endpointRtpPacketsSent")
-    public void setEndpointRtpPacketsSent(Double endpointRtpPacketsSent) {
-        this.endpointRtpPacketsSent = endpointRtpPacketsSent;
-    }
-
-    @JsonProperty("localJitter")
-    public Double getLocalJitter() {
-        return localJitter;
-    }
-
-    @JsonProperty("localJitter")
-    public void setLocalJitter(Double localJitter) {
-        this.localJitter = localJitter;
-    }
-
-    @JsonProperty("localRtpOctetsDiscarded")
-    public Double getLocalRtpOctetsDiscarded() {
-        return localRtpOctetsDiscarded;
-    }
-
-    @JsonProperty("localRtpOctetsDiscarded")
-    public void setLocalRtpOctetsDiscarded(Double localRtpOctetsDiscarded) {
-        this.localRtpOctetsDiscarded = localRtpOctetsDiscarded;
-    }
-
-    @JsonProperty("localRtpOctetsReceived")
-    public Double getLocalRtpOctetsReceived() {
-        return localRtpOctetsReceived;
-    }
-
-    @JsonProperty("localRtpOctetsReceived")
-    public void setLocalRtpOctetsReceived(Double localRtpOctetsReceived) {
-        this.localRtpOctetsReceived = localRtpOctetsReceived;
-    }
-
-    @JsonProperty("localRtpOctetsSent")
-    public Double getLocalRtpOctetsSent() {
-        return localRtpOctetsSent;
-    }
-
-    @JsonProperty("localRtpOctetsSent")
-    public void setLocalRtpOctetsSent(Double localRtpOctetsSent) {
-        this.localRtpOctetsSent = localRtpOctetsSent;
-    }
-
-    @JsonProperty("localRtpPacketsDiscarded")
-    public Double getLocalRtpPacketsDiscarded() {
-        return localRtpPacketsDiscarded;
-    }
-
-    @JsonProperty("localRtpPacketsDiscarded")
-    public void setLocalRtpPacketsDiscarded(Double localRtpPacketsDiscarded) {
-        this.localRtpPacketsDiscarded = localRtpPacketsDiscarded;
-    }
-
-    @JsonProperty("localRtpPacketsReceived")
-    public Double getLocalRtpPacketsReceived() {
-        return localRtpPacketsReceived;
-    }
-
-    @JsonProperty("localRtpPacketsReceived")
-    public void setLocalRtpPacketsReceived(Double localRtpPacketsReceived) {
-        this.localRtpPacketsReceived = localRtpPacketsReceived;
-    }
-
-    @JsonProperty("localRtpPacketsSent")
-    public Double getLocalRtpPacketsSent() {
-        return localRtpPacketsSent;
-    }
-
-    @JsonProperty("localRtpPacketsSent")
-    public void setLocalRtpPacketsSent(Double localRtpPacketsSent) {
-        this.localRtpPacketsSent = localRtpPacketsSent;
-    }
-
-    @JsonProperty("mosCqe")
-    public Double getMosCqe() {
-        return mosCqe;
-    }
-
-    @JsonProperty("mosCqe")
-    public void setMosCqe(Double mosCqe) {
-        this.mosCqe = mosCqe;
-    }
-
-    @JsonProperty("packetsLost")
-    public Double getPacketsLost() {
-        return packetsLost;
-    }
-
-    @JsonProperty("packetsLost")
-    public void setPacketsLost(Double packetsLost) {
-        this.packetsLost = packetsLost;
-    }
-
-    @JsonProperty("packetLossPercent")
-    public Double getPacketLossPercent() {
-        return packetLossPercent;
-    }
-
-    @JsonProperty("packetLossPercent")
-    public void setPacketLossPercent(Double packetLossPercent) {
-        this.packetLossPercent = packetLossPercent;
-    }
-
-    @JsonProperty("rFactor")
-    public Double getRFactor() {
-        return rFactor;
-    }
-
-    @JsonProperty("rFactor")
-    public void setRFactor(Double rFactor) {
-        this.rFactor = rFactor;
-    }
-
-    @JsonProperty("roundTripDelay")
-    public Double getRoundTripDelay() {
-        return roundTripDelay;
-    }
-
-    @JsonProperty("roundTripDelay")
-    public void setRoundTripDelay(Double roundTripDelay) {
-        this.roundTripDelay = roundTripDelay;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("adjacencyName", adjacencyName).append("endpointDescription", endpointDescription).append("endpointJitter", endpointJitter).append("endpointRtpOctetsDiscarded", endpointRtpOctetsDiscarded).append("endpointRtpOctetsReceived", endpointRtpOctetsReceived).append("endpointRtpOctetsSent", endpointRtpOctetsSent).append("endpointRtpPacketsDiscarded", endpointRtpPacketsDiscarded).append("endpointRtpPacketsReceived", endpointRtpPacketsReceived).append("endpointRtpPacketsSent", endpointRtpPacketsSent).append("localJitter", localJitter).append("localRtpOctetsDiscarded", localRtpOctetsDiscarded).append("localRtpOctetsReceived", localRtpOctetsReceived).append("localRtpOctetsSent", localRtpOctetsSent).append("localRtpPacketsDiscarded", localRtpPacketsDiscarded).append("localRtpPacketsReceived", localRtpPacketsReceived).append("localRtpPacketsSent", localRtpPacketsSent).append("mosCqe", mosCqe).append("packetsLost", packetsLost).append("packetLossPercent", packetLossPercent).append("rFactor", rFactor).append("roundTripDelay", roundTripDelay).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(localJitter).append(adjacencyName).append(localRtpPacketsDiscarded).append(localRtpOctetsSent).append(roundTripDelay).append(localRtpPacketsReceived).append(endpointRtpPacketsReceived).append(packetLossPercent).append(endpointRtpPacketsSent).append(endpointJitter).append(mosCqe).append(endpointRtpOctetsDiscarded).append(endpointDescription).append(rFactor).append(endpointRtpPacketsDiscarded).append(localRtpOctetsReceived).append(additionalProperties).append(endpointRtpOctetsSent).append(localRtpOctetsDiscarded).append(localRtpPacketsSent).append(endpointRtpOctetsReceived).append(packetsLost).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof EndOfCallVqmSummaries) == false) {
-            return false;
-        }
-        EndOfCallVqmSummaries rhs = ((EndOfCallVqmSummaries) other);
-        return new EqualsBuilder().append(localJitter, rhs.localJitter).append(adjacencyName, rhs.adjacencyName).append(localRtpPacketsDiscarded, rhs.localRtpPacketsDiscarded).append(localRtpOctetsSent, rhs.localRtpOctetsSent).append(roundTripDelay, rhs.roundTripDelay).append(localRtpPacketsReceived, rhs.localRtpPacketsReceived).append(endpointRtpPacketsReceived, rhs.endpointRtpPacketsReceived).append(packetLossPercent, rhs.packetLossPercent).append(endpointRtpPacketsSent, rhs.endpointRtpPacketsSent).append(endpointJitter, rhs.endpointJitter).append(mosCqe, rhs.mosCqe).append(endpointRtpOctetsDiscarded, rhs.endpointRtpOctetsDiscarded).append(endpointDescription, rhs.endpointDescription).append(rFactor, rhs.rFactor).append(endpointRtpPacketsDiscarded, rhs.endpointRtpPacketsDiscarded).append(localRtpOctetsReceived, rhs.localRtpOctetsReceived).append(additionalProperties, rhs.additionalProperties).append(endpointRtpOctetsSent, rhs.endpointRtpOctetsSent).append(localRtpOctetsDiscarded, rhs.localRtpOctetsDiscarded).append(localRtpPacketsSent, rhs.localRtpPacketsSent).append(endpointRtpOctetsReceived, rhs.endpointRtpOctetsReceived).append(packetsLost, rhs.packetsLost).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/Event.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/Event.java
deleted file mode 100644
index 9476178..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/Event.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "commonEventHeader",
-    "faultFields",
-    "heartbeatFields",
-    "measurementsForVfScalingFields",
-    "mobileFlowFields",
-    "otherFields",
-    "sipSignalingFields",
-    "stateChangeFields",
-    "syslogFields",
-    "thresholdCrossingAlertFields",
-    "voiceQualityFields"
-})
-public class Event {
-
-    @JsonProperty("commonEventHeader")
-    private CommonEventHeader commonEventHeader;
-    @JsonProperty("faultFields")
-    private FaultFields faultFields;
-    @JsonProperty("heartbeatFields")
-    private HeartbeatFields heartbeatFields;
-    @JsonProperty("measurementsForVfScalingFields")
-    private MeasurementsForVfScalingFields measurementsForVfScalingFields;
-    @JsonProperty("mobileFlowFields")
-    private MobileFlowFields mobileFlowFields;
-    @JsonProperty("otherFields")
-    private OtherFields otherFields;
-    @JsonProperty("sipSignalingFields")
-    private SipSignalingFields sipSignalingFields;
-    @JsonProperty("stateChangeFields")
-    private StateChangeFields stateChangeFields;
-    @JsonProperty("syslogFields")
-    private SyslogFields syslogFields;
-    @JsonProperty("thresholdCrossingAlertFields")
-    private ThresholdCrossingAlertFields thresholdCrossingAlertFields;
-    @JsonProperty("voiceQualityFields")
-    private VoiceQualityFields voiceQualityFields;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("commonEventHeader")
-    public CommonEventHeader getCommonEventHeader() {
-        return commonEventHeader;
-    }
-
-    @JsonProperty("commonEventHeader")
-    public void setCommonEventHeader(CommonEventHeader commonEventHeader) {
-        this.commonEventHeader = commonEventHeader;
-    }
-
-    @JsonProperty("faultFields")
-    public FaultFields getFaultFields() {
-        return faultFields;
-    }
-
-    @JsonProperty("faultFields")
-    public void setFaultFields(FaultFields faultFields) {
-        this.faultFields = faultFields;
-    }
-
-    @JsonProperty("heartbeatFields")
-    public HeartbeatFields getHeartbeatFields() {
-        return heartbeatFields;
-    }
-
-    @JsonProperty("heartbeatFields")
-    public void setHeartbeatFields(HeartbeatFields heartbeatFields) {
-        this.heartbeatFields = heartbeatFields;
-    }
-
-    @JsonProperty("measurementsForVfScalingFields")
-    public MeasurementsForVfScalingFields getMeasurementsForVfScalingFields() {
-        return measurementsForVfScalingFields;
-    }
-
-    @JsonProperty("measurementsForVfScalingFields")
-    public void setMeasurementsForVfScalingFields(MeasurementsForVfScalingFields measurementsForVfScalingFields) {
-        this.measurementsForVfScalingFields = measurementsForVfScalingFields;
-    }
-
-    @JsonProperty("mobileFlowFields")
-    public MobileFlowFields getMobileFlowFields() {
-        return mobileFlowFields;
-    }
-
-    @JsonProperty("mobileFlowFields")
-    public void setMobileFlowFields(MobileFlowFields mobileFlowFields) {
-        this.mobileFlowFields = mobileFlowFields;
-    }
-
-    @JsonProperty("otherFields")
-    public OtherFields getOtherFields() {
-        return otherFields;
-    }
-
-    @JsonProperty("otherFields")
-    public void setOtherFields(OtherFields otherFields) {
-        this.otherFields = otherFields;
-    }
-
-    @JsonProperty("sipSignalingFields")
-    public SipSignalingFields getSipSignalingFields() {
-        return sipSignalingFields;
-    }
-
-    @JsonProperty("sipSignalingFields")
-    public void setSipSignalingFields(SipSignalingFields sipSignalingFields) {
-        this.sipSignalingFields = sipSignalingFields;
-    }
-
-    @JsonProperty("stateChangeFields")
-    public StateChangeFields getStateChangeFields() {
-        return stateChangeFields;
-    }
-
-    @JsonProperty("stateChangeFields")
-    public void setStateChangeFields(StateChangeFields stateChangeFields) {
-        this.stateChangeFields = stateChangeFields;
-    }
-
-    @JsonProperty("syslogFields")
-    public SyslogFields getSyslogFields() {
-        return syslogFields;
-    }
-
-    @JsonProperty("syslogFields")
-    public void setSyslogFields(SyslogFields syslogFields) {
-        this.syslogFields = syslogFields;
-    }
-
-    @JsonProperty("thresholdCrossingAlertFields")
-    public ThresholdCrossingAlertFields getThresholdCrossingAlertFields() {
-        return thresholdCrossingAlertFields;
-    }
-
-    @JsonProperty("thresholdCrossingAlertFields")
-    public void setThresholdCrossingAlertFields(ThresholdCrossingAlertFields thresholdCrossingAlertFields) {
-        this.thresholdCrossingAlertFields = thresholdCrossingAlertFields;
-    }
-
-    @JsonProperty("voiceQualityFields")
-    public VoiceQualityFields getVoiceQualityFields() {
-        return voiceQualityFields;
-    }
-
-    @JsonProperty("voiceQualityFields")
-    public void setVoiceQualityFields(VoiceQualityFields voiceQualityFields) {
-        this.voiceQualityFields = voiceQualityFields;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("commonEventHeader", commonEventHeader).append("faultFields", faultFields).append("heartbeatFields", heartbeatFields).append("measurementsForVfScalingFields", measurementsForVfScalingFields).append("mobileFlowFields", mobileFlowFields).append("otherFields", otherFields).append("sipSignalingFields", sipSignalingFields).append("stateChangeFields", stateChangeFields).append("syslogFields", syslogFields).append("thresholdCrossingAlertFields", thresholdCrossingAlertFields).append("voiceQualityFields", voiceQualityFields).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(mobileFlowFields).append(heartbeatFields).append(measurementsForVfScalingFields).append(otherFields).append(commonEventHeader).append(thresholdCrossingAlertFields).append(syslogFields).append(additionalProperties).append(stateChangeFields).append(voiceQualityFields).append(sipSignalingFields).append(faultFields).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof Event) == false) {
-            return false;
-        }
-        Event rhs = ((Event) other);
-        return new EqualsBuilder().append(mobileFlowFields, rhs.mobileFlowFields).append(heartbeatFields, rhs.heartbeatFields).append(measurementsForVfScalingFields, rhs.measurementsForVfScalingFields).append(otherFields, rhs.otherFields).append(commonEventHeader, rhs.commonEventHeader).append(thresholdCrossingAlertFields, rhs.thresholdCrossingAlertFields).append(syslogFields, rhs.syslogFields).append(additionalProperties, rhs.additionalProperties).append(stateChangeFields, rhs.stateChangeFields).append(voiceQualityFields, rhs.voiceQualityFields).append(sipSignalingFields, rhs.sipSignalingFields).append(faultFields, rhs.faultFields).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/FaultFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/FaultFields.java
deleted file mode 100644
index d9d014c..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/FaultFields.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "alarmCondition",
-    "eventSeverity",
-    "eventSourceType",
-    "faultFieldsVersion",
-    "specificProblem",
-    "vfStatus",
-    "alarmAdditionalInformation",
-    "alarmInterfaceA",
-    "eventCategory"
-})
-public class FaultFields {
-
-    @JsonProperty("alarmCondition")
-    private String alarmCondition;
-    @JsonProperty("eventSeverity")
-    private String eventSeverity;
-    @JsonProperty("eventSourceType")
-    private String eventSourceType;
-    @JsonProperty("faultFieldsVersion")
-    private Double faultFieldsVersion;
-    @JsonProperty("specificProblem")
-    private String specificProblem;
-    @JsonProperty("vfStatus")
-    private String vfStatus;
-    @JsonProperty("alarmAdditionalInformation")
-    private List<AlarmAdditionalInformation> alarmAdditionalInformation = null;
-    @JsonProperty("alarmInterfaceA")
-    private String alarmInterfaceA;
-    @JsonProperty("eventCategory")
-    private String eventCategory;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("alarmCondition")
-    public String getAlarmCondition() {
-        return alarmCondition;
-    }
-
-    @JsonProperty("alarmCondition")
-    public void setAlarmCondition(String alarmCondition) {
-        this.alarmCondition = alarmCondition;
-    }
-
-    @JsonProperty("eventSeverity")
-    public String getEventSeverity() {
-        return eventSeverity;
-    }
-
-    @JsonProperty("eventSeverity")
-    public void setEventSeverity(String eventSeverity) {
-        this.eventSeverity = eventSeverity;
-    }
-
-    @JsonProperty("eventSourceType")
-    public String getEventSourceType() {
-        return eventSourceType;
-    }
-
-    @JsonProperty("eventSourceType")
-    public void setEventSourceType(String eventSourceType) {
-        this.eventSourceType = eventSourceType;
-    }
-
-    @JsonProperty("faultFieldsVersion")
-    public Double getFaultFieldsVersion() {
-        return faultFieldsVersion;
-    }
-
-    @JsonProperty("faultFieldsVersion")
-    public void setFaultFieldsVersion(Double faultFieldsVersion) {
-        this.faultFieldsVersion = faultFieldsVersion;
-    }
-
-    @JsonProperty("specificProblem")
-    public String getSpecificProblem() {
-        return specificProblem;
-    }
-
-    @JsonProperty("specificProblem")
-    public void setSpecificProblem(String specificProblem) {
-        this.specificProblem = specificProblem;
-    }
-
-    @JsonProperty("vfStatus")
-    public String getVfStatus() {
-        return vfStatus;
-    }
-
-    @JsonProperty("vfStatus")
-    public void setVfStatus(String vfStatus) {
-        this.vfStatus = vfStatus;
-    }
-
-    @JsonProperty("alarmAdditionalInformation")
-    public List<AlarmAdditionalInformation> getAlarmAdditionalInformation() {
-        return alarmAdditionalInformation;
-    }
-
-    @JsonProperty("alarmAdditionalInformation")
-    public void setAlarmAdditionalInformation(List<AlarmAdditionalInformation> alarmAdditionalInformation) {
-        this.alarmAdditionalInformation = alarmAdditionalInformation;
-    }
-
-    @JsonProperty("alarmInterfaceA")
-    public String getAlarmInterfaceA() {
-        return alarmInterfaceA;
-    }
-
-    @JsonProperty("alarmInterfaceA")
-    public void setAlarmInterfaceA(String alarmInterfaceA) {
-        this.alarmInterfaceA = alarmInterfaceA;
-    }
-
-    @JsonProperty("eventCategory")
-    public String getEventCategory() {
-        return eventCategory;
-    }
-
-    @JsonProperty("eventCategory")
-    public void setEventCategory(String eventCategory) {
-        this.eventCategory = eventCategory;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("alarmCondition", alarmCondition).append("eventSeverity", eventSeverity).append("eventSourceType", eventSourceType).append("faultFieldsVersion", faultFieldsVersion).append("specificProblem", specificProblem).append("vfStatus", vfStatus).append("alarmAdditionalInformation", alarmAdditionalInformation).append("alarmInterfaceA", alarmInterfaceA).append("eventCategory", eventCategory).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(eventSourceType).append(alarmAdditionalInformation).append(specificProblem).append(additionalProperties).append(alarmInterfaceA).append(alarmCondition).append(eventSeverity).append(faultFieldsVersion).append(eventCategory).append(vfStatus).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof FaultFields) == false) {
-            return false;
-        }
-        FaultFields rhs = ((FaultFields) other);
-        return new EqualsBuilder().append(eventSourceType, rhs.eventSourceType).append(alarmAdditionalInformation, rhs.alarmAdditionalInformation).append(specificProblem, rhs.specificProblem).append(additionalProperties, rhs.additionalProperties).append(alarmInterfaceA, rhs.alarmInterfaceA).append(alarmCondition, rhs.alarmCondition).append(eventSeverity, rhs.eventSeverity).append(faultFieldsVersion, rhs.faultFieldsVersion).append(eventCategory, rhs.eventCategory).append(vfStatus, rhs.vfStatus).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/FeatureUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/FeatureUsageArray.java
deleted file mode 100644
index ccf0614..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/FeatureUsageArray.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "featureIdentifier",
-    "featureUtilization"
-})
-public class FeatureUsageArray {
-
-    @JsonProperty("featureIdentifier")
-    private String featureIdentifier;
-    @JsonProperty("featureUtilization")
-    private Long featureUtilization;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("featureIdentifier")
-    public String getFeatureIdentifier() {
-        return featureIdentifier;
-    }
-
-    @JsonProperty("featureIdentifier")
-    public void setFeatureIdentifier(String featureIdentifier) {
-        this.featureIdentifier = featureIdentifier;
-    }
-
-    @JsonProperty("featureUtilization")
-    public Long getFeatureUtilization() {
-        return featureUtilization;
-    }
-
-    @JsonProperty("featureUtilization")
-    public void setFeatureUtilization(Long featureUtilization) {
-        this.featureUtilization = featureUtilization;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("featureIdentifier", featureIdentifier).append("featureUtilization", featureUtilization).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(featureIdentifier).append(additionalProperties).append(featureUtilization).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof FeatureUsageArray) == false) {
-            return false;
-        }
-        FeatureUsageArray rhs = ((FeatureUsageArray) other);
-        return new EqualsBuilder().append(featureIdentifier, rhs.featureIdentifier).append(additionalProperties, rhs.additionalProperties).append(featureUtilization, rhs.featureUtilization).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/GtpPerFlowMetrics.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/GtpPerFlowMetrics.java
deleted file mode 100644
index cff3dc4..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/GtpPerFlowMetrics.java
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "avgBitErrorRate",
-    "avgPacketDelayVariation",
-    "avgPacketLatency",
-    "avgReceiveThroughput",
-    "avgTransmitThroughput",
-    "flowActivationEpoch",
-    "flowActivationMicrosec",
-    "flowDeactivationEpoch",
-    "flowDeactivationMicrosec",
-    "flowDeactivationTime",
-    "flowStatus",
-    "maxPacketDelayVariation",
-    "numActivationFailures",
-    "numBitErrors",
-    "numBytesReceived",
-    "numBytesTransmitted",
-    "numDroppedPackets",
-    "numL7BytesReceived",
-    "numL7BytesTransmitted",
-    "numLostPackets",
-    "numOutOfOrderPackets",
-    "numPacketErrors",
-    "numPacketsReceivedExclRetrans",
-    "numPacketsReceivedInclRetrans",
-    "numPacketsTransmittedInclRetrans",
-    "numRetries",
-    "numTimeouts",
-    "numTunneledL7BytesReceived",
-    "roundTripTime",
-    "timeToFirstByte",
-    "durConnectionFailedStatus",
-    "durTunnelFailedStatus",
-    "flowActivatedBy",
-    "flowActivationTime",
-    "flowDeactivatedBy",
-    "gtpConnectionStatus",
-    "gtpTunnelStatus",
-    "ipTosCountList",
-    "ipTosList",
-    "largePacketRtt",
-    "largePacketThreshold",
-    "maxReceiveBitRate",
-    "maxTransmitBitRate",
-    "mobileQciCosCountList",
-    "mobileQciCosList",
-    "numGtpEchoFailures",
-    "numGtpTunnelErrors",
-    "numHttpErrors",
-    "tcpFlagCountList",
-    "tcpFlagList"
-})
-public class GtpPerFlowMetrics {
-
-    @JsonProperty("avgBitErrorRate")
-    private Double avgBitErrorRate;
-    @JsonProperty("avgPacketDelayVariation")
-    private Double avgPacketDelayVariation;
-    @JsonProperty("avgPacketLatency")
-    private Double avgPacketLatency;
-    @JsonProperty("avgReceiveThroughput")
-    private Double avgReceiveThroughput;
-    @JsonProperty("avgTransmitThroughput")
-    private Double avgTransmitThroughput;
-    @JsonProperty("flowActivationEpoch")
-    private Double flowActivationEpoch;
-    @JsonProperty("flowActivationMicrosec")
-    private Double flowActivationMicrosec;
-    @JsonProperty("flowDeactivationEpoch")
-    private Double flowDeactivationEpoch;
-    @JsonProperty("flowDeactivationMicrosec")
-    private Double flowDeactivationMicrosec;
-    @JsonProperty("flowDeactivationTime")
-    private String flowDeactivationTime;
-    @JsonProperty("flowStatus")
-    private String flowStatus;
-    @JsonProperty("maxPacketDelayVariation")
-    private Double maxPacketDelayVariation;
-    @JsonProperty("numActivationFailures")
-    private Double numActivationFailures;
-    @JsonProperty("numBitErrors")
-    private Double numBitErrors;
-    @JsonProperty("numBytesReceived")
-    private Double numBytesReceived;
-    @JsonProperty("numBytesTransmitted")
-    private Double numBytesTransmitted;
-    @JsonProperty("numDroppedPackets")
-    private Double numDroppedPackets;
-    @JsonProperty("numL7BytesReceived")
-    private Double numL7BytesReceived;
-    @JsonProperty("numL7BytesTransmitted")
-    private Double numL7BytesTransmitted;
-    @JsonProperty("numLostPackets")
-    private Double numLostPackets;
-    @JsonProperty("numOutOfOrderPackets")
-    private Double numOutOfOrderPackets;
-    @JsonProperty("numPacketErrors")
-    private Double numPacketErrors;
-    @JsonProperty("numPacketsReceivedExclRetrans")
-    private Double numPacketsReceivedExclRetrans;
-    @JsonProperty("numPacketsReceivedInclRetrans")
-    private Double numPacketsReceivedInclRetrans;
-    @JsonProperty("numPacketsTransmittedInclRetrans")
-    private Double numPacketsTransmittedInclRetrans;
-    @JsonProperty("numRetries")
-    private Double numRetries;
-    @JsonProperty("numTimeouts")
-    private Double numTimeouts;
-    @JsonProperty("numTunneledL7BytesReceived")
-    private Double numTunneledL7BytesReceived;
-    @JsonProperty("roundTripTime")
-    private Double roundTripTime;
-    @JsonProperty("timeToFirstByte")
-    private Double timeToFirstByte;
-    @JsonProperty("durConnectionFailedStatus")
-    private Double durConnectionFailedStatus;
-    @JsonProperty("durTunnelFailedStatus")
-    private Double durTunnelFailedStatus;
-    @JsonProperty("flowActivatedBy")
-    private String flowActivatedBy;
-    @JsonProperty("flowActivationTime")
-    private String flowActivationTime;
-    @JsonProperty("flowDeactivatedBy")
-    private String flowDeactivatedBy;
-    @JsonProperty("gtpConnectionStatus")
-    private String gtpConnectionStatus;
-    @JsonProperty("gtpTunnelStatus")
-    private String gtpTunnelStatus;
-    @JsonProperty("ipTosCountList")
-    private List<List<String>> ipTosCountList = null;
-    @JsonProperty("ipTosList")
-    private List<String> ipTosList = null;
-    @JsonProperty("largePacketRtt")
-    private Double largePacketRtt;
-    @JsonProperty("largePacketThreshold")
-    private Double largePacketThreshold;
-    @JsonProperty("maxReceiveBitRate")
-    private Double maxReceiveBitRate;
-    @JsonProperty("maxTransmitBitRate")
-    private Double maxTransmitBitRate;
-    @JsonProperty("mobileQciCosCountList")
-    private List<List<String>> mobileQciCosCountList = null;
-    @JsonProperty("mobileQciCosList")
-    private List<String> mobileQciCosList = null;
-    @JsonProperty("numGtpEchoFailures")
-    private Double numGtpEchoFailures;
-    @JsonProperty("numGtpTunnelErrors")
-    private Double numGtpTunnelErrors;
-    @JsonProperty("numHttpErrors")
-    private Double numHttpErrors;
-    @JsonProperty("tcpFlagCountList")
-    private List<List<String>> tcpFlagCountList = null;
-    @JsonProperty("tcpFlagList")
-    private List<String> tcpFlagList = null;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("avgBitErrorRate")
-    public Double getAvgBitErrorRate() {
-        return avgBitErrorRate;
-    }
-
-    @JsonProperty("avgBitErrorRate")
-    public void setAvgBitErrorRate(Double avgBitErrorRate) {
-        this.avgBitErrorRate = avgBitErrorRate;
-    }
-
-    @JsonProperty("avgPacketDelayVariation")
-    public Double getAvgPacketDelayVariation() {
-        return avgPacketDelayVariation;
-    }
-
-    @JsonProperty("avgPacketDelayVariation")
-    public void setAvgPacketDelayVariation(Double avgPacketDelayVariation) {
-        this.avgPacketDelayVariation = avgPacketDelayVariation;
-    }
-
-    @JsonProperty("avgPacketLatency")
-    public Double getAvgPacketLatency() {
-        return avgPacketLatency;
-    }
-
-    @JsonProperty("avgPacketLatency")
-    public void setAvgPacketLatency(Double avgPacketLatency) {
-        this.avgPacketLatency = avgPacketLatency;
-    }
-
-    @JsonProperty("avgReceiveThroughput")
-    public Double getAvgReceiveThroughput() {
-        return avgReceiveThroughput;
-    }
-
-    @JsonProperty("avgReceiveThroughput")
-    public void setAvgReceiveThroughput(Double avgReceiveThroughput) {
-        this.avgReceiveThroughput = avgReceiveThroughput;
-    }
-
-    @JsonProperty("avgTransmitThroughput")
-    public Double getAvgTransmitThroughput() {
-        return avgTransmitThroughput;
-    }
-
-    @JsonProperty("avgTransmitThroughput")
-    public void setAvgTransmitThroughput(Double avgTransmitThroughput) {
-        this.avgTransmitThroughput = avgTransmitThroughput;
-    }
-
-    @JsonProperty("flowActivationEpoch")
-    public Double getFlowActivationEpoch() {
-        return flowActivationEpoch;
-    }
-
-    @JsonProperty("flowActivationEpoch")
-    public void setFlowActivationEpoch(Double flowActivationEpoch) {
-        this.flowActivationEpoch = flowActivationEpoch;
-    }
-
-    @JsonProperty("flowActivationMicrosec")
-    public Double getFlowActivationMicrosec() {
-        return flowActivationMicrosec;
-    }
-
-    @JsonProperty("flowActivationMicrosec")
-    public void setFlowActivationMicrosec(Double flowActivationMicrosec) {
-        this.flowActivationMicrosec = flowActivationMicrosec;
-    }
-
-    @JsonProperty("flowDeactivationEpoch")
-    public Double getFlowDeactivationEpoch() {
-        return flowDeactivationEpoch;
-    }
-
-    @JsonProperty("flowDeactivationEpoch")
-    public void setFlowDeactivationEpoch(Double flowDeactivationEpoch) {
-        this.flowDeactivationEpoch = flowDeactivationEpoch;
-    }
-
-    @JsonProperty("flowDeactivationMicrosec")
-    public Double getFlowDeactivationMicrosec() {
-        return flowDeactivationMicrosec;
-    }
-
-    @JsonProperty("flowDeactivationMicrosec")
-    public void setFlowDeactivationMicrosec(Double flowDeactivationMicrosec) {
-        this.flowDeactivationMicrosec = flowDeactivationMicrosec;
-    }
-
-    @JsonProperty("flowDeactivationTime")
-    public String getFlowDeactivationTime() {
-        return flowDeactivationTime;
-    }
-
-    @JsonProperty("flowDeactivationTime")
-    public void setFlowDeactivationTime(String flowDeactivationTime) {
-        this.flowDeactivationTime = flowDeactivationTime;
-    }
-
-    @JsonProperty("flowStatus")
-    public String getFlowStatus() {
-        return flowStatus;
-    }
-
-    @JsonProperty("flowStatus")
-    public void setFlowStatus(String flowStatus) {
-        this.flowStatus = flowStatus;
-    }
-
-    @JsonProperty("maxPacketDelayVariation")
-    public Double getMaxPacketDelayVariation() {
-        return maxPacketDelayVariation;
-    }
-
-    @JsonProperty("maxPacketDelayVariation")
-    public void setMaxPacketDelayVariation(Double maxPacketDelayVariation) {
-        this.maxPacketDelayVariation = maxPacketDelayVariation;
-    }
-
-    @JsonProperty("numActivationFailures")
-    public Double getNumActivationFailures() {
-        return numActivationFailures;
-    }
-
-    @JsonProperty("numActivationFailures")
-    public void setNumActivationFailures(Double numActivationFailures) {
-        this.numActivationFailures = numActivationFailures;
-    }
-
-    @JsonProperty("numBitErrors")
-    public Double getNumBitErrors() {
-        return numBitErrors;
-    }
-
-    @JsonProperty("numBitErrors")
-    public void setNumBitErrors(Double numBitErrors) {
-        this.numBitErrors = numBitErrors;
-    }
-
-    @JsonProperty("numBytesReceived")
-    public Double getNumBytesReceived() {
-        return numBytesReceived;
-    }
-
-    @JsonProperty("numBytesReceived")
-    public void setNumBytesReceived(Double numBytesReceived) {
-        this.numBytesReceived = numBytesReceived;
-    }
-
-    @JsonProperty("numBytesTransmitted")
-    public Double getNumBytesTransmitted() {
-        return numBytesTransmitted;
-    }
-
-    @JsonProperty("numBytesTransmitted")
-    public void setNumBytesTransmitted(Double numBytesTransmitted) {
-        this.numBytesTransmitted = numBytesTransmitted;
-    }
-
-    @JsonProperty("numDroppedPackets")
-    public Double getNumDroppedPackets() {
-        return numDroppedPackets;
-    }
-
-    @JsonProperty("numDroppedPackets")
-    public void setNumDroppedPackets(Double numDroppedPackets) {
-        this.numDroppedPackets = numDroppedPackets;
-    }
-
-    @JsonProperty("numL7BytesReceived")
-    public Double getNumL7BytesReceived() {
-        return numL7BytesReceived;
-    }
-
-    @JsonProperty("numL7BytesReceived")
-    public void setNumL7BytesReceived(Double numL7BytesReceived) {
-        this.numL7BytesReceived = numL7BytesReceived;
-    }
-
-    @JsonProperty("numL7BytesTransmitted")
-    public Double getNumL7BytesTransmitted() {
-        return numL7BytesTransmitted;
-    }
-
-    @JsonProperty("numL7BytesTransmitted")
-    public void setNumL7BytesTransmitted(Double numL7BytesTransmitted) {
-        this.numL7BytesTransmitted = numL7BytesTransmitted;
-    }
-
-    @JsonProperty("numLostPackets")
-    public Double getNumLostPackets() {
-        return numLostPackets;
-    }
-
-    @JsonProperty("numLostPackets")
-    public void setNumLostPackets(Double numLostPackets) {
-        this.numLostPackets = numLostPackets;
-    }
-
-    @JsonProperty("numOutOfOrderPackets")
-    public Double getNumOutOfOrderPackets() {
-        return numOutOfOrderPackets;
-    }
-
-    @JsonProperty("numOutOfOrderPackets")
-    public void setNumOutOfOrderPackets(Double numOutOfOrderPackets) {
-        this.numOutOfOrderPackets = numOutOfOrderPackets;
-    }
-
-    @JsonProperty("numPacketErrors")
-    public Double getNumPacketErrors() {
-        return numPacketErrors;
-    }
-
-    @JsonProperty("numPacketErrors")
-    public void setNumPacketErrors(Double numPacketErrors) {
-        this.numPacketErrors = numPacketErrors;
-    }
-
-    @JsonProperty("numPacketsReceivedExclRetrans")
-    public Double getNumPacketsReceivedExclRetrans() {
-        return numPacketsReceivedExclRetrans;
-    }
-
-    @JsonProperty("numPacketsReceivedExclRetrans")
-    public void setNumPacketsReceivedExclRetrans(Double numPacketsReceivedExclRetrans) {
-        this.numPacketsReceivedExclRetrans = numPacketsReceivedExclRetrans;
-    }
-
-    @JsonProperty("numPacketsReceivedInclRetrans")
-    public Double getNumPacketsReceivedInclRetrans() {
-        return numPacketsReceivedInclRetrans;
-    }
-
-    @JsonProperty("numPacketsReceivedInclRetrans")
-    public void setNumPacketsReceivedInclRetrans(Double numPacketsReceivedInclRetrans) {
-        this.numPacketsReceivedInclRetrans = numPacketsReceivedInclRetrans;
-    }
-
-    @JsonProperty("numPacketsTransmittedInclRetrans")
-    public Double getNumPacketsTransmittedInclRetrans() {
-        return numPacketsTransmittedInclRetrans;
-    }
-
-    @JsonProperty("numPacketsTransmittedInclRetrans")
-    public void setNumPacketsTransmittedInclRetrans(Double numPacketsTransmittedInclRetrans) {
-        this.numPacketsTransmittedInclRetrans = numPacketsTransmittedInclRetrans;
-    }
-
-    @JsonProperty("numRetries")
-    public Double getNumRetries() {
-        return numRetries;
-    }
-
-    @JsonProperty("numRetries")
-    public void setNumRetries(Double numRetries) {
-        this.numRetries = numRetries;
-    }
-
-    @JsonProperty("numTimeouts")
-    public Double getNumTimeouts() {
-        return numTimeouts;
-    }
-
-    @JsonProperty("numTimeouts")
-    public void setNumTimeouts(Double numTimeouts) {
-        this.numTimeouts = numTimeouts;
-    }
-
-    @JsonProperty("numTunneledL7BytesReceived")
-    public Double getNumTunneledL7BytesReceived() {
-        return numTunneledL7BytesReceived;
-    }
-
-    @JsonProperty("numTunneledL7BytesReceived")
-    public void setNumTunneledL7BytesReceived(Double numTunneledL7BytesReceived) {
-        this.numTunneledL7BytesReceived = numTunneledL7BytesReceived;
-    }
-
-    @JsonProperty("roundTripTime")
-    public Double getRoundTripTime() {
-        return roundTripTime;
-    }
-
-    @JsonProperty("roundTripTime")
-    public void setRoundTripTime(Double roundTripTime) {
-        this.roundTripTime = roundTripTime;
-    }
-
-    @JsonProperty("timeToFirstByte")
-    public Double getTimeToFirstByte() {
-        return timeToFirstByte;
-    }
-
-    @JsonProperty("timeToFirstByte")
-    public void setTimeToFirstByte(Double timeToFirstByte) {
-        this.timeToFirstByte = timeToFirstByte;
-    }
-
-    @JsonProperty("durConnectionFailedStatus")
-    public Double getDurConnectionFailedStatus() {
-        return durConnectionFailedStatus;
-    }
-
-    @JsonProperty("durConnectionFailedStatus")
-    public void setDurConnectionFailedStatus(Double durConnectionFailedStatus) {
-        this.durConnectionFailedStatus = durConnectionFailedStatus;
-    }
-
-    @JsonProperty("durTunnelFailedStatus")
-    public Double getDurTunnelFailedStatus() {
-        return durTunnelFailedStatus;
-    }
-
-    @JsonProperty("durTunnelFailedStatus")
-    public void setDurTunnelFailedStatus(Double durTunnelFailedStatus) {
-        this.durTunnelFailedStatus = durTunnelFailedStatus;
-    }
-
-    @JsonProperty("flowActivatedBy")
-    public String getFlowActivatedBy() {
-        return flowActivatedBy;
-    }
-
-    @JsonProperty("flowActivatedBy")
-    public void setFlowActivatedBy(String flowActivatedBy) {
-        this.flowActivatedBy = flowActivatedBy;
-    }
-
-    @JsonProperty("flowActivationTime")
-    public String getFlowActivationTime() {
-        return flowActivationTime;
-    }
-
-    @JsonProperty("flowActivationTime")
-    public void setFlowActivationTime(String flowActivationTime) {
-        this.flowActivationTime = flowActivationTime;
-    }
-
-    @JsonProperty("flowDeactivatedBy")
-    public String getFlowDeactivatedBy() {
-        return flowDeactivatedBy;
-    }
-
-    @JsonProperty("flowDeactivatedBy")
-    public void setFlowDeactivatedBy(String flowDeactivatedBy) {
-        this.flowDeactivatedBy = flowDeactivatedBy;
-    }
-
-    @JsonProperty("gtpConnectionStatus")
-    public String getGtpConnectionStatus() {
-        return gtpConnectionStatus;
-    }
-
-    @JsonProperty("gtpConnectionStatus")
-    public void setGtpConnectionStatus(String gtpConnectionStatus) {
-        this.gtpConnectionStatus = gtpConnectionStatus;
-    }
-
-    @JsonProperty("gtpTunnelStatus")
-    public String getGtpTunnelStatus() {
-        return gtpTunnelStatus;
-    }
-
-    @JsonProperty("gtpTunnelStatus")
-    public void setGtpTunnelStatus(String gtpTunnelStatus) {
-        this.gtpTunnelStatus = gtpTunnelStatus;
-    }
-
-    @JsonProperty("ipTosCountList")
-    public List<List<String>> getIpTosCountList() {
-        return ipTosCountList;
-    }
-
-    @JsonProperty("ipTosCountList")
-    public void setIpTosCountList(List<List<String>> ipTosCountList) {
-        this.ipTosCountList = ipTosCountList;
-    }
-
-    @JsonProperty("ipTosList")
-    public List<String> getIpTosList() {
-        return ipTosList;
-    }
-
-    @JsonProperty("ipTosList")
-    public void setIpTosList(List<String> ipTosList) {
-        this.ipTosList = ipTosList;
-    }
-
-    @JsonProperty("largePacketRtt")
-    public Double getLargePacketRtt() {
-        return largePacketRtt;
-    }
-
-    @JsonProperty("largePacketRtt")
-    public void setLargePacketRtt(Double largePacketRtt) {
-        this.largePacketRtt = largePacketRtt;
-    }
-
-    @JsonProperty("largePacketThreshold")
-    public Double getLargePacketThreshold() {
-        return largePacketThreshold;
-    }
-
-    @JsonProperty("largePacketThreshold")
-    public void setLargePacketThreshold(Double largePacketThreshold) {
-        this.largePacketThreshold = largePacketThreshold;
-    }
-
-    @JsonProperty("maxReceiveBitRate")
-    public Double getMaxReceiveBitRate() {
-        return maxReceiveBitRate;
-    }
-
-    @JsonProperty("maxReceiveBitRate")
-    public void setMaxReceiveBitRate(Double maxReceiveBitRate) {
-        this.maxReceiveBitRate = maxReceiveBitRate;
-    }
-
-    @JsonProperty("maxTransmitBitRate")
-    public Double getMaxTransmitBitRate() {
-        return maxTransmitBitRate;
-    }
-
-    @JsonProperty("maxTransmitBitRate")
-    public void setMaxTransmitBitRate(Double maxTransmitBitRate) {
-        this.maxTransmitBitRate = maxTransmitBitRate;
-    }
-
-    @JsonProperty("mobileQciCosCountList")
-    public List<List<String>> getMobileQciCosCountList() {
-        return mobileQciCosCountList;
-    }
-
-    @JsonProperty("mobileQciCosCountList")
-    public void setMobileQciCosCountList(List<List<String>> mobileQciCosCountList) {
-        this.mobileQciCosCountList = mobileQciCosCountList;
-    }
-
-    @JsonProperty("mobileQciCosList")
-    public List<String> getMobileQciCosList() {
-        return mobileQciCosList;
-    }
-
-    @JsonProperty("mobileQciCosList")
-    public void setMobileQciCosList(List<String> mobileQciCosList) {
-        this.mobileQciCosList = mobileQciCosList;
-    }
-
-    @JsonProperty("numGtpEchoFailures")
-    public Double getNumGtpEchoFailures() {
-        return numGtpEchoFailures;
-    }
-
-    @JsonProperty("numGtpEchoFailures")
-    public void setNumGtpEchoFailures(Double numGtpEchoFailures) {
-        this.numGtpEchoFailures = numGtpEchoFailures;
-    }
-
-    @JsonProperty("numGtpTunnelErrors")
-    public Double getNumGtpTunnelErrors() {
-        return numGtpTunnelErrors;
-    }
-
-    @JsonProperty("numGtpTunnelErrors")
-    public void setNumGtpTunnelErrors(Double numGtpTunnelErrors) {
-        this.numGtpTunnelErrors = numGtpTunnelErrors;
-    }
-
-    @JsonProperty("numHttpErrors")
-    public Double getNumHttpErrors() {
-        return numHttpErrors;
-    }
-
-    @JsonProperty("numHttpErrors")
-    public void setNumHttpErrors(Double numHttpErrors) {
-        this.numHttpErrors = numHttpErrors;
-    }
-
-    @JsonProperty("tcpFlagCountList")
-    public List<List<String>> getTcpFlagCountList() {
-        return tcpFlagCountList;
-    }
-
-    @JsonProperty("tcpFlagCountList")
-    public void setTcpFlagCountList(List<List<String>> tcpFlagCountList) {
-        this.tcpFlagCountList = tcpFlagCountList;
-    }
-
-    @JsonProperty("tcpFlagList")
-    public List<String> getTcpFlagList() {
-        return tcpFlagList;
-    }
-
-    @JsonProperty("tcpFlagList")
-    public void setTcpFlagList(List<String> tcpFlagList) {
-        this.tcpFlagList = tcpFlagList;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("avgBitErrorRate", avgBitErrorRate).append("avgPacketDelayVariation", avgPacketDelayVariation).append("avgPacketLatency", avgPacketLatency).append("avgReceiveThroughput", avgReceiveThroughput).append("avgTransmitThroughput", avgTransmitThroughput).append("flowActivationEpoch", flowActivationEpoch).append("flowActivationMicrosec", flowActivationMicrosec).append("flowDeactivationEpoch", flowDeactivationEpoch).append("flowDeactivationMicrosec", flowDeactivationMicrosec).append("flowDeactivationTime", flowDeactivationTime).append("flowStatus", flowStatus).append("maxPacketDelayVariation", maxPacketDelayVariation).append("numActivationFailures", numActivationFailures).append("numBitErrors", numBitErrors).append("numBytesReceived", numBytesReceived).append("numBytesTransmitted", numBytesTransmitted).append("numDroppedPackets", numDroppedPackets).append("numL7BytesReceived", numL7BytesReceived).append("numL7BytesTransmitted", numL7BytesTransmitted).append("numLostPackets", numLostPackets).append("numOutOfOrderPackets", numOutOfOrderPackets).append("numPacketErrors", numPacketErrors).append("numPacketsReceivedExclRetrans", numPacketsReceivedExclRetrans).append("numPacketsReceivedInclRetrans", numPacketsReceivedInclRetrans).append("numPacketsTransmittedInclRetrans", numPacketsTransmittedInclRetrans).append("numRetries", numRetries).append("numTimeouts", numTimeouts).append("numTunneledL7BytesReceived", numTunneledL7BytesReceived).append("roundTripTime", roundTripTime).append("timeToFirstByte", timeToFirstByte).append("durConnectionFailedStatus", durConnectionFailedStatus).append("durTunnelFailedStatus", durTunnelFailedStatus).append("flowActivatedBy", flowActivatedBy).append("flowActivationTime", flowActivationTime).append("flowDeactivatedBy", flowDeactivatedBy).append("gtpConnectionStatus", gtpConnectionStatus).append("gtpTunnelStatus", gtpTunnelStatus).append("ipTosCountList", ipTosCountList).append("ipTosList", ipTosList).append("largePacketRtt", largePacketRtt).append("largePacketThreshold", largePacketThreshold).append("maxReceiveBitRate", maxReceiveBitRate).append("maxTransmitBitRate", maxTransmitBitRate).append("mobileQciCosCountList", mobileQciCosCountList).append("mobileQciCosList", mobileQciCosList).append("numGtpEchoFailures", numGtpEchoFailures).append("numGtpTunnelErrors", numGtpTunnelErrors).append("numHttpErrors", numHttpErrors).append("tcpFlagCountList", tcpFlagCountList).append("tcpFlagList", tcpFlagList).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(avgPacketDelayVariation).append(flowActivationTime).append(numPacketsReceivedInclRetrans).append(flowActivationEpoch).append(maxPacketDelayVariation).append(ipTosList).append(flowStatus).append(flowDeactivationEpoch).append(numL7BytesReceived).append(avgReceiveThroughput).append(numGtpTunnelErrors).append(numPacketsTransmittedInclRetrans).append(maxTransmitBitRate).append(ipTosCountList).append(gtpTunnelStatus).append(numBitErrors).append(timeToFirstByte).append(mobileQciCosList).append(numTunneledL7BytesReceived).append(additionalProperties).append(gtpConnectionStatus).append(numPacketErrors).append(tcpFlagCountList).append(flowDeactivatedBy).append(avgTransmitThroughput).append(roundTripTime).append(numBytesTransmitted).append(flowActivatedBy).append(numHttpErrors).append(numDroppedPackets).append(numL7BytesTransmitted).append(largePacketRtt).append(largePacketThreshold).append(durTunnelFailedStatus).append(numLostPackets).append(numGtpEchoFailures).append(flowDeactivationTime).append(flowActivationMicrosec).append(mobileQciCosCountList).append(avgBitErrorRate).append(numBytesReceived).append(avgPacketLatency).append(numTimeouts).append(maxReceiveBitRate).append(numPacketsReceivedExclRetrans).append(flowDeactivationMicrosec).append(numRetries).append(numOutOfOrderPackets).append(tcpFlagList).append(durConnectionFailedStatus).append(numActivationFailures).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof GtpPerFlowMetrics) == false) {
-            return false;
-        }
-        GtpPerFlowMetrics rhs = ((GtpPerFlowMetrics) other);
-        return new EqualsBuilder().append(avgPacketDelayVariation, rhs.avgPacketDelayVariation).append(flowActivationTime, rhs.flowActivationTime).append(numPacketsReceivedInclRetrans, rhs.numPacketsReceivedInclRetrans).append(flowActivationEpoch, rhs.flowActivationEpoch).append(maxPacketDelayVariation, rhs.maxPacketDelayVariation).append(ipTosList, rhs.ipTosList).append(flowStatus, rhs.flowStatus).append(flowDeactivationEpoch, rhs.flowDeactivationEpoch).append(numL7BytesReceived, rhs.numL7BytesReceived).append(avgReceiveThroughput, rhs.avgReceiveThroughput).append(numGtpTunnelErrors, rhs.numGtpTunnelErrors).append(numPacketsTransmittedInclRetrans, rhs.numPacketsTransmittedInclRetrans).append(maxTransmitBitRate, rhs.maxTransmitBitRate).append(ipTosCountList, rhs.ipTosCountList).append(gtpTunnelStatus, rhs.gtpTunnelStatus).append(numBitErrors, rhs.numBitErrors).append(timeToFirstByte, rhs.timeToFirstByte).append(mobileQciCosList, rhs.mobileQciCosList).append(numTunneledL7BytesReceived, rhs.numTunneledL7BytesReceived).append(additionalProperties, rhs.additionalProperties).append(gtpConnectionStatus, rhs.gtpConnectionStatus).append(numPacketErrors, rhs.numPacketErrors).append(tcpFlagCountList, rhs.tcpFlagCountList).append(flowDeactivatedBy, rhs.flowDeactivatedBy).append(avgTransmitThroughput, rhs.avgTransmitThroughput).append(roundTripTime, rhs.roundTripTime).append(numBytesTransmitted, rhs.numBytesTransmitted).append(flowActivatedBy, rhs.flowActivatedBy).append(numHttpErrors, rhs.numHttpErrors).append(numDroppedPackets, rhs.numDroppedPackets).append(numL7BytesTransmitted, rhs.numL7BytesTransmitted).append(largePacketRtt, rhs.largePacketRtt).append(largePacketThreshold, rhs.largePacketThreshold).append(durTunnelFailedStatus, rhs.durTunnelFailedStatus).append(numLostPackets, rhs.numLostPackets).append(numGtpEchoFailures, rhs.numGtpEchoFailures).append(flowDeactivationTime, rhs.flowDeactivationTime).append(flowActivationMicrosec, rhs.flowActivationMicrosec).append(mobileQciCosCountList, rhs.mobileQciCosCountList).append(avgBitErrorRate, rhs.avgBitErrorRate).append(numBytesReceived, rhs.numBytesReceived).append(avgPacketLatency, rhs.avgPacketLatency).append(numTimeouts, rhs.numTimeouts).append(maxReceiveBitRate, rhs.maxReceiveBitRate).append(numPacketsReceivedExclRetrans, rhs.numPacketsReceivedExclRetrans).append(flowDeactivationMicrosec, rhs.flowDeactivationMicrosec).append(numRetries, rhs.numRetries).append(numOutOfOrderPackets, rhs.numOutOfOrderPackets).append(tcpFlagList, rhs.tcpFlagList).append(durConnectionFailedStatus, rhs.durConnectionFailedStatus).append(numActivationFailures, rhs.numActivationFailures).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/HashOfNameValuePairArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/HashOfNameValuePairArray.java
deleted file mode 100644
index c44edf3..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/HashOfNameValuePairArray.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "arrayOfFields"
-})
-public class HashOfNameValuePairArray {
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("arrayOfFields")
-    private List<ArrayOfField_> arrayOfFields = null;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("arrayOfFields")
-    public List<ArrayOfField_> getArrayOfFields() {
-        return arrayOfFields;
-    }
-
-    @JsonProperty("arrayOfFields")
-    public void setArrayOfFields(List<ArrayOfField_> arrayOfFields) {
-        this.arrayOfFields = arrayOfFields;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("name", name).append("arrayOfFields", arrayOfFields).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(arrayOfFields).append(additionalProperties).append(name).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof HashOfNameValuePairArray) == false) {
-            return false;
-        }
-        HashOfNameValuePairArray rhs = ((HashOfNameValuePairArray) other);
-        return new EqualsBuilder().append(arrayOfFields, rhs.arrayOfFields).append(additionalProperties, rhs.additionalProperties).append(name, rhs.name).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/HeartbeatFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/HeartbeatFields.java
deleted file mode 100644
index a73da4e..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/HeartbeatFields.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "heartbeatFieldsVersion",
-    "heartbeatInterval",
-    "additionalFields"
-})
-public class HeartbeatFields {
-
-    @JsonProperty("heartbeatFieldsVersion")
-    private Double heartbeatFieldsVersion;
-    @JsonProperty("heartbeatInterval")
-    private Long heartbeatInterval;
-    @JsonProperty("additionalFields")
-    private List<AdditionalField> additionalFields = null;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("heartbeatFieldsVersion")
-    public Double getHeartbeatFieldsVersion() {
-        return heartbeatFieldsVersion;
-    }
-
-    @JsonProperty("heartbeatFieldsVersion")
-    public void setHeartbeatFieldsVersion(Double heartbeatFieldsVersion) {
-        this.heartbeatFieldsVersion = heartbeatFieldsVersion;
-    }
-
-    @JsonProperty("heartbeatInterval")
-    public Long getHeartbeatInterval() {
-        return heartbeatInterval;
-    }
-
-    @JsonProperty("heartbeatInterval")
-    public void setHeartbeatInterval(Long heartbeatInterval) {
-        this.heartbeatInterval = heartbeatInterval;
-    }
-
-    @JsonProperty("additionalFields")
-    public List<AdditionalField> getAdditionalFields() {
-        return additionalFields;
-    }
-
-    @JsonProperty("additionalFields")
-    public void setAdditionalFields(List<AdditionalField> additionalFields) {
-        this.additionalFields = additionalFields;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("heartbeatFieldsVersion", heartbeatFieldsVersion).append("heartbeatInterval", heartbeatInterval).append("additionalFields", additionalFields).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(heartbeatInterval).append(additionalProperties).append(heartbeatFieldsVersion).append(additionalFields).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof HeartbeatFields) == false) {
-            return false;
-        }
-        HeartbeatFields rhs = ((HeartbeatFields) other);
-        return new EqualsBuilder().append(heartbeatInterval, rhs.heartbeatInterval).append(additionalProperties, rhs.additionalProperties).append(heartbeatFieldsVersion, rhs.heartbeatFieldsVersion).append(additionalFields, rhs.additionalFields).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/JsonObject.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/JsonObject.java
deleted file mode 100644
index e49ddd7..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/JsonObject.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.onap.dcaegen2.ves.domain.ObjectInstance;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "objectInstances",
-    "objectName",
-    "objectSchema",
-    "objectSchemaUrl",
-    "nfSubscribedObjectName",
-    "nfSubscriptionId"
-})
-public class JsonObject {
-
-    @JsonProperty("objectInstances")
-    private List<ObjectInstance> objectInstances = null;
-    @JsonProperty("objectName")
-    private String objectName;
-    @JsonProperty("objectSchema")
-    private String objectSchema;
-    @JsonProperty("objectSchemaUrl")
-    private String objectSchemaUrl;
-    @JsonProperty("nfSubscribedObjectName")
-    private String nfSubscribedObjectName;
-    @JsonProperty("nfSubscriptionId")
-    private String nfSubscriptionId;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("objectInstances")
-    public List<ObjectInstance> getObjectInstances() {
-        return objectInstances;
-    }
-
-    @JsonProperty("objectInstances")
-    public void setObjectInstances(List<ObjectInstance> objectInstances) {
-        this.objectInstances = objectInstances;
-    }
-
-    @JsonProperty("objectName")
-    public String getObjectName() {
-        return objectName;
-    }
-
-    @JsonProperty("objectName")
-    public void setObjectName(String objectName) {
-        this.objectName = objectName;
-    }
-
-    @JsonProperty("objectSchema")
-    public String getObjectSchema() {
-        return objectSchema;
-    }
-
-    @JsonProperty("objectSchema")
-    public void setObjectSchema(String objectSchema) {
-        this.objectSchema = objectSchema;
-    }
-
-    @JsonProperty("objectSchemaUrl")
-    public String getObjectSchemaUrl() {
-        return objectSchemaUrl;
-    }
-
-    @JsonProperty("objectSchemaUrl")
-    public void setObjectSchemaUrl(String objectSchemaUrl) {
-        this.objectSchemaUrl = objectSchemaUrl;
-    }
-
-    @JsonProperty("nfSubscribedObjectName")
-    public String getNfSubscribedObjectName() {
-        return nfSubscribedObjectName;
-    }
-
-    @JsonProperty("nfSubscribedObjectName")
-    public void setNfSubscribedObjectName(String nfSubscribedObjectName) {
-        this.nfSubscribedObjectName = nfSubscribedObjectName;
-    }
-
-    @JsonProperty("nfSubscriptionId")
-    public String getNfSubscriptionId() {
-        return nfSubscriptionId;
-    }
-
-    @JsonProperty("nfSubscriptionId")
-    public void setNfSubscriptionId(String nfSubscriptionId) {
-        this.nfSubscriptionId = nfSubscriptionId;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("objectInstances", objectInstances).append("objectName", objectName).append("objectSchema", objectSchema).append("objectSchemaUrl", objectSchemaUrl).append("nfSubscribedObjectName", nfSubscribedObjectName).append("nfSubscriptionId", nfSubscriptionId).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(nfSubscribedObjectName).append(nfSubscriptionId).append(objectName).append(additionalProperties).append(objectInstances).append(objectSchemaUrl).append(objectSchema).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof JsonObject) == false) {
-            return false;
-        }
-        JsonObject rhs = ((JsonObject) other);
-        return new EqualsBuilder().append(nfSubscribedObjectName, rhs.nfSubscribedObjectName).append(nfSubscriptionId, rhs.nfSubscriptionId).append(objectName, rhs.objectName).append(additionalProperties, rhs.additionalProperties).append(objectInstances, rhs.objectInstances).append(objectSchemaUrl, rhs.objectSchemaUrl).append(objectSchema, rhs.objectSchema).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/MeasurementsForVfScalingFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/MeasurementsForVfScalingFields.java
deleted file mode 100644
index 65cc5e8..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/MeasurementsForVfScalingFields.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "measurementInterval",
-    "measurementsForVfScalingVersion",
-    "additionalFields",
-    "additionalMeasurements",
-    "additionalObjects",
-    "codecUsageArray",
-    "concurrentSessions",
-    "configuredEntities",
-    "cpuUsageArray",
-    "diskUsageArray",
-    "featureUsageArray",
-    "filesystemUsageArray",
-    "latencyDistribution",
-    "meanRequestLatency",
-    "memoryUsageArray",
-    "numberOfMediaPortsInUse",
-    "requestRate",
-    "vnfcScalingMetric",
-    "vNicPerformanceArray"
-})
-public class MeasurementsForVfScalingFields {
-
-    @JsonProperty("measurementInterval")
-    private Double measurementInterval;
-    @JsonProperty("measurementsForVfScalingVersion")
-    private Double measurementsForVfScalingVersion;
-    @JsonProperty("additionalFields")
-    private List<AdditionalField> additionalFields = null;
-    @JsonProperty("additionalMeasurements")
-    private List<AdditionalMeasurement> additionalMeasurements = null;
-    @JsonProperty("additionalObjects")
-    private List<AdditionalObject> additionalObjects = null;
-    @JsonProperty("codecUsageArray")
-    private List<CodecUsageArray> codecUsageArray = null;
-    @JsonProperty("concurrentSessions")
-    private Long concurrentSessions;
-    @JsonProperty("configuredEntities")
-    private Long configuredEntities;
-    @JsonProperty("cpuUsageArray")
-    private List<CpuUsageArray> cpuUsageArray = null;
-    @JsonProperty("diskUsageArray")
-    private List<DiskUsageArray> diskUsageArray = null;
-    @JsonProperty("featureUsageArray")
-    private List<FeatureUsageArray> featureUsageArray = null;
-    @JsonProperty("filesystemUsageArray")
-    private List<FilesystemUsageArray> filesystemUsageArray = null;
-    @JsonProperty("latencyDistribution")
-    private List<LatencyDistribution> latencyDistribution = null;
-    @JsonProperty("meanRequestLatency")
-    private Double meanRequestLatency;
-    @JsonProperty("memoryUsageArray")
-    private List<MemoryUsageArray> memoryUsageArray = null;
-    @JsonProperty("numberOfMediaPortsInUse")
-    private Long numberOfMediaPortsInUse;
-    @JsonProperty("requestRate")
-    private Double requestRate;
-    @JsonProperty("vnfcScalingMetric")
-    private Long vnfcScalingMetric;
-    @JsonProperty("vNicPerformanceArray")
-    private List<VNicPerformanceArray> vNicPerformanceArray = null;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("measurementInterval")
-    public Double getMeasurementInterval() {
-        return measurementInterval;
-    }
-
-    @JsonProperty("measurementInterval")
-    public void setMeasurementInterval(Double measurementInterval) {
-        this.measurementInterval = measurementInterval;
-    }
-
-    @JsonProperty("measurementsForVfScalingVersion")
-    public Double getMeasurementsForVfScalingVersion() {
-        return measurementsForVfScalingVersion;
-    }
-
-    @JsonProperty("measurementsForVfScalingVersion")
-    public void setMeasurementsForVfScalingVersion(Double measurementsForVfScalingVersion) {
-        this.measurementsForVfScalingVersion = measurementsForVfScalingVersion;
-    }
-
-    @JsonProperty("additionalFields")
-    public List<AdditionalField> getAdditionalFields() {
-        return additionalFields;
-    }
-
-    @JsonProperty("additionalFields")
-    public void setAdditionalFields(List<AdditionalField> additionalFields) {
-        this.additionalFields = additionalFields;
-    }
-
-    @JsonProperty("additionalMeasurements")
-    public List<AdditionalMeasurement> getAdditionalMeasurements() {
-        return additionalMeasurements;
-    }
-
-    @JsonProperty("additionalMeasurements")
-    public void setAdditionalMeasurements(List<AdditionalMeasurement> additionalMeasurements) {
-        this.additionalMeasurements = additionalMeasurements;
-    }
-
-    @JsonProperty("additionalObjects")
-    public List<AdditionalObject> getAdditionalObjects() {
-        return additionalObjects;
-    }
-
-    @JsonProperty("additionalObjects")
-    public void setAdditionalObjects(List<AdditionalObject> additionalObjects) {
-        this.additionalObjects = additionalObjects;
-    }
-
-    @JsonProperty("codecUsageArray")
-    public List<CodecUsageArray> getCodecUsageArray() {
-        return codecUsageArray;
-    }
-
-    @JsonProperty("codecUsageArray")
-    public void setCodecUsageArray(List<CodecUsageArray> codecUsageArray) {
-        this.codecUsageArray = codecUsageArray;
-    }
-
-    @JsonProperty("concurrentSessions")
-    public Long getConcurrentSessions() {
-        return concurrentSessions;
-    }
-
-    @JsonProperty("concurrentSessions")
-    public void setConcurrentSessions(Long concurrentSessions) {
-        this.concurrentSessions = concurrentSessions;
-    }
-
-    @JsonProperty("configuredEntities")
-    public Long getConfiguredEntities() {
-        return configuredEntities;
-    }
-
-    @JsonProperty("configuredEntities")
-    public void setConfiguredEntities(Long configuredEntities) {
-        this.configuredEntities = configuredEntities;
-    }
-
-    @JsonProperty("cpuUsageArray")
-    public List<CpuUsageArray> getCpuUsageArray() {
-        return cpuUsageArray;
-    }
-
-    @JsonProperty("cpuUsageArray")
-    public void setCpuUsageArray(List<CpuUsageArray> cpuUsageArray) {
-        this.cpuUsageArray = cpuUsageArray;
-    }
-
-    @JsonProperty("diskUsageArray")
-    public List<DiskUsageArray> getDiskUsageArray() {
-        return diskUsageArray;
-    }
-
-    @JsonProperty("diskUsageArray")
-    public void setDiskUsageArray(List<DiskUsageArray> diskUsageArray) {
-        this.diskUsageArray = diskUsageArray;
-    }
-
-    @JsonProperty("featureUsageArray")
-    public List<FeatureUsageArray> getFeatureUsageArray() {
-        return featureUsageArray;
-    }
-
-    @JsonProperty("featureUsageArray")
-    public void setFeatureUsageArray(List<FeatureUsageArray> featureUsageArray) {
-        this.featureUsageArray = featureUsageArray;
-    }
-
-    @JsonProperty("filesystemUsageArray")
-    public List<FilesystemUsageArray> getFilesystemUsageArray() {
-        return filesystemUsageArray;
-    }
-
-    @JsonProperty("filesystemUsageArray")
-    public void setFilesystemUsageArray(List<FilesystemUsageArray> filesystemUsageArray) {
-        this.filesystemUsageArray = filesystemUsageArray;
-    }
-
-    @JsonProperty("latencyDistribution")
-    public List<LatencyDistribution> getLatencyDistribution() {
-        return latencyDistribution;
-    }
-
-    @JsonProperty("latencyDistribution")
-    public void setLatencyDistribution(List<LatencyDistribution> latencyDistribution) {
-        this.latencyDistribution = latencyDistribution;
-    }
-
-    @JsonProperty("meanRequestLatency")
-    public Double getMeanRequestLatency() {
-        return meanRequestLatency;
-    }
-
-    @JsonProperty("meanRequestLatency")
-    public void setMeanRequestLatency(Double meanRequestLatency) {
-        this.meanRequestLatency = meanRequestLatency;
-    }
-
-    @JsonProperty("memoryUsageArray")
-    public List<MemoryUsageArray> getMemoryUsageArray() {
-        return memoryUsageArray;
-    }
-
-    @JsonProperty("memoryUsageArray")
-    public void setMemoryUsageArray(List<MemoryUsageArray> memoryUsageArray) {
-        this.memoryUsageArray = memoryUsageArray;
-    }
-
-    @JsonProperty("numberOfMediaPortsInUse")
-    public Long getNumberOfMediaPortsInUse() {
-        return numberOfMediaPortsInUse;
-    }
-
-    @JsonProperty("numberOfMediaPortsInUse")
-    public void setNumberOfMediaPortsInUse(Long numberOfMediaPortsInUse) {
-        this.numberOfMediaPortsInUse = numberOfMediaPortsInUse;
-    }
-
-    @JsonProperty("requestRate")
-    public Double getRequestRate() {
-        return requestRate;
-    }
-
-    @JsonProperty("requestRate")
-    public void setRequestRate(Double requestRate) {
-        this.requestRate = requestRate;
-    }
-
-    @JsonProperty("vnfcScalingMetric")
-    public Long getVnfcScalingMetric() {
-        return vnfcScalingMetric;
-    }
-
-    @JsonProperty("vnfcScalingMetric")
-    public void setVnfcScalingMetric(Long vnfcScalingMetric) {
-        this.vnfcScalingMetric = vnfcScalingMetric;
-    }
-
-    @JsonProperty("vNicPerformanceArray")
-    public List<VNicPerformanceArray> getVNicPerformanceArray() {
-        return vNicPerformanceArray;
-    }
-
-    @JsonProperty("vNicPerformanceArray")
-    public void setVNicPerformanceArray(List<VNicPerformanceArray> vNicPerformanceArray) {
-        this.vNicPerformanceArray = vNicPerformanceArray;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("measurementInterval", measurementInterval).append("measurementsForVfScalingVersion", measurementsForVfScalingVersion).append("additionalFields", additionalFields).append("additionalMeasurements", additionalMeasurements).append("additionalObjects", additionalObjects).append("codecUsageArray", codecUsageArray).append("concurrentSessions", concurrentSessions).append("configuredEntities", configuredEntities).append("cpuUsageArray", cpuUsageArray).append("diskUsageArray", diskUsageArray).append("featureUsageArray", featureUsageArray).append("filesystemUsageArray", filesystemUsageArray).append("latencyDistribution", latencyDistribution).append("meanRequestLatency", meanRequestLatency).append("memoryUsageArray", memoryUsageArray).append("numberOfMediaPortsInUse", numberOfMediaPortsInUse).append("requestRate", requestRate).append("vnfcScalingMetric", vnfcScalingMetric).append("vNicPerformanceArray", vNicPerformanceArray).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(requestRate).append(numberOfMediaPortsInUse).append(measurementInterval).append(diskUsageArray).append(additionalObjects).append(measurementsForVfScalingVersion).append(filesystemUsageArray).append(featureUsageArray).append(vNicPerformanceArray).append(vnfcScalingMetric).append(cpuUsageArray).append(additionalProperties).append(meanRequestLatency).append(additionalMeasurements).append(latencyDistribution).append(concurrentSessions).append(codecUsageArray).append(additionalFields).append(memoryUsageArray).append(configuredEntities).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof MeasurementsForVfScalingFields) == false) {
-            return false;
-        }
-        MeasurementsForVfScalingFields rhs = ((MeasurementsForVfScalingFields) other);
-        return new EqualsBuilder().append(requestRate, rhs.requestRate).append(numberOfMediaPortsInUse, rhs.numberOfMediaPortsInUse).append(measurementInterval, rhs.measurementInterval).append(diskUsageArray, rhs.diskUsageArray).append(additionalObjects, rhs.additionalObjects).append(measurementsForVfScalingVersion, rhs.measurementsForVfScalingVersion).append(filesystemUsageArray, rhs.filesystemUsageArray).append(featureUsageArray, rhs.featureUsageArray).append(vNicPerformanceArray, rhs.vNicPerformanceArray).append(vnfcScalingMetric, rhs.vnfcScalingMetric).append(cpuUsageArray, rhs.cpuUsageArray).append(additionalProperties, rhs.additionalProperties).append(meanRequestLatency, rhs.meanRequestLatency).append(additionalMeasurements, rhs.additionalMeasurements).append(latencyDistribution, rhs.latencyDistribution).append(concurrentSessions, rhs.concurrentSessions).append(codecUsageArray, rhs.codecUsageArray).append(additionalFields, rhs.additionalFields).append(memoryUsageArray, rhs.memoryUsageArray).append(configuredEntities, rhs.configuredEntities).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/MemoryUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/MemoryUsageArray.java
deleted file mode 100644
index 8ce16ae..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/MemoryUsageArray.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "memoryFree",
-    "memoryUsed",
-    "vmIdentifier",
-    "memoryBuffered",
-    "memoryCached",
-    "memoryConfigured",
-    "memorySlabRecl",
-    "memorySlabUnrecl"
-})
-public class MemoryUsageArray {
-
-    @JsonProperty("memoryFree")
-    private Double memoryFree;
-    @JsonProperty("memoryUsed")
-    private Double memoryUsed;
-    @JsonProperty("vmIdentifier")
-    private String vmIdentifier;
-    @JsonProperty("memoryBuffered")
-    private Double memoryBuffered;
-    @JsonProperty("memoryCached")
-    private Double memoryCached;
-    @JsonProperty("memoryConfigured")
-    private Double memoryConfigured;
-    @JsonProperty("memorySlabRecl")
-    private Double memorySlabRecl;
-    @JsonProperty("memorySlabUnrecl")
-    private Double memorySlabUnrecl;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("memoryFree")
-    public Double getMemoryFree() {
-        return memoryFree;
-    }
-
-    @JsonProperty("memoryFree")
-    public void setMemoryFree(Double memoryFree) {
-        this.memoryFree = memoryFree;
-    }
-
-    @JsonProperty("memoryUsed")
-    public Double getMemoryUsed() {
-        return memoryUsed;
-    }
-
-    @JsonProperty("memoryUsed")
-    public void setMemoryUsed(Double memoryUsed) {
-        this.memoryUsed = memoryUsed;
-    }
-
-    @JsonProperty("vmIdentifier")
-    public String getVmIdentifier() {
-        return vmIdentifier;
-    }
-
-    @JsonProperty("vmIdentifier")
-    public void setVmIdentifier(String vmIdentifier) {
-        this.vmIdentifier = vmIdentifier;
-    }
-
-    @JsonProperty("memoryBuffered")
-    public Double getMemoryBuffered() {
-        return memoryBuffered;
-    }
-
-    @JsonProperty("memoryBuffered")
-    public void setMemoryBuffered(Double memoryBuffered) {
-        this.memoryBuffered = memoryBuffered;
-    }
-
-    @JsonProperty("memoryCached")
-    public Double getMemoryCached() {
-        return memoryCached;
-    }
-
-    @JsonProperty("memoryCached")
-    public void setMemoryCached(Double memoryCached) {
-        this.memoryCached = memoryCached;
-    }
-
-    @JsonProperty("memoryConfigured")
-    public Double getMemoryConfigured() {
-        return memoryConfigured;
-    }
-
-    @JsonProperty("memoryConfigured")
-    public void setMemoryConfigured(Double memoryConfigured) {
-        this.memoryConfigured = memoryConfigured;
-    }
-
-    @JsonProperty("memorySlabRecl")
-    public Double getMemorySlabRecl() {
-        return memorySlabRecl;
-    }
-
-    @JsonProperty("memorySlabRecl")
-    public void setMemorySlabRecl(Double memorySlabRecl) {
-        this.memorySlabRecl = memorySlabRecl;
-    }
-
-    @JsonProperty("memorySlabUnrecl")
-    public Double getMemorySlabUnrecl() {
-        return memorySlabUnrecl;
-    }
-
-    @JsonProperty("memorySlabUnrecl")
-    public void setMemorySlabUnrecl(Double memorySlabUnrecl) {
-        this.memorySlabUnrecl = memorySlabUnrecl;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("memoryFree", memoryFree).append("memoryUsed", memoryUsed).append("vmIdentifier", vmIdentifier).append("memoryBuffered", memoryBuffered).append("memoryCached", memoryCached).append("memoryConfigured", memoryConfigured).append("memorySlabRecl", memorySlabRecl).append("memorySlabUnrecl", memorySlabUnrecl).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(memorySlabUnrecl).append(memoryFree).append(memoryConfigured).append(additionalProperties).append(memorySlabRecl).append(memoryBuffered).append(vmIdentifier).append(memoryUsed).append(memoryCached).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof MemoryUsageArray) == false) {
-            return false;
-        }
-        MemoryUsageArray rhs = ((MemoryUsageArray) other);
-        return new EqualsBuilder().append(memorySlabUnrecl, rhs.memorySlabUnrecl).append(memoryFree, rhs.memoryFree).append(memoryConfigured, rhs.memoryConfigured).append(additionalProperties, rhs.additionalProperties).append(memorySlabRecl, rhs.memorySlabRecl).append(memoryBuffered, rhs.memoryBuffered).append(vmIdentifier, rhs.vmIdentifier).append(memoryUsed, rhs.memoryUsed).append(memoryCached, rhs.memoryCached).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/MobileFlowFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/MobileFlowFields.java
deleted file mode 100644
index 7a19279..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/MobileFlowFields.java
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "flowDirection",
-    "gtpPerFlowMetrics",
-    "ipProtocolType",
-    "ipVersion",
-    "mobileFlowFieldsVersion",
-    "otherEndpointIpAddress",
-    "otherEndpointPort",
-    "reportingEndpointIpAddr",
-    "reportingEndpointPort",
-    "additionalFields",
-    "applicationType",
-    "appProtocolType",
-    "appProtocolVersion",
-    "cid",
-    "connectionType",
-    "ecgi",
-    "gtpProtocolType",
-    "gtpVersion",
-    "httpHeader",
-    "imei",
-    "imsi",
-    "lac",
-    "mcc",
-    "mnc",
-    "msisdn",
-    "otherFunctionalRole",
-    "rac",
-    "radioAccessTechnology",
-    "sac",
-    "samplingAlgorithm",
-    "tac",
-    "tunnelId",
-    "vlanId"
-})
-public class MobileFlowFields {
-
-    @JsonProperty("flowDirection")
-    private String flowDirection;
-    @JsonProperty("gtpPerFlowMetrics")
-    private GtpPerFlowMetrics gtpPerFlowMetrics;
-    @JsonProperty("ipProtocolType")
-    private String ipProtocolType;
-    @JsonProperty("ipVersion")
-    private String ipVersion;
-    @JsonProperty("mobileFlowFieldsVersion")
-    private Double mobileFlowFieldsVersion;
-    @JsonProperty("otherEndpointIpAddress")
-    private String otherEndpointIpAddress;
-    @JsonProperty("otherEndpointPort")
-    private Long otherEndpointPort;
-    @JsonProperty("reportingEndpointIpAddr")
-    private String reportingEndpointIpAddr;
-    @JsonProperty("reportingEndpointPort")
-    private Long reportingEndpointPort;
-    @JsonProperty("additionalFields")
-    private List<AdditionalField> additionalFields = null;
-    @JsonProperty("applicationType")
-    private String applicationType;
-    @JsonProperty("appProtocolType")
-    private String appProtocolType;
-    @JsonProperty("appProtocolVersion")
-    private String appProtocolVersion;
-    @JsonProperty("cid")
-    private String cid;
-    @JsonProperty("connectionType")
-    private String connectionType;
-    @JsonProperty("ecgi")
-    private String ecgi;
-    @JsonProperty("gtpProtocolType")
-    private String gtpProtocolType;
-    @JsonProperty("gtpVersion")
-    private String gtpVersion;
-    @JsonProperty("httpHeader")
-    private String httpHeader;
-    @JsonProperty("imei")
-    private String imei;
-    @JsonProperty("imsi")
-    private String imsi;
-    @JsonProperty("lac")
-    private String lac;
-    @JsonProperty("mcc")
-    private String mcc;
-    @JsonProperty("mnc")
-    private String mnc;
-    @JsonProperty("msisdn")
-    private String msisdn;
-    @JsonProperty("otherFunctionalRole")
-    private String otherFunctionalRole;
-    @JsonProperty("rac")
-    private String rac;
-    @JsonProperty("radioAccessTechnology")
-    private String radioAccessTechnology;
-    @JsonProperty("sac")
-    private String sac;
-    @JsonProperty("samplingAlgorithm")
-    private Long samplingAlgorithm;
-    @JsonProperty("tac")
-    private String tac;
-    @JsonProperty("tunnelId")
-    private String tunnelId;
-    @JsonProperty("vlanId")
-    private String vlanId;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("flowDirection")
-    public String getFlowDirection() {
-        return flowDirection;
-    }
-
-    @JsonProperty("flowDirection")
-    public void setFlowDirection(String flowDirection) {
-        this.flowDirection = flowDirection;
-    }
-
-    @JsonProperty("gtpPerFlowMetrics")
-    public GtpPerFlowMetrics getGtpPerFlowMetrics() {
-        return gtpPerFlowMetrics;
-    }
-
-    @JsonProperty("gtpPerFlowMetrics")
-    public void setGtpPerFlowMetrics(GtpPerFlowMetrics gtpPerFlowMetrics) {
-        this.gtpPerFlowMetrics = gtpPerFlowMetrics;
-    }
-
-    @JsonProperty("ipProtocolType")
-    public String getIpProtocolType() {
-        return ipProtocolType;
-    }
-
-    @JsonProperty("ipProtocolType")
-    public void setIpProtocolType(String ipProtocolType) {
-        this.ipProtocolType = ipProtocolType;
-    }
-
-    @JsonProperty("ipVersion")
-    public String getIpVersion() {
-        return ipVersion;
-    }
-
-    @JsonProperty("ipVersion")
-    public void setIpVersion(String ipVersion) {
-        this.ipVersion = ipVersion;
-    }
-
-    @JsonProperty("mobileFlowFieldsVersion")
-    public Double getMobileFlowFieldsVersion() {
-        return mobileFlowFieldsVersion;
-    }
-
-    @JsonProperty("mobileFlowFieldsVersion")
-    public void setMobileFlowFieldsVersion(Double mobileFlowFieldsVersion) {
-        this.mobileFlowFieldsVersion = mobileFlowFieldsVersion;
-    }
-
-    @JsonProperty("otherEndpointIpAddress")
-    public String getOtherEndpointIpAddress() {
-        return otherEndpointIpAddress;
-    }
-
-    @JsonProperty("otherEndpointIpAddress")
-    public void setOtherEndpointIpAddress(String otherEndpointIpAddress) {
-        this.otherEndpointIpAddress = otherEndpointIpAddress;
-    }
-
-    @JsonProperty("otherEndpointPort")
-    public Long getOtherEndpointPort() {
-        return otherEndpointPort;
-    }
-
-    @JsonProperty("otherEndpointPort")
-    public void setOtherEndpointPort(Long otherEndpointPort) {
-        this.otherEndpointPort = otherEndpointPort;
-    }
-
-    @JsonProperty("reportingEndpointIpAddr")
-    public String getReportingEndpointIpAddr() {
-        return reportingEndpointIpAddr;
-    }
-
-    @JsonProperty("reportingEndpointIpAddr")
-    public void setReportingEndpointIpAddr(String reportingEndpointIpAddr) {
-        this.reportingEndpointIpAddr = reportingEndpointIpAddr;
-    }
-
-    @JsonProperty("reportingEndpointPort")
-    public Long getReportingEndpointPort() {
-        return reportingEndpointPort;
-    }
-
-    @JsonProperty("reportingEndpointPort")
-    public void setReportingEndpointPort(Long reportingEndpointPort) {
-        this.reportingEndpointPort = reportingEndpointPort;
-    }
-
-    @JsonProperty("additionalFields")
-    public List<AdditionalField> getAdditionalFields() {
-        return additionalFields;
-    }
-
-    @JsonProperty("additionalFields")
-    public void setAdditionalFields(List<AdditionalField> additionalFields) {
-        this.additionalFields = additionalFields;
-    }
-
-    @JsonProperty("applicationType")
-    public String getApplicationType() {
-        return applicationType;
-    }
-
-    @JsonProperty("applicationType")
-    public void setApplicationType(String applicationType) {
-        this.applicationType = applicationType;
-    }
-
-    @JsonProperty("appProtocolType")
-    public String getAppProtocolType() {
-        return appProtocolType;
-    }
-
-    @JsonProperty("appProtocolType")
-    public void setAppProtocolType(String appProtocolType) {
-        this.appProtocolType = appProtocolType;
-    }
-
-    @JsonProperty("appProtocolVersion")
-    public String getAppProtocolVersion() {
-        return appProtocolVersion;
-    }
-
-    @JsonProperty("appProtocolVersion")
-    public void setAppProtocolVersion(String appProtocolVersion) {
-        this.appProtocolVersion = appProtocolVersion;
-    }
-
-    @JsonProperty("cid")
-    public String getCid() {
-        return cid;
-    }
-
-    @JsonProperty("cid")
-    public void setCid(String cid) {
-        this.cid = cid;
-    }
-
-    @JsonProperty("connectionType")
-    public String getConnectionType() {
-        return connectionType;
-    }
-
-    @JsonProperty("connectionType")
-    public void setConnectionType(String connectionType) {
-        this.connectionType = connectionType;
-    }
-
-    @JsonProperty("ecgi")
-    public String getEcgi() {
-        return ecgi;
-    }
-
-    @JsonProperty("ecgi")
-    public void setEcgi(String ecgi) {
-        this.ecgi = ecgi;
-    }
-
-    @JsonProperty("gtpProtocolType")
-    public String getGtpProtocolType() {
-        return gtpProtocolType;
-    }
-
-    @JsonProperty("gtpProtocolType")
-    public void setGtpProtocolType(String gtpProtocolType) {
-        this.gtpProtocolType = gtpProtocolType;
-    }
-
-    @JsonProperty("gtpVersion")
-    public String getGtpVersion() {
-        return gtpVersion;
-    }
-
-    @JsonProperty("gtpVersion")
-    public void setGtpVersion(String gtpVersion) {
-        this.gtpVersion = gtpVersion;
-    }
-
-    @JsonProperty("httpHeader")
-    public String getHttpHeader() {
-        return httpHeader;
-    }
-
-    @JsonProperty("httpHeader")
-    public void setHttpHeader(String httpHeader) {
-        this.httpHeader = httpHeader;
-    }
-
-    @JsonProperty("imei")
-    public String getImei() {
-        return imei;
-    }
-
-    @JsonProperty("imei")
-    public void setImei(String imei) {
-        this.imei = imei;
-    }
-
-    @JsonProperty("imsi")
-    public String getImsi() {
-        return imsi;
-    }
-
-    @JsonProperty("imsi")
-    public void setImsi(String imsi) {
-        this.imsi = imsi;
-    }
-
-    @JsonProperty("lac")
-    public String getLac() {
-        return lac;
-    }
-
-    @JsonProperty("lac")
-    public void setLac(String lac) {
-        this.lac = lac;
-    }
-
-    @JsonProperty("mcc")
-    public String getMcc() {
-        return mcc;
-    }
-
-    @JsonProperty("mcc")
-    public void setMcc(String mcc) {
-        this.mcc = mcc;
-    }
-
-    @JsonProperty("mnc")
-    public String getMnc() {
-        return mnc;
-    }
-
-    @JsonProperty("mnc")
-    public void setMnc(String mnc) {
-        this.mnc = mnc;
-    }
-
-    @JsonProperty("msisdn")
-    public String getMsisdn() {
-        return msisdn;
-    }
-
-    @JsonProperty("msisdn")
-    public void setMsisdn(String msisdn) {
-        this.msisdn = msisdn;
-    }
-
-    @JsonProperty("otherFunctionalRole")
-    public String getOtherFunctionalRole() {
-        return otherFunctionalRole;
-    }
-
-    @JsonProperty("otherFunctionalRole")
-    public void setOtherFunctionalRole(String otherFunctionalRole) {
-        this.otherFunctionalRole = otherFunctionalRole;
-    }
-
-    @JsonProperty("rac")
-    public String getRac() {
-        return rac;
-    }
-
-    @JsonProperty("rac")
-    public void setRac(String rac) {
-        this.rac = rac;
-    }
-
-    @JsonProperty("radioAccessTechnology")
-    public String getRadioAccessTechnology() {
-        return radioAccessTechnology;
-    }
-
-    @JsonProperty("radioAccessTechnology")
-    public void setRadioAccessTechnology(String radioAccessTechnology) {
-        this.radioAccessTechnology = radioAccessTechnology;
-    }
-
-    @JsonProperty("sac")
-    public String getSac() {
-        return sac;
-    }
-
-    @JsonProperty("sac")
-    public void setSac(String sac) {
-        this.sac = sac;
-    }
-
-    @JsonProperty("samplingAlgorithm")
-    public Long getSamplingAlgorithm() {
-        return samplingAlgorithm;
-    }
-
-    @JsonProperty("samplingAlgorithm")
-    public void setSamplingAlgorithm(Long samplingAlgorithm) {
-        this.samplingAlgorithm = samplingAlgorithm;
-    }
-
-    @JsonProperty("tac")
-    public String getTac() {
-        return tac;
-    }
-
-    @JsonProperty("tac")
-    public void setTac(String tac) {
-        this.tac = tac;
-    }
-
-    @JsonProperty("tunnelId")
-    public String getTunnelId() {
-        return tunnelId;
-    }
-
-    @JsonProperty("tunnelId")
-    public void setTunnelId(String tunnelId) {
-        this.tunnelId = tunnelId;
-    }
-
-    @JsonProperty("vlanId")
-    public String getVlanId() {
-        return vlanId;
-    }
-
-    @JsonProperty("vlanId")
-    public void setVlanId(String vlanId) {
-        this.vlanId = vlanId;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("flowDirection", flowDirection).append("gtpPerFlowMetrics", gtpPerFlowMetrics).append("ipProtocolType", ipProtocolType).append("ipVersion", ipVersion).append("mobileFlowFieldsVersion", mobileFlowFieldsVersion).append("otherEndpointIpAddress", otherEndpointIpAddress).append("otherEndpointPort", otherEndpointPort).append("reportingEndpointIpAddr", reportingEndpointIpAddr).append("reportingEndpointPort", reportingEndpointPort).append("additionalFields", additionalFields).append("applicationType", applicationType).append("appProtocolType", appProtocolType).append("appProtocolVersion", appProtocolVersion).append("cid", cid).append("connectionType", connectionType).append("ecgi", ecgi).append("gtpProtocolType", gtpProtocolType).append("gtpVersion", gtpVersion).append("httpHeader", httpHeader).append("imei", imei).append("imsi", imsi).append("lac", lac).append("mcc", mcc).append("mnc", mnc).append("msisdn", msisdn).append("otherFunctionalRole", otherFunctionalRole).append("rac", rac).append("radioAccessTechnology", radioAccessTechnology).append("sac", sac).append("samplingAlgorithm", samplingAlgorithm).append("tac", tac).append("tunnelId", tunnelId).append("vlanId", vlanId).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(sac).append(mcc).append(samplingAlgorithm).append(tac).append(applicationType).append(gtpPerFlowMetrics).append(vlanId).append(radioAccessTechnology).append(lac).append(flowDirection).append(httpHeader).append(mnc).append(additionalFields).append(reportingEndpointIpAddr).append(appProtocolVersion).append(msisdn).append(tunnelId).append(imei).append(ipVersion).append(gtpProtocolType).append(reportingEndpointPort).append(otherEndpointPort).append(connectionType).append(ecgi).append(gtpVersion).append(cid).append(ipProtocolType).append(mobileFlowFieldsVersion).append(additionalProperties).append(imsi).append(otherFunctionalRole).append(otherEndpointIpAddress).append(appProtocolType).append(rac).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof MobileFlowFields) == false) {
-            return false;
-        }
-        MobileFlowFields rhs = ((MobileFlowFields) other);
-        return new EqualsBuilder().append(sac, rhs.sac).append(mcc, rhs.mcc).append(samplingAlgorithm, rhs.samplingAlgorithm).append(tac, rhs.tac).append(applicationType, rhs.applicationType).append(gtpPerFlowMetrics, rhs.gtpPerFlowMetrics).append(vlanId, rhs.vlanId).append(radioAccessTechnology, rhs.radioAccessTechnology).append(lac, rhs.lac).append(flowDirection, rhs.flowDirection).append(httpHeader, rhs.httpHeader).append(mnc, rhs.mnc).append(additionalFields, rhs.additionalFields).append(reportingEndpointIpAddr, rhs.reportingEndpointIpAddr).append(appProtocolVersion, rhs.appProtocolVersion).append(msisdn, rhs.msisdn).append(tunnelId, rhs.tunnelId).append(imei, rhs.imei).append(ipVersion, rhs.ipVersion).append(gtpProtocolType, rhs.gtpProtocolType).append(reportingEndpointPort, rhs.reportingEndpointPort).append(otherEndpointPort, rhs.otherEndpointPort).append(connectionType, rhs.connectionType).append(ecgi, rhs.ecgi).append(gtpVersion, rhs.gtpVersion).append(cid, rhs.cid).append(ipProtocolType, rhs.ipProtocolType).append(mobileFlowFieldsVersion, rhs.mobileFlowFieldsVersion).append(additionalProperties, rhs.additionalProperties).append(imsi, rhs.imsi).append(otherFunctionalRole, rhs.otherFunctionalRole).append(otherEndpointIpAddress, rhs.otherEndpointIpAddress).append(appProtocolType, rhs.appProtocolType).append(rac, rhs.rac).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/NameValuePair.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/NameValuePair.java
deleted file mode 100644
index ec42ccd..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/NameValuePair.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-public class NameValuePair {
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("name", name).append("value", value).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(additionalProperties).append(name).append(value).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof NameValuePair) == false) {
-            return false;
-        }
-        NameValuePair rhs = ((NameValuePair) other);
-        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).append(name, rhs.name).append(value, rhs.value).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ObjectInstance.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ObjectInstance.java
deleted file mode 100644
index e277614..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ObjectInstance.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "objectInstance",
-    "objectInstanceEpochMicrosec",
-    "objectKeys"
-})
-public class ObjectInstance {
-
-    @JsonProperty("objectInstance")
-    private ObjectInstance_ objectInstance;
-    @JsonProperty("objectInstanceEpochMicrosec")
-    private Double objectInstanceEpochMicrosec;
-    @JsonProperty("objectKeys")
-    private List<ObjectKey> objectKeys = null;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("objectInstance")
-    public ObjectInstance_ getObjectInstance() {
-        return objectInstance;
-    }
-
-    @JsonProperty("objectInstance")
-    public void setObjectInstance(ObjectInstance_ objectInstance) {
-        this.objectInstance = objectInstance;
-    }
-
-    @JsonProperty("objectInstanceEpochMicrosec")
-    public Double getObjectInstanceEpochMicrosec() {
-        return objectInstanceEpochMicrosec;
-    }
-
-    @JsonProperty("objectInstanceEpochMicrosec")
-    public void setObjectInstanceEpochMicrosec(Double objectInstanceEpochMicrosec) {
-        this.objectInstanceEpochMicrosec = objectInstanceEpochMicrosec;
-    }
-
-    @JsonProperty("objectKeys")
-    public List<ObjectKey> getObjectKeys() {
-        return objectKeys;
-    }
-
-    @JsonProperty("objectKeys")
-    public void setObjectKeys(List<ObjectKey> objectKeys) {
-        this.objectKeys = objectKeys;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("objectInstance", objectInstance).append("objectInstanceEpochMicrosec", objectInstanceEpochMicrosec).append("objectKeys", objectKeys).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(objectInstanceEpochMicrosec).append(additionalProperties).append(objectInstance).append(objectKeys).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof ObjectInstance) == false) {
-            return false;
-        }
-        ObjectInstance rhs = ((ObjectInstance) other);
-        return new EqualsBuilder().append(objectInstanceEpochMicrosec, rhs.objectInstanceEpochMicrosec).append(additionalProperties, rhs.additionalProperties).append(objectInstance, rhs.objectInstance).append(objectKeys, rhs.objectKeys).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/OtherFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/OtherFields.java
deleted file mode 100644
index d5d01ff..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/OtherFields.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "otherFieldsVersion",
-    "hashOfNameValuePairArrays",
-    "jsonObjects",
-    "nameValuePairs"
-})
-public class OtherFields {
-
-    @JsonProperty("otherFieldsVersion")
-    private Double otherFieldsVersion;
-    @JsonProperty("hashOfNameValuePairArrays")
-    private List<HashOfNameValuePairArray> hashOfNameValuePairArrays = null;
-    @JsonProperty("jsonObjects")
-    private List<JsonObject> jsonObjects = null;
-    @JsonProperty("nameValuePairs")
-    private List<NameValuePair> nameValuePairs = null;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("otherFieldsVersion")
-    public Double getOtherFieldsVersion() {
-        return otherFieldsVersion;
-    }
-
-    @JsonProperty("otherFieldsVersion")
-    public void setOtherFieldsVersion(Double otherFieldsVersion) {
-        this.otherFieldsVersion = otherFieldsVersion;
-    }
-
-    @JsonProperty("hashOfNameValuePairArrays")
-    public List<HashOfNameValuePairArray> getHashOfNameValuePairArrays() {
-        return hashOfNameValuePairArrays;
-    }
-
-    @JsonProperty("hashOfNameValuePairArrays")
-    public void setHashOfNameValuePairArrays(List<HashOfNameValuePairArray> hashOfNameValuePairArrays) {
-        this.hashOfNameValuePairArrays = hashOfNameValuePairArrays;
-    }
-
-    @JsonProperty("jsonObjects")
-    public List<JsonObject> getJsonObjects() {
-        return jsonObjects;
-    }
-
-    @JsonProperty("jsonObjects")
-    public void setJsonObjects(List<JsonObject> jsonObjects) {
-        this.jsonObjects = jsonObjects;
-    }
-
-    @JsonProperty("nameValuePairs")
-    public List<NameValuePair> getNameValuePairs() {
-        return nameValuePairs;
-    }
-
-    @JsonProperty("nameValuePairs")
-    public void setNameValuePairs(List<NameValuePair> nameValuePairs) {
-        this.nameValuePairs = nameValuePairs;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("otherFieldsVersion", otherFieldsVersion).append("hashOfNameValuePairArrays", hashOfNameValuePairArrays).append("jsonObjects", jsonObjects).append("nameValuePairs", nameValuePairs).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(nameValuePairs).append(hashOfNameValuePairArrays).append(additionalProperties).append(jsonObjects).append(otherFieldsVersion).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof OtherFields) == false) {
-            return false;
-        }
-        OtherFields rhs = ((OtherFields) other);
-        return new EqualsBuilder().append(nameValuePairs, rhs.nameValuePairs).append(hashOfNameValuePairArrays, rhs.hashOfNameValuePairArrays).append(additionalProperties, rhs.additionalProperties).append(jsonObjects, rhs.jsonObjects).append(otherFieldsVersion, rhs.otherFieldsVersion).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/SipSignalingFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/SipSignalingFields.java
deleted file mode 100644
index 2eb2b6a..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/SipSignalingFields.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "correlator",
-    "localIpAddress",
-    "localPort",
-    "remoteIpAddress",
-    "remotePort",
-    "sipSignalingFieldsVersion",
-    "vendorVnfNameFields",
-    "additionalInformation",
-    "compressedSip",
-    "summarySip"
-})
-public class SipSignalingFields {
-
-    @JsonProperty("correlator")
-    private String correlator;
-    @JsonProperty("localIpAddress")
-    private String localIpAddress;
-    @JsonProperty("localPort")
-    private String localPort;
-    @JsonProperty("remoteIpAddress")
-    private String remoteIpAddress;
-    @JsonProperty("remotePort")
-    private String remotePort;
-    @JsonProperty("sipSignalingFieldsVersion")
-    private Double sipSignalingFieldsVersion;
-    @JsonProperty("vendorVnfNameFields")
-    private VendorVnfNameFields vendorVnfNameFields;
-    @JsonProperty("additionalInformation")
-    private List<AdditionalInformation> additionalInformation = null;
-    @JsonProperty("compressedSip")
-    private String compressedSip;
-    @JsonProperty("summarySip")
-    private String summarySip;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("correlator")
-    public String getCorrelator() {
-        return correlator;
-    }
-
-    @JsonProperty("correlator")
-    public void setCorrelator(String correlator) {
-        this.correlator = correlator;
-    }
-
-    @JsonProperty("localIpAddress")
-    public String getLocalIpAddress() {
-        return localIpAddress;
-    }
-
-    @JsonProperty("localIpAddress")
-    public void setLocalIpAddress(String localIpAddress) {
-        this.localIpAddress = localIpAddress;
-    }
-
-    @JsonProperty("localPort")
-    public String getLocalPort() {
-        return localPort;
-    }
-
-    @JsonProperty("localPort")
-    public void setLocalPort(String localPort) {
-        this.localPort = localPort;
-    }
-
-    @JsonProperty("remoteIpAddress")
-    public String getRemoteIpAddress() {
-        return remoteIpAddress;
-    }
-
-    @JsonProperty("remoteIpAddress")
-    public void setRemoteIpAddress(String remoteIpAddress) {
-        this.remoteIpAddress = remoteIpAddress;
-    }
-
-    @JsonProperty("remotePort")
-    public String getRemotePort() {
-        return remotePort;
-    }
-
-    @JsonProperty("remotePort")
-    public void setRemotePort(String remotePort) {
-        this.remotePort = remotePort;
-    }
-
-    @JsonProperty("sipSignalingFieldsVersion")
-    public Double getSipSignalingFieldsVersion() {
-        return sipSignalingFieldsVersion;
-    }
-
-    @JsonProperty("sipSignalingFieldsVersion")
-    public void setSipSignalingFieldsVersion(Double sipSignalingFieldsVersion) {
-        this.sipSignalingFieldsVersion = sipSignalingFieldsVersion;
-    }
-
-    @JsonProperty("vendorVnfNameFields")
-    public VendorVnfNameFields getVendorVnfNameFields() {
-        return vendorVnfNameFields;
-    }
-
-    @JsonProperty("vendorVnfNameFields")
-    public void setVendorVnfNameFields(VendorVnfNameFields vendorVnfNameFields) {
-        this.vendorVnfNameFields = vendorVnfNameFields;
-    }
-
-    @JsonProperty("additionalInformation")
-    public List<AdditionalInformation> getAdditionalInformation() {
-        return additionalInformation;
-    }
-
-    @JsonProperty("additionalInformation")
-    public void setAdditionalInformation(List<AdditionalInformation> additionalInformation) {
-        this.additionalInformation = additionalInformation;
-    }
-
-    @JsonProperty("compressedSip")
-    public String getCompressedSip() {
-        return compressedSip;
-    }
-
-    @JsonProperty("compressedSip")
-    public void setCompressedSip(String compressedSip) {
-        this.compressedSip = compressedSip;
-    }
-
-    @JsonProperty("summarySip")
-    public String getSummarySip() {
-        return summarySip;
-    }
-
-    @JsonProperty("summarySip")
-    public void setSummarySip(String summarySip) {
-        this.summarySip = summarySip;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("correlator", correlator).append("localIpAddress", localIpAddress).append("localPort", localPort).append("remoteIpAddress", remoteIpAddress).append("remotePort", remotePort).append("sipSignalingFieldsVersion", sipSignalingFieldsVersion).append("vendorVnfNameFields", vendorVnfNameFields).append("additionalInformation", additionalInformation).append("compressedSip", compressedSip).append("summarySip", summarySip).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(vendorVnfNameFields).append(correlator).append(additionalProperties).append(remoteIpAddress).append(sipSignalingFieldsVersion).append(localIpAddress).append(summarySip).append(remotePort).append(localPort).append(additionalInformation).append(compressedSip).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof SipSignalingFields) == false) {
-            return false;
-        }
-        SipSignalingFields rhs = ((SipSignalingFields) other);
-        return new EqualsBuilder().append(vendorVnfNameFields, rhs.vendorVnfNameFields).append(correlator, rhs.correlator).append(additionalProperties, rhs.additionalProperties).append(remoteIpAddress, rhs.remoteIpAddress).append(sipSignalingFieldsVersion, rhs.sipSignalingFieldsVersion).append(localIpAddress, rhs.localIpAddress).append(summarySip, rhs.summarySip).append(remotePort, rhs.remotePort).append(localPort, rhs.localPort).append(additionalInformation, rhs.additionalInformation).append(compressedSip, rhs.compressedSip).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/StateChangeFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/StateChangeFields.java
deleted file mode 100644
index 993b75b..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/StateChangeFields.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.onap.dcaegen2.ves.domain.AdditionalField;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "newState",
-    "oldState",
-    "stateChangeFieldsVersion",
-    "stateInterface",
-    "additionalFields"
-})
-public class StateChangeFields {
-
-    @JsonProperty("newState")
-    private String newState;
-    @JsonProperty("oldState")
-    private String oldState;
-    @JsonProperty("stateChangeFieldsVersion")
-    private Double stateChangeFieldsVersion;
-    @JsonProperty("stateInterface")
-    private String stateInterface;
-    @JsonProperty("additionalFields")
-    private List<AdditionalField> additionalFields = null;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("newState")
-    public String getNewState() {
-        return newState;
-    }
-
-    @JsonProperty("newState")
-    public void setNewState(String newState) {
-        this.newState = newState;
-    }
-
-    @JsonProperty("oldState")
-    public String getOldState() {
-        return oldState;
-    }
-
-    @JsonProperty("oldState")
-    public void setOldState(String oldState) {
-        this.oldState = oldState;
-    }
-
-    @JsonProperty("stateChangeFieldsVersion")
-    public Double getStateChangeFieldsVersion() {
-        return stateChangeFieldsVersion;
-    }
-
-    @JsonProperty("stateChangeFieldsVersion")
-    public void setStateChangeFieldsVersion(Double stateChangeFieldsVersion) {
-        this.stateChangeFieldsVersion = stateChangeFieldsVersion;
-    }
-
-    @JsonProperty("stateInterface")
-    public String getStateInterface() {
-        return stateInterface;
-    }
-
-    @JsonProperty("stateInterface")
-    public void setStateInterface(String stateInterface) {
-        this.stateInterface = stateInterface;
-    }
-
-    @JsonProperty("additionalFields")
-    public List<AdditionalField> getAdditionalFields() {
-        return additionalFields;
-    }
-
-    @JsonProperty("additionalFields")
-    public void setAdditionalFields(List<AdditionalField> additionalFields) {
-        this.additionalFields = additionalFields;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("newState", newState).append("oldState", oldState).append("stateChangeFieldsVersion", stateChangeFieldsVersion).append("stateInterface", stateInterface).append("additionalFields", additionalFields).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(oldState).append(stateInterface).append(additionalProperties).append(additionalFields).append(stateChangeFieldsVersion).append(newState).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof StateChangeFields) == false) {
-            return false;
-        }
-        StateChangeFields rhs = ((StateChangeFields) other);
-        return new EqualsBuilder().append(oldState, rhs.oldState).append(stateInterface, rhs.stateInterface).append(additionalProperties, rhs.additionalProperties).append(additionalFields, rhs.additionalFields).append(stateChangeFieldsVersion, rhs.stateChangeFieldsVersion).append(newState, rhs.newState).isEquals();
-    }
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/SyslogFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/SyslogFields.java
deleted file mode 100644
index 7ce1a21..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/SyslogFields.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "eventSourceType",
-    "syslogFieldsVersion",
-    "syslogMsg",
-    "syslogTag",
-    "additionalFields",
-    "eventSourceHost",
-    "syslogFacility",
-    "syslogPri",
-    "syslogProc",
-    "syslogProcId",
-    "syslogSData",
-    "syslogSdId",
-    "syslogSev",
-    "syslogVer"
-})
-public class SyslogFields {
-
-    @JsonProperty("eventSourceType")
-    private String eventSourceType;
-    @JsonProperty("syslogFieldsVersion")
-    private Double syslogFieldsVersion;
-    @JsonProperty("syslogMsg")
-    private String syslogMsg;
-    @JsonProperty("syslogTag")
-    private String syslogTag;
-    @JsonProperty("additionalFields")
-    private String additionalFields;
-    @JsonProperty("eventSourceHost")
-    private String eventSourceHost;
-    @JsonProperty("syslogFacility")
-    private Long syslogFacility;
-    @JsonProperty("syslogPri")
-    private Long syslogPri;
-    @JsonProperty("syslogProc")
-    private String syslogProc;
-    @JsonProperty("syslogProcId")
-    private Double syslogProcId;
-    @JsonProperty("syslogSData")
-    private String syslogSData;
-    @JsonProperty("syslogSdId")
-    private String syslogSdId;
-    @JsonProperty("syslogSev")
-    private String syslogSev;
-    @JsonProperty("syslogVer")
-    private Double syslogVer;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("eventSourceType")
-    public String getEventSourceType() {
-        return eventSourceType;
-    }
-
-    @JsonProperty("eventSourceType")
-    public void setEventSourceType(String eventSourceType) {
-        this.eventSourceType = eventSourceType;
-    }
-
-    @JsonProperty("syslogFieldsVersion")
-    public Double getSyslogFieldsVersion() {
-        return syslogFieldsVersion;
-    }
-
-    @JsonProperty("syslogFieldsVersion")
-    public void setSyslogFieldsVersion(Double syslogFieldsVersion) {
-        this.syslogFieldsVersion = syslogFieldsVersion;
-    }
-
-    @JsonProperty("syslogMsg")
-    public String getSyslogMsg() {
-        return syslogMsg;
-    }
-
-    @JsonProperty("syslogMsg")
-    public void setSyslogMsg(String syslogMsg) {
-        this.syslogMsg = syslogMsg;
-    }
-
-    @JsonProperty("syslogTag")
-    public String getSyslogTag() {
-        return syslogTag;
-    }
-
-    @JsonProperty("syslogTag")
-    public void setSyslogTag(String syslogTag) {
-        this.syslogTag = syslogTag;
-    }
-
-    @JsonProperty("additionalFields")
-    public String getAdditionalFields() {
-        return additionalFields;
-    }
-
-    @JsonProperty("additionalFields")
-    public void setAdditionalFields(String additionalFields) {
-        this.additionalFields = additionalFields;
-    }
-
-    @JsonProperty("eventSourceHost")
-    public String getEventSourceHost() {
-        return eventSourceHost;
-    }
-
-    @JsonProperty("eventSourceHost")
-    public void setEventSourceHost(String eventSourceHost) {
-        this.eventSourceHost = eventSourceHost;
-    }
-
-    @JsonProperty("syslogFacility")
-    public Long getSyslogFacility() {
-        return syslogFacility;
-    }
-
-    @JsonProperty("syslogFacility")
-    public void setSyslogFacility(Long syslogFacility) {
-        this.syslogFacility = syslogFacility;
-    }
-
-    @JsonProperty("syslogPri")
-    public Long getSyslogPri() {
-        return syslogPri;
-    }
-
-    @JsonProperty("syslogPri")
-    public void setSyslogPri(Long syslogPri) {
-        this.syslogPri = syslogPri;
-    }
-
-    @JsonProperty("syslogProc")
-    public String getSyslogProc() {
-        return syslogProc;
-    }
-
-    @JsonProperty("syslogProc")
-    public void setSyslogProc(String syslogProc) {
-        this.syslogProc = syslogProc;
-    }
-
-    @JsonProperty("syslogProcId")
-    public Double getSyslogProcId() {
-        return syslogProcId;
-    }
-
-    @JsonProperty("syslogProcId")
-    public void setSyslogProcId(Double syslogProcId) {
-        this.syslogProcId = syslogProcId;
-    }
-
-    @JsonProperty("syslogSData")
-    public String getSyslogSData() {
-        return syslogSData;
-    }
-
-    @JsonProperty("syslogSData")
-    public void setSyslogSData(String syslogSData) {
-        this.syslogSData = syslogSData;
-    }
-
-    @JsonProperty("syslogSdId")
-    public String getSyslogSdId() {
-        return syslogSdId;
-    }
-
-    @JsonProperty("syslogSdId")
-    public void setSyslogSdId(String syslogSdId) {
-        this.syslogSdId = syslogSdId;
-    }
-
-    @JsonProperty("syslogSev")
-    public String getSyslogSev() {
-        return syslogSev;
-    }
-
-    @JsonProperty("syslogSev")
-    public void setSyslogSev(String syslogSev) {
-        this.syslogSev = syslogSev;
-    }
-
-    @JsonProperty("syslogVer")
-    public Double getSyslogVer() {
-        return syslogVer;
-    }
-
-    @JsonProperty("syslogVer")
-    public void setSyslogVer(Double syslogVer) {
-        this.syslogVer = syslogVer;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-   
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ThresholdCrossingAlertFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ThresholdCrossingAlertFields.java
deleted file mode 100644
index 3c42955..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ThresholdCrossingAlertFields.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "additionalParameters",
-    "alertAction",
-    "alertDescription",
-    "alertType",
-    "collectionTimestamp",
-    "eventSeverity",
-    "eventStartTimestamp",
-    "thresholdCrossingFieldsVersion",
-    "additionalFields",
-    "alertValue",
-    "associatedAlertIdList",
-    "dataCollector",
-    "elementType",
-    "interfaceName",
-    "networkService",
-    "possibleRootCause"
-})
-public class ThresholdCrossingAlertFields {
-
-    @JsonProperty("additionalParameters")
-    private List<AdditionalParameter> additionalParameters = null;
-    @JsonProperty("alertAction")
-    private String alertAction;
-    @JsonProperty("alertDescription")
-    private String alertDescription;
-    @JsonProperty("alertType")
-    private String alertType;
-    @JsonProperty("collectionTimestamp")
-    private String collectionTimestamp;
-    @JsonProperty("eventSeverity")
-    private String eventSeverity;
-    @JsonProperty("eventStartTimestamp")
-    private String eventStartTimestamp;
-    @JsonProperty("thresholdCrossingFieldsVersion")
-    private Double thresholdCrossingFieldsVersion;
-    @JsonProperty("additionalFields")
-    private List<AdditionalField> additionalFields = null;
-    @JsonProperty("alertValue")
-    private String alertValue;
-    @JsonProperty("associatedAlertIdList")
-    private List<String> associatedAlertIdList = null;
-    @JsonProperty("dataCollector")
-    private String dataCollector;
-    @JsonProperty("elementType")
-    private String elementType;
-    @JsonProperty("interfaceName")
-    private String interfaceName;
-    @JsonProperty("networkService")
-    private String networkService;
-    @JsonProperty("possibleRootCause")
-    private String possibleRootCause;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("additionalParameters")
-    public List<AdditionalParameter> getAdditionalParameters() {
-        return additionalParameters;
-    }
-
-    @JsonProperty("additionalParameters")
-    public void setAdditionalParameters(List<AdditionalParameter> additionalParameters) {
-        this.additionalParameters = additionalParameters;
-    }
-
-    @JsonProperty("alertAction")
-    public String getAlertAction() {
-        return alertAction;
-    }
-
-    @JsonProperty("alertAction")
-    public void setAlertAction(String alertAction) {
-        this.alertAction = alertAction;
-    }
-
-    @JsonProperty("alertDescription")
-    public String getAlertDescription() {
-        return alertDescription;
-    }
-
-    @JsonProperty("alertDescription")
-    public void setAlertDescription(String alertDescription) {
-        this.alertDescription = alertDescription;
-    }
-
-    @JsonProperty("alertType")
-    public String getAlertType() {
-        return alertType;
-    }
-
-    @JsonProperty("alertType")
-    public void setAlertType(String alertType) {
-        this.alertType = alertType;
-    }
-
-    @JsonProperty("collectionTimestamp")
-    public String getCollectionTimestamp() {
-        return collectionTimestamp;
-    }
-
-    @JsonProperty("collectionTimestamp")
-    public void setCollectionTimestamp(String collectionTimestamp) {
-        this.collectionTimestamp = collectionTimestamp;
-    }
-
-    @JsonProperty("eventSeverity")
-    public String getEventSeverity() {
-        return eventSeverity;
-    }
-
-    @JsonProperty("eventSeverity")
-    public void setEventSeverity(String eventSeverity) {
-        this.eventSeverity = eventSeverity;
-    }
-
-    @JsonProperty("eventStartTimestamp")
-    public String getEventStartTimestamp() {
-        return eventStartTimestamp;
-    }
-
-    @JsonProperty("eventStartTimestamp")
-    public void setEventStartTimestamp(String eventStartTimestamp) {
-        this.eventStartTimestamp = eventStartTimestamp;
-    }
-
-    @JsonProperty("thresholdCrossingFieldsVersion")
-    public Double getThresholdCrossingFieldsVersion() {
-        return thresholdCrossingFieldsVersion;
-    }
-
-    @JsonProperty("thresholdCrossingFieldsVersion")
-    public void setThresholdCrossingFieldsVersion(Double thresholdCrossingFieldsVersion) {
-        this.thresholdCrossingFieldsVersion = thresholdCrossingFieldsVersion;
-    }
-
-    @JsonProperty("additionalFields")
-    public List<AdditionalField> getAdditionalFields() {
-        return additionalFields;
-    }
-
-    @JsonProperty("additionalFields")
-    public void setAdditionalFields(List<AdditionalField> additionalFields) {
-        this.additionalFields = additionalFields;
-    }
-
-    @JsonProperty("alertValue")
-    public String getAlertValue() {
-        return alertValue;
-    }
-
-    @JsonProperty("alertValue")
-    public void setAlertValue(String alertValue) {
-        this.alertValue = alertValue;
-    }
-
-    @JsonProperty("associatedAlertIdList")
-    public List<String> getAssociatedAlertIdList() {
-        return associatedAlertIdList;
-    }
-
-    @JsonProperty("associatedAlertIdList")
-    public void setAssociatedAlertIdList(List<String> associatedAlertIdList) {
-        this.associatedAlertIdList = associatedAlertIdList;
-    }
-
-    @JsonProperty("dataCollector")
-    public String getDataCollector() {
-        return dataCollector;
-    }
-
-    @JsonProperty("dataCollector")
-    public void setDataCollector(String dataCollector) {
-        this.dataCollector = dataCollector;
-    }
-
-    @JsonProperty("elementType")
-    public String getElementType() {
-        return elementType;
-    }
-
-    @JsonProperty("elementType")
-    public void setElementType(String elementType) {
-        this.elementType = elementType;
-    }
-
-    @JsonProperty("interfaceName")
-    public String getInterfaceName() {
-        return interfaceName;
-    }
-
-    @JsonProperty("interfaceName")
-    public void setInterfaceName(String interfaceName) {
-        this.interfaceName = interfaceName;
-    }
-
-    @JsonProperty("networkService")
-    public String getNetworkService() {
-        return networkService;
-    }
-
-    @JsonProperty("networkService")
-    public void setNetworkService(String networkService) {
-        this.networkService = networkService;
-    }
-
-    @JsonProperty("possibleRootCause")
-    public String getPossibleRootCause() {
-        return possibleRootCause;
-    }
-
-    @JsonProperty("possibleRootCause")
-    public void setPossibleRootCause(String possibleRootCause) {
-        this.possibleRootCause = possibleRootCause;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VNicPerformanceArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VNicPerformanceArray.java
deleted file mode 100644
index 70415b4..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VNicPerformanceArray.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "valuesAreSuspect",
-    "vNicIdentifier",
-    "receivedBroadcastPacketsAccumulated",
-    "receivedBroadcastPacketsDelta",
-    "receivedDiscardedPacketsAccumulated",
-    "receivedDiscardedPacketsDelta",
-    "receivedErrorPacketsAccumulated",
-    "receivedErrorPacketsDelta",
-    "receivedMulticastPacketsAccumulated",
-    "receivedMulticastPacketsDelta",
-    "receivedOctetsAccumulated",
-    "receivedOctetsDelta",
-    "receivedTotalPacketsAccumulated",
-    "receivedTotalPacketsDelta",
-    "receivedUnicastPacketsAccumulated",
-    "receivedUnicastPacketsDelta",
-    "transmittedBroadcastPacketsAccumulated",
-    "transmittedBroadcastPacketsDelta",
-    "transmittedDiscardedPacketsAccumulated",
-    "transmittedDiscardedPacketsDelta",
-    "transmittedErrorPacketsAccumulated",
-    "transmittedErrorPacketsDelta",
-    "transmittedMulticastPacketsAccumulated",
-    "transmittedMulticastPacketsDelta",
-    "transmittedOctetsAccumulated",
-    "transmittedOctetsDelta",
-    "transmittedTotalPacketsAccumulated",
-    "transmittedTotalPacketsDelta",
-    "transmittedUnicastPacketsAccumulated",
-    "transmittedUnicastPacketsDelta"
-})
-public class VNicPerformanceArray {
-
-    @JsonProperty("valuesAreSuspect")
-    private String valuesAreSuspect;
-    @JsonProperty("vNicIdentifier")
-    private String vNicIdentifier;
-    @JsonProperty("receivedBroadcastPacketsAccumulated")
-    private Double receivedBroadcastPacketsAccumulated;
-    @JsonProperty("receivedBroadcastPacketsDelta")
-    private Double receivedBroadcastPacketsDelta;
-    @JsonProperty("receivedDiscardedPacketsAccumulated")
-    private Double receivedDiscardedPacketsAccumulated;
-    @JsonProperty("receivedDiscardedPacketsDelta")
-    private Double receivedDiscardedPacketsDelta;
-    @JsonProperty("receivedErrorPacketsAccumulated")
-    private Double receivedErrorPacketsAccumulated;
-    @JsonProperty("receivedErrorPacketsDelta")
-    private Double receivedErrorPacketsDelta;
-    @JsonProperty("receivedMulticastPacketsAccumulated")
-    private Double receivedMulticastPacketsAccumulated;
-    @JsonProperty("receivedMulticastPacketsDelta")
-    private Double receivedMulticastPacketsDelta;
-    @JsonProperty("receivedOctetsAccumulated")
-    private Double receivedOctetsAccumulated;
-    @JsonProperty("receivedOctetsDelta")
-    private Double receivedOctetsDelta;
-    @JsonProperty("receivedTotalPacketsAccumulated")
-    private Double receivedTotalPacketsAccumulated;
-    @JsonProperty("receivedTotalPacketsDelta")
-    private Double receivedTotalPacketsDelta;
-    @JsonProperty("receivedUnicastPacketsAccumulated")
-    private Double receivedUnicastPacketsAccumulated;
-    @JsonProperty("receivedUnicastPacketsDelta")
-    private Double receivedUnicastPacketsDelta;
-    @JsonProperty("transmittedBroadcastPacketsAccumulated")
-    private Double transmittedBroadcastPacketsAccumulated;
-    @JsonProperty("transmittedBroadcastPacketsDelta")
-    private Double transmittedBroadcastPacketsDelta;
-    @JsonProperty("transmittedDiscardedPacketsAccumulated")
-    private Double transmittedDiscardedPacketsAccumulated;
-    @JsonProperty("transmittedDiscardedPacketsDelta")
-    private Double transmittedDiscardedPacketsDelta;
-    @JsonProperty("transmittedErrorPacketsAccumulated")
-    private Double transmittedErrorPacketsAccumulated;
-    @JsonProperty("transmittedErrorPacketsDelta")
-    private Double transmittedErrorPacketsDelta;
-    @JsonProperty("transmittedMulticastPacketsAccumulated")
-    private Double transmittedMulticastPacketsAccumulated;
-    @JsonProperty("transmittedMulticastPacketsDelta")
-    private Double transmittedMulticastPacketsDelta;
-    @JsonProperty("transmittedOctetsAccumulated")
-    private Double transmittedOctetsAccumulated;
-    @JsonProperty("transmittedOctetsDelta")
-    private Double transmittedOctetsDelta;
-    @JsonProperty("transmittedTotalPacketsAccumulated")
-    private Double transmittedTotalPacketsAccumulated;
-    @JsonProperty("transmittedTotalPacketsDelta")
-    private Double transmittedTotalPacketsDelta;
-    @JsonProperty("transmittedUnicastPacketsAccumulated")
-    private Double transmittedUnicastPacketsAccumulated;
-    @JsonProperty("transmittedUnicastPacketsDelta")
-    private Double transmittedUnicastPacketsDelta;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("valuesAreSuspect")
-    public String getValuesAreSuspect() {
-        return valuesAreSuspect;
-    }
-
-    @JsonProperty("valuesAreSuspect")
-    public void setValuesAreSuspect(String valuesAreSuspect) {
-        this.valuesAreSuspect = valuesAreSuspect;
-    }
-
-    @JsonProperty("vNicIdentifier")
-    public String getVNicIdentifier() {
-        return vNicIdentifier;
-    }
-
-    @JsonProperty("vNicIdentifier")
-    public void setVNicIdentifier(String vNicIdentifier) {
-        this.vNicIdentifier = vNicIdentifier;
-    }
-
-    @JsonProperty("receivedBroadcastPacketsAccumulated")
-    public Double getReceivedBroadcastPacketsAccumulated() {
-        return receivedBroadcastPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedBroadcastPacketsAccumulated")
-    public void setReceivedBroadcastPacketsAccumulated(Double receivedBroadcastPacketsAccumulated) {
-        this.receivedBroadcastPacketsAccumulated = receivedBroadcastPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedBroadcastPacketsDelta")
-    public Double getReceivedBroadcastPacketsDelta() {
-        return receivedBroadcastPacketsDelta;
-    }
-
-    @JsonProperty("receivedBroadcastPacketsDelta")
-    public void setReceivedBroadcastPacketsDelta(Double receivedBroadcastPacketsDelta) {
-        this.receivedBroadcastPacketsDelta = receivedBroadcastPacketsDelta;
-    }
-
-    @JsonProperty("receivedDiscardedPacketsAccumulated")
-    public Double getReceivedDiscardedPacketsAccumulated() {
-        return receivedDiscardedPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedDiscardedPacketsAccumulated")
-    public void setReceivedDiscardedPacketsAccumulated(Double receivedDiscardedPacketsAccumulated) {
-        this.receivedDiscardedPacketsAccumulated = receivedDiscardedPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedDiscardedPacketsDelta")
-    public Double getReceivedDiscardedPacketsDelta() {
-        return receivedDiscardedPacketsDelta;
-    }
-
-    @JsonProperty("receivedDiscardedPacketsDelta")
-    public void setReceivedDiscardedPacketsDelta(Double receivedDiscardedPacketsDelta) {
-        this.receivedDiscardedPacketsDelta = receivedDiscardedPacketsDelta;
-    }
-
-    @JsonProperty("receivedErrorPacketsAccumulated")
-    public Double getReceivedErrorPacketsAccumulated() {
-        return receivedErrorPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedErrorPacketsAccumulated")
-    public void setReceivedErrorPacketsAccumulated(Double receivedErrorPacketsAccumulated) {
-        this.receivedErrorPacketsAccumulated = receivedErrorPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedErrorPacketsDelta")
-    public Double getReceivedErrorPacketsDelta() {
-        return receivedErrorPacketsDelta;
-    }
-
-    @JsonProperty("receivedErrorPacketsDelta")
-    public void setReceivedErrorPacketsDelta(Double receivedErrorPacketsDelta) {
-        this.receivedErrorPacketsDelta = receivedErrorPacketsDelta;
-    }
-
-    @JsonProperty("receivedMulticastPacketsAccumulated")
-    public Double getReceivedMulticastPacketsAccumulated() {
-        return receivedMulticastPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedMulticastPacketsAccumulated")
-    public void setReceivedMulticastPacketsAccumulated(Double receivedMulticastPacketsAccumulated) {
-        this.receivedMulticastPacketsAccumulated = receivedMulticastPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedMulticastPacketsDelta")
-    public Double getReceivedMulticastPacketsDelta() {
-        return receivedMulticastPacketsDelta;
-    }
-
-    @JsonProperty("receivedMulticastPacketsDelta")
-    public void setReceivedMulticastPacketsDelta(Double receivedMulticastPacketsDelta) {
-        this.receivedMulticastPacketsDelta = receivedMulticastPacketsDelta;
-    }
-
-    @JsonProperty("receivedOctetsAccumulated")
-    public Double getReceivedOctetsAccumulated() {
-        return receivedOctetsAccumulated;
-    }
-
-    @JsonProperty("receivedOctetsAccumulated")
-    public void setReceivedOctetsAccumulated(Double receivedOctetsAccumulated) {
-        this.receivedOctetsAccumulated = receivedOctetsAccumulated;
-    }
-
-    @JsonProperty("receivedOctetsDelta")
-    public Double getReceivedOctetsDelta() {
-        return receivedOctetsDelta;
-    }
-
-    @JsonProperty("receivedOctetsDelta")
-    public void setReceivedOctetsDelta(Double receivedOctetsDelta) {
-        this.receivedOctetsDelta = receivedOctetsDelta;
-    }
-
-    @JsonProperty("receivedTotalPacketsAccumulated")
-    public Double getReceivedTotalPacketsAccumulated() {
-        return receivedTotalPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedTotalPacketsAccumulated")
-    public void setReceivedTotalPacketsAccumulated(Double receivedTotalPacketsAccumulated) {
-        this.receivedTotalPacketsAccumulated = receivedTotalPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedTotalPacketsDelta")
-    public Double getReceivedTotalPacketsDelta() {
-        return receivedTotalPacketsDelta;
-    }
-
-    @JsonProperty("receivedTotalPacketsDelta")
-    public void setReceivedTotalPacketsDelta(Double receivedTotalPacketsDelta) {
-        this.receivedTotalPacketsDelta = receivedTotalPacketsDelta;
-    }
-
-    @JsonProperty("receivedUnicastPacketsAccumulated")
-    public Double getReceivedUnicastPacketsAccumulated() {
-        return receivedUnicastPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedUnicastPacketsAccumulated")
-    public void setReceivedUnicastPacketsAccumulated(Double receivedUnicastPacketsAccumulated) {
-        this.receivedUnicastPacketsAccumulated = receivedUnicastPacketsAccumulated;
-    }
-
-    @JsonProperty("receivedUnicastPacketsDelta")
-    public Double getReceivedUnicastPacketsDelta() {
-        return receivedUnicastPacketsDelta;
-    }
-
-    @JsonProperty("receivedUnicastPacketsDelta")
-    public void setReceivedUnicastPacketsDelta(Double receivedUnicastPacketsDelta) {
-        this.receivedUnicastPacketsDelta = receivedUnicastPacketsDelta;
-    }
-
-    @JsonProperty("transmittedBroadcastPacketsAccumulated")
-    public Double getTransmittedBroadcastPacketsAccumulated() {
-        return transmittedBroadcastPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedBroadcastPacketsAccumulated")
-    public void setTransmittedBroadcastPacketsAccumulated(Double transmittedBroadcastPacketsAccumulated) {
-        this.transmittedBroadcastPacketsAccumulated = transmittedBroadcastPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedBroadcastPacketsDelta")
-    public Double getTransmittedBroadcastPacketsDelta() {
-        return transmittedBroadcastPacketsDelta;
-    }
-
-    @JsonProperty("transmittedBroadcastPacketsDelta")
-    public void setTransmittedBroadcastPacketsDelta(Double transmittedBroadcastPacketsDelta) {
-        this.transmittedBroadcastPacketsDelta = transmittedBroadcastPacketsDelta;
-    }
-
-    @JsonProperty("transmittedDiscardedPacketsAccumulated")
-    public Double getTransmittedDiscardedPacketsAccumulated() {
-        return transmittedDiscardedPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedDiscardedPacketsAccumulated")
-    public void setTransmittedDiscardedPacketsAccumulated(Double transmittedDiscardedPacketsAccumulated) {
-        this.transmittedDiscardedPacketsAccumulated = transmittedDiscardedPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedDiscardedPacketsDelta")
-    public Double getTransmittedDiscardedPacketsDelta() {
-        return transmittedDiscardedPacketsDelta;
-    }
-
-    @JsonProperty("transmittedDiscardedPacketsDelta")
-    public void setTransmittedDiscardedPacketsDelta(Double transmittedDiscardedPacketsDelta) {
-        this.transmittedDiscardedPacketsDelta = transmittedDiscardedPacketsDelta;
-    }
-
-    @JsonProperty("transmittedErrorPacketsAccumulated")
-    public Double getTransmittedErrorPacketsAccumulated() {
-        return transmittedErrorPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedErrorPacketsAccumulated")
-    public void setTransmittedErrorPacketsAccumulated(Double transmittedErrorPacketsAccumulated) {
-        this.transmittedErrorPacketsAccumulated = transmittedErrorPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedErrorPacketsDelta")
-    public Double getTransmittedErrorPacketsDelta() {
-        return transmittedErrorPacketsDelta;
-    }
-
-    @JsonProperty("transmittedErrorPacketsDelta")
-    public void setTransmittedErrorPacketsDelta(Double transmittedErrorPacketsDelta) {
-        this.transmittedErrorPacketsDelta = transmittedErrorPacketsDelta;
-    }
-
-    @JsonProperty("transmittedMulticastPacketsAccumulated")
-    public Double getTransmittedMulticastPacketsAccumulated() {
-        return transmittedMulticastPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedMulticastPacketsAccumulated")
-    public void setTransmittedMulticastPacketsAccumulated(Double transmittedMulticastPacketsAccumulated) {
-        this.transmittedMulticastPacketsAccumulated = transmittedMulticastPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedMulticastPacketsDelta")
-    public Double getTransmittedMulticastPacketsDelta() {
-        return transmittedMulticastPacketsDelta;
-    }
-
-    @JsonProperty("transmittedMulticastPacketsDelta")
-    public void setTransmittedMulticastPacketsDelta(Double transmittedMulticastPacketsDelta) {
-        this.transmittedMulticastPacketsDelta = transmittedMulticastPacketsDelta;
-    }
-
-    @JsonProperty("transmittedOctetsAccumulated")
-    public Double getTransmittedOctetsAccumulated() {
-        return transmittedOctetsAccumulated;
-    }
-
-    @JsonProperty("transmittedOctetsAccumulated")
-    public void setTransmittedOctetsAccumulated(Double transmittedOctetsAccumulated) {
-        this.transmittedOctetsAccumulated = transmittedOctetsAccumulated;
-    }
-
-    @JsonProperty("transmittedOctetsDelta")
-    public Double getTransmittedOctetsDelta() {
-        return transmittedOctetsDelta;
-    }
-
-    @JsonProperty("transmittedOctetsDelta")
-    public void setTransmittedOctetsDelta(Double transmittedOctetsDelta) {
-        this.transmittedOctetsDelta = transmittedOctetsDelta;
-    }
-
-    @JsonProperty("transmittedTotalPacketsAccumulated")
-    public Double getTransmittedTotalPacketsAccumulated() {
-        return transmittedTotalPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedTotalPacketsAccumulated")
-    public void setTransmittedTotalPacketsAccumulated(Double transmittedTotalPacketsAccumulated) {
-        this.transmittedTotalPacketsAccumulated = transmittedTotalPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedTotalPacketsDelta")
-    public Double getTransmittedTotalPacketsDelta() {
-        return transmittedTotalPacketsDelta;
-    }
-
-    @JsonProperty("transmittedTotalPacketsDelta")
-    public void setTransmittedTotalPacketsDelta(Double transmittedTotalPacketsDelta) {
-        this.transmittedTotalPacketsDelta = transmittedTotalPacketsDelta;
-    }
-
-    @JsonProperty("transmittedUnicastPacketsAccumulated")
-    public Double getTransmittedUnicastPacketsAccumulated() {
-        return transmittedUnicastPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedUnicastPacketsAccumulated")
-    public void setTransmittedUnicastPacketsAccumulated(Double transmittedUnicastPacketsAccumulated) {
-        this.transmittedUnicastPacketsAccumulated = transmittedUnicastPacketsAccumulated;
-    }
-
-    @JsonProperty("transmittedUnicastPacketsDelta")
-    public Double getTransmittedUnicastPacketsDelta() {
-        return transmittedUnicastPacketsDelta;
-    }
-
-    @JsonProperty("transmittedUnicastPacketsDelta")
-    public void setTransmittedUnicastPacketsDelta(Double transmittedUnicastPacketsDelta) {
-        this.transmittedUnicastPacketsDelta = transmittedUnicastPacketsDelta;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VendorVnfNameFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VendorVnfNameFields.java
deleted file mode 100644
index 518e92e..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VendorVnfNameFields.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "vendorName",
-    "vfModuleName",
-    "vnfName"
-})
-public class VendorVnfNameFields {
-
-    @JsonProperty("vendorName")
-    private String vendorName;
-    @JsonProperty("vfModuleName")
-    private String vfModuleName;
-    @JsonProperty("vnfName")
-    private String vnfName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("vendorName")
-    public String getVendorName() {
-        return vendorName;
-    }
-
-    @JsonProperty("vendorName")
-    public void setVendorName(String vendorName) {
-        this.vendorName = vendorName;
-    }
-
-    @JsonProperty("vfModuleName")
-    public String getVfModuleName() {
-        return vfModuleName;
-    }
-
-    @JsonProperty("vfModuleName")
-    public void setVfModuleName(String vfModuleName) {
-        this.vfModuleName = vfModuleName;
-    }
-
-    @JsonProperty("vnfName")
-    public String getVnfName() {
-        return vnfName;
-    }
-
-    @JsonProperty("vnfName")
-    public void setVnfName(String vnfName) {
-        this.vnfName = vnfName;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-   
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VesEvent.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VesEvent.java
deleted file mode 100644
index 4106943..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VesEvent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "event"
-})
-public class VesEvent {
-
-    @JsonProperty("event")
-    private Event event;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("event")
-    public Event getEvent() {
-        return event;
-    }
-
-    @JsonProperty("event")
-    public void setEvent(Event event) {
-        this.event = event;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-   
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VoiceQualityFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VoiceQualityFields.java
deleted file mode 100644
index 2b3651d..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/VoiceQualityFields.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "calleeSideCodec",
-    "callerSideCodec",
-    "correlator",
-    "midCallRtcp",
-    "vendorVnfNameFields",
-    "voiceQualityFieldsVersion",
-    "additionalInformation",
-    "endOfCallVqmSummaries",
-    "phoneNumber"
-})
-public class VoiceQualityFields {
-
-    @JsonProperty("calleeSideCodec")
-    private String calleeSideCodec;
-    @JsonProperty("callerSideCodec")
-    private String callerSideCodec;
-    @JsonProperty("correlator")
-    private String correlator;
-    @JsonProperty("midCallRtcp")
-    private String midCallRtcp;
-    @JsonProperty("vendorVnfNameFields")
-    private VendorVnfNameFields vendorVnfNameFields;
-    @JsonProperty("voiceQualityFieldsVersion")
-    private Double voiceQualityFieldsVersion;
-    @JsonProperty("additionalInformation")
-    private List<AdditionalInformation> additionalInformation = null;
-    @JsonProperty("endOfCallVqmSummaries")
-    private EndOfCallVqmSummaries endOfCallVqmSummaries;
-    @JsonProperty("phoneNumber")
-    private String phoneNumber;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("calleeSideCodec")
-    public String getCalleeSideCodec() {
-        return calleeSideCodec;
-    }
-
-    @JsonProperty("calleeSideCodec")
-    public void setCalleeSideCodec(String calleeSideCodec) {
-        this.calleeSideCodec = calleeSideCodec;
-    }
-
-    @JsonProperty("callerSideCodec")
-    public String getCallerSideCodec() {
-        return callerSideCodec;
-    }
-
-    @JsonProperty("callerSideCodec")
-    public void setCallerSideCodec(String callerSideCodec) {
-        this.callerSideCodec = callerSideCodec;
-    }
-
-    @JsonProperty("correlator")
-    public String getCorrelator() {
-        return correlator;
-    }
-
-    @JsonProperty("correlator")
-    public void setCorrelator(String correlator) {
-        this.correlator = correlator;
-    }
-
-    @JsonProperty("midCallRtcp")
-    public String getMidCallRtcp() {
-        return midCallRtcp;
-    }
-
-    @JsonProperty("midCallRtcp")
-    public void setMidCallRtcp(String midCallRtcp) {
-        this.midCallRtcp = midCallRtcp;
-    }
-
-    @JsonProperty("vendorVnfNameFields")
-    public VendorVnfNameFields getVendorVnfNameFields() {
-        return vendorVnfNameFields;
-    }
-
-    @JsonProperty("vendorVnfNameFields")
-    public void setVendorVnfNameFields(VendorVnfNameFields vendorVnfNameFields) {
-        this.vendorVnfNameFields = vendorVnfNameFields;
-    }
-
-    @JsonProperty("voiceQualityFieldsVersion")
-    public Double getVoiceQualityFieldsVersion() {
-        return voiceQualityFieldsVersion;
-    }
-
-    @JsonProperty("voiceQualityFieldsVersion")
-    public void setVoiceQualityFieldsVersion(Double voiceQualityFieldsVersion) {
-        this.voiceQualityFieldsVersion = voiceQualityFieldsVersion;
-    }
-
-    @JsonProperty("additionalInformation")
-    public List<AdditionalInformation> getAdditionalInformation() {
-        return additionalInformation;
-    }
-
-    @JsonProperty("additionalInformation")
-    public void setAdditionalInformation(List<AdditionalInformation> additionalInformation) {
-        this.additionalInformation = additionalInformation;
-    }
-
-    @JsonProperty("endOfCallVqmSummaries")
-    public EndOfCallVqmSummaries getEndOfCallVqmSummaries() {
-        return endOfCallVqmSummaries;
-    }
-
-    @JsonProperty("endOfCallVqmSummaries")
-    public void setEndOfCallVqmSummaries(EndOfCallVqmSummaries endOfCallVqmSummaries) {
-        this.endOfCallVqmSummaries = endOfCallVqmSummaries;
-    }
-
-    @JsonProperty("phoneNumber")
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    @JsonProperty("phoneNumber")
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    
-
-}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalInformation.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalMeasurement.java
index 91173f4..b7d3dce 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalInformation.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalMeasurement.java
@@ -1,100 +1,120 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-public class AdditionalInformation {
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("name", name).append("value", value).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(additionalProperties).append(name).append(value).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof AdditionalInformation) == false) {
-            return false;
-        }
-        AdditionalInformation rhs = ((AdditionalInformation) other);
-        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).append(name, rhs.name).append(value, rhs.value).isEquals();
-    }
-
-}
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * a hashMap which is associated with and described by a name

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "name",

+    "hashMap"

+})

+public class AdditionalMeasurement {

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("name")

+    private String name;

+    /**

+     * an associative array which is an array of key:value pairs

+     * (Required)

+     * 

+     */

+    @JsonProperty("hashMap")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation hashMap;

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("name")

+    public String getName() {

+        return name;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("name")

+    public void setName(String name) {

+        this.name = name;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * (Required)

+     * 

+     */

+    @JsonProperty("hashMap")

+    public AlarmAdditionalInformation getHashMap() {

+        return hashMap;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * (Required)

+     * 

+     */

+    @JsonProperty("hashMap")

+    public void setHashMap(AlarmAdditionalInformation hashMap) {

+        this.hashMap = hashMap;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(name).append(hashMap).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof AdditionalMeasurement) == false) {

+            return false;

+        }

+        AdditionalMeasurement rhs = ((AdditionalMeasurement) other);

+        return new EqualsBuilder().append(name, rhs.name).append(hashMap, rhs.hashMap).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalObject.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalObject.java
index b2e2e1f..9b656e2 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalObject.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalObject.java
@@ -1,153 +1,227 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "objectInstances",
-    "objectName",
-    "objectSchema",
-    "objectSchemaUrl",
-    "nfSubscribedObjectName",
-    "nfSubscriptionId"
-})
-public class AdditionalObject {
-
-    @JsonProperty("objectInstances")
-    private List<ObjectInstance> objectInstances = null;
-    @JsonProperty("objectName")
-    private String objectName;
-    @JsonProperty("objectSchema")
-    private String objectSchema;
-    @JsonProperty("objectSchemaUrl")
-    private String objectSchemaUrl;
-    @JsonProperty("nfSubscribedObjectName")
-    private String nfSubscribedObjectName;
-    @JsonProperty("nfSubscriptionId")
-    private String nfSubscriptionId;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("objectInstances")
-    public List<ObjectInstance> getObjectInstances() {
-        return objectInstances;
-    }
-
-    @JsonProperty("objectInstances")
-    public void setObjectInstances(List<ObjectInstance> objectInstances) {
-        this.objectInstances = objectInstances;
-    }
-
-    @JsonProperty("objectName")
-    public String getObjectName() {
-        return objectName;
-    }
-
-    @JsonProperty("objectName")
-    public void setObjectName(String objectName) {
-        this.objectName = objectName;
-    }
-
-    @JsonProperty("objectSchema")
-    public String getObjectSchema() {
-        return objectSchema;
-    }
-
-    @JsonProperty("objectSchema")
-    public void setObjectSchema(String objectSchema) {
-        this.objectSchema = objectSchema;
-    }
-
-    @JsonProperty("objectSchemaUrl")
-    public String getObjectSchemaUrl() {
-        return objectSchemaUrl;
-    }
-
-    @JsonProperty("objectSchemaUrl")
-    public void setObjectSchemaUrl(String objectSchemaUrl) {
-        this.objectSchemaUrl = objectSchemaUrl;
-    }
-
-    @JsonProperty("nfSubscribedObjectName")
-    public String getNfSubscribedObjectName() {
-        return nfSubscribedObjectName;
-    }
-
-    @JsonProperty("nfSubscribedObjectName")
-    public void setNfSubscribedObjectName(String nfSubscribedObjectName) {
-        this.nfSubscribedObjectName = nfSubscribedObjectName;
-    }
-
-    @JsonProperty("nfSubscriptionId")
-    public String getNfSubscriptionId() {
-        return nfSubscriptionId;
-    }
-
-    @JsonProperty("nfSubscriptionId")
-    public void setNfSubscriptionId(String nfSubscriptionId) {
-        this.nfSubscriptionId = nfSubscriptionId;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("objectInstances", objectInstances).append("objectName", objectName).append("objectSchema", objectSchema).append("objectSchemaUrl", objectSchemaUrl).append("nfSubscribedObjectName", nfSubscribedObjectName).append("nfSubscriptionId", nfSubscriptionId).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(nfSubscribedObjectName).append(nfSubscriptionId).append(objectName).append(additionalProperties).append(objectInstances).append(objectSchemaUrl).append(objectSchema).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof AdditionalObject) == false) {
-            return false;
-        }
-        AdditionalObject rhs = ((AdditionalObject) other);
-        return new EqualsBuilder().append(nfSubscribedObjectName, rhs.nfSubscribedObjectName).append(nfSubscriptionId, rhs.nfSubscriptionId).append(objectName, rhs.objectName).append(additionalProperties, rhs.additionalProperties).append(objectInstances, rhs.objectInstances).append(objectSchemaUrl, rhs.objectSchemaUrl).append(objectSchema, rhs.objectSchema).isEquals();
-    }
-
-}
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.List;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * json object schema, name and other meta-information along with one or more object instances

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "objectInstances",

+    "objectName",

+    "objectSchema",

+    "objectSchemaUrl",

+    "nfSubscribedObjectName",

+    "nfSubscriptionId"

+})

+public class AdditionalObject {

+

+    /**

+     * one or more instances of the jsonObject

+     * (Required)

+     * 

+     */

+    @JsonProperty("objectInstances")

+    @JsonPropertyDescription("one or more instances of the jsonObject")

+    private List<ObjectInstance> objectInstances = new ArrayList<ObjectInstance>();

+    /**

+     * name of the JSON Object

+     * (Required)

+     * 

+     */

+    @JsonProperty("objectName")

+    @JsonPropertyDescription("name of the JSON Object")

+    private String objectName;

+    /**

+     * json schema for the object

+     * 

+     */

+    @JsonProperty("objectSchema")

+    @JsonPropertyDescription("json schema for the object")

+    private String objectSchema;

+    /**

+     * Url to the json schema for the object

+     * 

+     */

+    @JsonProperty("objectSchemaUrl")

+    @JsonPropertyDescription("Url to the json schema for the object")

+    private String objectSchemaUrl;

+    /**

+     * name of the object associated with the nfSubscriptonId

+     * 

+     */

+    @JsonProperty("nfSubscribedObjectName")

+    @JsonPropertyDescription("name of the object associated with the nfSubscriptonId")

+    private String nfSubscribedObjectName;

+    /**

+     * identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject

+     * 

+     */

+    @JsonProperty("nfSubscriptionId")

+    @JsonPropertyDescription("identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject")

+    private String nfSubscriptionId;

+

+    /**

+     * one or more instances of the jsonObject

+     * (Required)

+     * 

+     */

+    @JsonProperty("objectInstances")

+    public List<ObjectInstance> getObjectInstances() {

+        return objectInstances;

+    }

+

+    /**

+     * one or more instances of the jsonObject

+     * (Required)

+     * 

+     */

+    @JsonProperty("objectInstances")

+    public void setObjectInstances(List<ObjectInstance> objectInstances) {

+        this.objectInstances = objectInstances;

+    }

+

+    /**

+     * name of the JSON Object

+     * (Required)

+     * 

+     */

+    @JsonProperty("objectName")

+    public String getObjectName() {

+        return objectName;

+    }

+

+    /**

+     * name of the JSON Object

+     * (Required)

+     * 

+     */

+    @JsonProperty("objectName")

+    public void setObjectName(String objectName) {

+        this.objectName = objectName;

+    }

+

+    /**

+     * json schema for the object

+     * 

+     */

+    @JsonProperty("objectSchema")

+    public String getObjectSchema() {

+        return objectSchema;

+    }

+

+    /**

+     * json schema for the object

+     * 

+     */

+    @JsonProperty("objectSchema")

+    public void setObjectSchema(String objectSchema) {

+        this.objectSchema = objectSchema;

+    }

+

+    /**

+     * Url to the json schema for the object

+     * 

+     */

+    @JsonProperty("objectSchemaUrl")

+    public String getObjectSchemaUrl() {

+        return objectSchemaUrl;

+    }

+

+    /**

+     * Url to the json schema for the object

+     * 

+     */

+    @JsonProperty("objectSchemaUrl")

+    public void setObjectSchemaUrl(String objectSchemaUrl) {

+        this.objectSchemaUrl = objectSchemaUrl;

+    }

+

+    /**

+     * name of the object associated with the nfSubscriptonId

+     * 

+     */

+    @JsonProperty("nfSubscribedObjectName")

+    public String getNfSubscribedObjectName() {

+        return nfSubscribedObjectName;

+    }

+

+    /**

+     * name of the object associated with the nfSubscriptonId

+     * 

+     */

+    @JsonProperty("nfSubscribedObjectName")

+    public void setNfSubscribedObjectName(String nfSubscribedObjectName) {

+        this.nfSubscribedObjectName = nfSubscribedObjectName;

+    }

+

+    /**

+     * identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject

+     * 

+     */

+    @JsonProperty("nfSubscriptionId")

+    public String getNfSubscriptionId() {

+        return nfSubscriptionId;

+    }

+

+    /**

+     * identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject

+     * 

+     */

+    @JsonProperty("nfSubscriptionId")

+    public void setNfSubscriptionId(String nfSubscriptionId) {

+        this.nfSubscriptionId = nfSubscriptionId;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(objectInstances).append(objectName).append(objectSchema).append(objectSchemaUrl).append(nfSubscribedObjectName).append(nfSubscriptionId).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof AdditionalObject) == false) {

+            return false;

+        }

+        AdditionalObject rhs = ((AdditionalObject) other);

+        return new EqualsBuilder().append(objectInstances, rhs.objectInstances).append(objectName, rhs.objectName).append(objectSchema, rhs.objectSchema).append(objectSchemaUrl, rhs.objectSchemaUrl).append(nfSubscribedObjectName, rhs.nfSubscribedObjectName).append(nfSubscriptionId, rhs.nfSubscriptionId).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalParameter.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalParameter.java
new file mode 100644
index 0000000..0a8b8ab
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalParameter.java
@@ -0,0 +1,191 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * performance counter

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "criticality",

+    "hashMap",

+    "thresholdCrossed"

+})

+public class AdditionalParameter {

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("criticality")

+    private AdditionalParameter.Criticality criticality;

+    /**

+     * an associative array which is an array of key:value pairs

+     * (Required)

+     * 

+     */

+    @JsonProperty("hashMap")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation hashMap;

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("thresholdCrossed")

+    private String thresholdCrossed;

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("criticality")

+    public AdditionalParameter.Criticality getCriticality() {

+        return criticality;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("criticality")

+    public void setCriticality(AdditionalParameter.Criticality criticality) {

+        this.criticality = criticality;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * (Required)

+     * 

+     */

+    @JsonProperty("hashMap")

+    public AlarmAdditionalInformation getHashMap() {

+        return hashMap;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * (Required)

+     * 

+     */

+    @JsonProperty("hashMap")

+    public void setHashMap(AlarmAdditionalInformation hashMap) {

+        this.hashMap = hashMap;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("thresholdCrossed")

+    public String getThresholdCrossed() {

+        return thresholdCrossed;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("thresholdCrossed")

+    public void setThresholdCrossed(String thresholdCrossed) {

+        this.thresholdCrossed = thresholdCrossed;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(criticality).append(hashMap).append(thresholdCrossed).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof AdditionalParameter) == false) {

+            return false;

+        }

+        AdditionalParameter rhs = ((AdditionalParameter) other);

+        return new EqualsBuilder().append(criticality, rhs.criticality).append(hashMap, rhs.hashMap).append(thresholdCrossed, rhs.thresholdCrossed).isEquals();

+    }

+

+    public enum Criticality {

+

+        CRIT("CRIT"),

+        MAJ("MAJ");

+        private final String value;

+        private final static Map<String, AdditionalParameter.Criticality> CONSTANTS = new HashMap<String, AdditionalParameter.Criticality>();

+

+        static {

+            for (AdditionalParameter.Criticality c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private Criticality(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static AdditionalParameter.Criticality fromValue(String value) {

+            AdditionalParameter.Criticality constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ObjectInstance_.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AlarmAdditionalInformation.java
index ec01aba..caacd12 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ObjectInstance_.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AlarmAdditionalInformation.java
@@ -1,74 +1,79 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-
-})
-public class ObjectInstance_ {
-
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof ObjectInstance_) == false) {
-            return false;
-        }
-        ObjectInstance_ rhs = ((ObjectInstance_) other);
-        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonAnyGetter;

+import com.fasterxml.jackson.annotation.JsonAnySetter;

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * an associative array which is an array of key:value pairs

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+

+})

+public class AlarmAdditionalInformation {

+

+    @JsonIgnore

+    private Map<String, String> additionalProperties = new HashMap<String, String>();

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @JsonAnyGetter

+    public Map<String, String> getAdditionalProperties() {

+        return this.additionalProperties;

+    }

+

+    @JsonAnySetter

+    public void setAdditionalProperty(String name, String value) {

+        this.additionalProperties.put(name, value);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalProperties).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof AlarmAdditionalInformation) == false) {

+            return false;

+        }

+        AlarmAdditionalInformation rhs = ((AlarmAdditionalInformation) other);

+        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/CodecUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CodecUsageArray.java
index ea581ff..eda48f5 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/CodecUsageArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CodecUsageArray.java
@@ -1,100 +1,118 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "codecIdentifier",
-    "numberInUse"
-})
-public class CodecUsageArray {
-
-    @JsonProperty("codecIdentifier")
-    private String codecIdentifier;
-    @JsonProperty("numberInUse")
-    private Long numberInUse;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("codecIdentifier")
-    public String getCodecIdentifier() {
-        return codecIdentifier;
-    }
-
-    @JsonProperty("codecIdentifier")
-    public void setCodecIdentifier(String codecIdentifier) {
-        this.codecIdentifier = codecIdentifier;
-    }
-
-    @JsonProperty("numberInUse")
-    public Long getNumberInUse() {
-        return numberInUse;
-    }
-
-    @JsonProperty("numberInUse")
-    public void setNumberInUse(Long numberInUse) {
-        this.numberInUse = numberInUse;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("codecIdentifier", codecIdentifier).append("numberInUse", numberInUse).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(numberInUse).append(additionalProperties).append(codecIdentifier).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof CodecUsageArray) == false) {
-            return false;
-        }
-        CodecUsageArray rhs = ((CodecUsageArray) other);
-        return new EqualsBuilder().append(numberInUse, rhs.numberInUse).append(additionalProperties, rhs.additionalProperties).append(codecIdentifier, rhs.codecIdentifier).isEquals();
-    }
-
-}
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * number of times an identified codec was used over the measurementInterval

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "codecIdentifier",

+    "numberInUse"

+})

+public class CodecUsageArray {

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("codecIdentifier")

+    private String codecIdentifier;

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("numberInUse")

+    private Integer numberInUse;

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("codecIdentifier")

+    public String getCodecIdentifier() {

+        return codecIdentifier;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("codecIdentifier")

+    public void setCodecIdentifier(String codecIdentifier) {

+        this.codecIdentifier = codecIdentifier;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("numberInUse")

+    public Integer getNumberInUse() {

+        return numberInUse;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("numberInUse")

+    public void setNumberInUse(Integer numberInUse) {

+        this.numberInUse = numberInUse;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(codecIdentifier).append(numberInUse).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof CodecUsageArray) == false) {

+            return false;

+        }

+        CodecUsageArray rhs = ((CodecUsageArray) other);

+        return new EqualsBuilder().append(codecIdentifier, rhs.codecIdentifier).append(numberInUse, rhs.numberInUse).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CommonEventHeader.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CommonEventHeader.java
new file mode 100644
index 0000000..48e2c32
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CommonEventHeader.java
@@ -0,0 +1,777 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.Date;

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+

+/**

+ * fields common to all events

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "domain",

+    "eventId",

+    "eventName",

+    "eventType",

+    "internalHeaderFields",

+    "lastEpochMicrosec",

+    "nfcNamingCode",

+    "nfNamingCode",

+    "nfVendorName",

+    "priority",

+    "reportingEntityId",

+    "reportingEntityName",

+    "sequence",

+    "sourceId",

+    "sourceName",

+    "startEpochMicrosec",

+    "timeZoneOffset",

+    "version",

+    "vesEventListenerVersion"

+})

+public class CommonEventHeader {

+

+	

+	

+    /**

+     * the eventing domain associated with the event

+     * (Required)

+     * 

+     */

+    @JsonProperty("domain")

+    @JsonPropertyDescription("the eventing domain associated with the event")

+    private CommonEventHeader.Domain domain;

+    /**

+     * event key that is unique to the event source

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventId")

+    @JsonPropertyDescription("event key that is unique to the event source")

+    private String eventId;

+    /**

+     * unique event name

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventName")

+    @JsonPropertyDescription("unique event name")

+    private String eventName;

+    /**

+     * for example - applicationNf, guestOS, hostOS, platform

+     * 

+     */

+    @JsonProperty("eventType")

+    @JsonPropertyDescription("for example - applicationNf, guestOS, hostOS, platform")

+    private String eventType;

+    /**

+     * enrichment fields for internal VES Event Listener service use only, not supplied by event sources

+     * 

+     */

+    @JsonProperty("internalHeaderFields")

+    @JsonPropertyDescription("enrichment fields for internal VES Event Listener service use only, not supplied by event sources")

+    private InternalHeaderFields internalHeaderFields;

+    /**

+     * the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("lastEpochMicrosec")

+    @JsonPropertyDescription("the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds")

+    private Double lastEpochMicrosec;

+    /**

+     *  3 character network function component type, aligned with vfc naming standards

+     * 

+     */

+    @JsonProperty("nfcNamingCode")

+    @JsonPropertyDescription("3 character network function component type, aligned with vfc naming standards")

+    private String nfcNamingCode;

+    /**

+     *  4 character network function type, aligned with nf naming standards

+     * 

+     */

+    @JsonProperty("nfNamingCode")

+    @JsonPropertyDescription("4 character network function type, aligned with nf naming standards")

+    private String nfNamingCode;

+    /**

+     * network function vendor name

+     * 

+     */

+    @JsonProperty("nfVendorName")

+    @JsonPropertyDescription("network function vendor name")

+    private String nfVendorName;

+    /**

+     * processing priority

+     * (Required)

+     * 

+     */

+    @JsonProperty("priority")

+    @JsonPropertyDescription("processing priority")

+    private CommonEventHeader.Priority priority;

+    /**

+     * UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process

+     * 

+     */

+    @JsonProperty("reportingEntityId")

+    @JsonPropertyDescription("UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process")

+    private String reportingEntityId;

+    /**

+     * name of the entity reporting the event, for example, an EMS name; may be the same as sourceName

+     * (Required)

+     * 

+     */

+    @JsonProperty("reportingEntityName")

+    @JsonPropertyDescription("name of the entity reporting the event, for example, an EMS name; may be the same as sourceName")

+    private String reportingEntityName;

+    /**

+     * ordering of events communicated by an event source instance or 0 if not needed

+     * (Required)

+     * 

+     */

+    @JsonProperty("sequence")

+    @JsonPropertyDescription("ordering of events communicated by an event source instance or 0 if not needed")

+    private Integer sequence;

+    /**

+     * UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process

+     * 

+     */

+    @JsonProperty("sourceId")

+    @JsonPropertyDescription("UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process")

+    private String sourceId;

+    /**

+     * name of the entity experiencing the event issue

+     * (Required)

+     * 

+     */

+    @JsonProperty("sourceName")

+    @JsonPropertyDescription("name of the entity experiencing the event issue")

+    private String sourceName;

+    /**

+     * the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("startEpochMicrosec")

+    @JsonPropertyDescription("the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds")

+    private Double startEpochMicrosec;

+    /**

+     * UTC offset for the local time zone of the device as UTC+/-hh.mm

+     * 

+     */

+    @JsonProperty("timeZoneOffset")

+    @JsonPropertyDescription("UTC offset for the local time zone of the device as UTC+/-hh.mm")

+    private String timeZoneOffset;

+    /**

+     * version of the event header

+     * (Required)

+     * 

+     */

+    @JsonProperty("version")

+    @JsonPropertyDescription("version of the event header")

+    private CommonEventHeader.Version version;

+    /**

+     * version of the VES Event Listener API

+     * (Required)

+     * 

+     */

+    @JsonProperty("vesEventListenerVersion")

+    @JsonPropertyDescription("version of the VES Event Listener API")

+    private CommonEventHeader.VesEventListenerVersion vesEventListenerVersion;

+    

+    @JsonIgnore

+    private long ts1 =  new Date().getTime();

+    @JsonIgnore

+    public long getTs1() {

+		return ts1;

+	}

+

+    @JsonIgnore

+	public void setTs1(long ts1) {

+		this.ts1 = ts1;

+    }

+

+    /**

+     * the eventing domain associated with the event

+     * (Required)

+     * 

+     */

+    @JsonProperty("domain")

+    public CommonEventHeader.Domain getDomain() {

+        return domain;

+    }

+

+    /**

+     * the eventing domain associated with the event

+     * (Required)

+     * 

+     */

+    @JsonProperty("domain")

+    public void setDomain(CommonEventHeader.Domain domain) {

+        this.domain = domain;

+    }

+

+    /**

+     * event key that is unique to the event source

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventId")

+    public String getEventId() {

+        return eventId;

+    }

+

+    /**

+     * event key that is unique to the event source

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventId")

+    public void setEventId(String eventId) {

+        this.eventId = eventId;

+    }

+

+    /**

+     * unique event name

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventName")

+    public String getEventName() {

+        return eventName;

+    }

+

+    /**

+     * unique event name

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventName")

+    public void setEventName(String eventName) {

+        this.eventName = eventName;

+    }

+

+    /**

+     * for example - applicationNf, guestOS, hostOS, platform

+     * 

+     */

+    @JsonProperty("eventType")

+    public String getEventType() {

+        return eventType;

+    }

+

+    /**

+     * for example - applicationNf, guestOS, hostOS, platform

+     * 

+     */

+    @JsonProperty("eventType")

+    public void setEventType(String eventType) {

+        this.eventType = eventType;

+    }

+

+    /**

+     * enrichment fields for internal VES Event Listener service use only, not supplied by event sources

+     * 

+     */

+    @JsonProperty("internalHeaderFields")

+    public InternalHeaderFields getInternalHeaderFields() {

+        return internalHeaderFields;

+    }

+

+    /**

+     * enrichment fields for internal VES Event Listener service use only, not supplied by event sources

+     * 

+     */

+    @JsonProperty("internalHeaderFields")

+    public void setInternalHeaderFields(InternalHeaderFields internalHeaderFields) {

+        this.internalHeaderFields = internalHeaderFields;

+    }

+

+    /**

+     * the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("lastEpochMicrosec")

+    public Double getLastEpochMicrosec() {

+        return lastEpochMicrosec;

+    }

+

+    /**

+     * the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("lastEpochMicrosec")

+    public void setLastEpochMicrosec(Double lastEpochMicrosec) {

+        this.lastEpochMicrosec = lastEpochMicrosec;

+    }

+

+    /**

+     *  3 character network function component type, aligned with vfc naming standards

+     * 

+     */

+    @JsonProperty("nfcNamingCode")

+    public String getNfcNamingCode() {

+        return nfcNamingCode;

+    }

+

+    /**

+     *  3 character network function component type, aligned with vfc naming standards

+     * 

+     */

+    @JsonProperty("nfcNamingCode")

+    public void setNfcNamingCode(String nfcNamingCode) {

+        this.nfcNamingCode = nfcNamingCode;

+    }

+

+    /**

+     *  4 character network function type, aligned with nf naming standards

+     * 

+     */

+    @JsonProperty("nfNamingCode")

+    public String getNfNamingCode() {

+        return nfNamingCode;

+    }

+

+    /**

+     *  4 character network function type, aligned with nf naming standards

+     * 

+     */

+    @JsonProperty("nfNamingCode")

+    public void setNfNamingCode(String nfNamingCode) {

+        this.nfNamingCode = nfNamingCode;

+    }

+

+    /**

+     * network function vendor name

+     * 

+     */

+    @JsonProperty("nfVendorName")

+    public String getNfVendorName() {

+        return nfVendorName;

+    }

+

+    /**

+     * network function vendor name

+     * 

+     */

+    @JsonProperty("nfVendorName")

+    public void setNfVendorName(String nfVendorName) {

+        this.nfVendorName = nfVendorName;

+    }

+

+    /**

+     * processing priority

+     * (Required)

+     * 

+     */

+    @JsonProperty("priority")

+    public CommonEventHeader.Priority getPriority() {

+        return priority;

+    }

+

+    /**

+     * processing priority

+     * (Required)

+     * 

+     */

+    @JsonProperty("priority")

+    public void setPriority(CommonEventHeader.Priority priority) {

+        this.priority = priority;

+    }

+

+    /**

+     * UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process

+     * 

+     */

+    @JsonProperty("reportingEntityId")

+    public String getReportingEntityId() {

+        return reportingEntityId;

+    }

+

+    /**

+     * UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process

+     * 

+     */

+    @JsonProperty("reportingEntityId")

+    public void setReportingEntityId(String reportingEntityId) {

+        this.reportingEntityId = reportingEntityId;

+    }

+

+    /**

+     * name of the entity reporting the event, for example, an EMS name; may be the same as sourceName

+     * (Required)

+     * 

+     */

+    @JsonProperty("reportingEntityName")

+    public String getReportingEntityName() {

+        return reportingEntityName;

+    }

+

+    /**

+     * name of the entity reporting the event, for example, an EMS name; may be the same as sourceName

+     * (Required)

+     * 

+     */

+    @JsonProperty("reportingEntityName")

+    public void setReportingEntityName(String reportingEntityName) {

+        this.reportingEntityName = reportingEntityName;

+    }

+

+    /**

+     * ordering of events communicated by an event source instance or 0 if not needed

+     * (Required)

+     * 

+     */

+    @JsonProperty("sequence")

+    public Integer getSequence() {

+        return sequence;

+    }

+

+    /**

+     * ordering of events communicated by an event source instance or 0 if not needed

+     * (Required)

+     * 

+     */

+    @JsonProperty("sequence")

+    public void setSequence(Integer sequence) {

+        this.sequence = sequence;

+    }

+

+    /**

+     * UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process

+     * 

+     */

+    @JsonProperty("sourceId")

+    public String getSourceId() {

+        return sourceId;

+    }

+

+    /**

+     * UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process

+     * 

+     */

+    @JsonProperty("sourceId")

+    public void setSourceId(String sourceId) {

+        this.sourceId = sourceId;

+    }

+

+    /**

+     * name of the entity experiencing the event issue

+     * (Required)

+     * 

+     */

+    @JsonProperty("sourceName")

+    public String getSourceName() {

+        return sourceName;

+    }

+

+    /**

+     * name of the entity experiencing the event issue

+     * (Required)

+     * 

+     */

+    @JsonProperty("sourceName")

+    public void setSourceName(String sourceName) {

+        this.sourceName = sourceName;

+    }

+

+    /**

+     * the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("startEpochMicrosec")

+    public Double getStartEpochMicrosec() {

+        return startEpochMicrosec;

+    }

+

+    /**

+     * the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("startEpochMicrosec")

+    public void setStartEpochMicrosec(Double startEpochMicrosec) {

+        this.startEpochMicrosec = startEpochMicrosec;

+    }

+

+    /**

+     * UTC offset for the local time zone of the device as UTC+/-hh.mm

+     * 

+     */

+    @JsonProperty("timeZoneOffset")

+    public String getTimeZoneOffset() {

+        return timeZoneOffset;

+    }

+

+    /**

+     * UTC offset for the local time zone of the device as UTC+/-hh.mm

+     * 

+     */

+    @JsonProperty("timeZoneOffset")

+    public void setTimeZoneOffset(String timeZoneOffset) {

+        this.timeZoneOffset = timeZoneOffset;

+    }

+

+    /**

+     * version of the event header

+     * (Required)

+     * 

+     */

+    @JsonProperty("version")

+    public CommonEventHeader.Version getVersion() {

+        return version;

+    }

+

+    /**

+     * version of the event header

+     * (Required)

+     * 

+     */

+    @JsonProperty("version")

+    public void setVersion(CommonEventHeader.Version version) {

+        this.version = version;

+    }

+

+    /**

+     * version of the VES Event Listener API

+     * (Required)

+     * 

+     */

+    @JsonProperty("vesEventListenerVersion")

+    public CommonEventHeader.VesEventListenerVersion getVesEventListenerVersion() {

+        return vesEventListenerVersion;

+    }

+

+    /**

+     * version of the VES Event Listener API

+     * (Required)

+     * 

+     */

+    @JsonProperty("vesEventListenerVersion")

+    public void setVesEventListenerVersion(CommonEventHeader.VesEventListenerVersion vesEventListenerVersion) {

+        this.vesEventListenerVersion = vesEventListenerVersion;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(domain).append(eventId).append(eventName).append(eventType).append(internalHeaderFields).append(lastEpochMicrosec).append(nfcNamingCode).append(nfNamingCode).append(nfVendorName).append(priority).append(reportingEntityId).append(reportingEntityName).append(sequence).append(sourceId).append(sourceName).append(startEpochMicrosec).append(timeZoneOffset).append(version).append(vesEventListenerVersion).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof CommonEventHeader) == false) {

+            return false;

+        }

+        CommonEventHeader rhs = ((CommonEventHeader) other);

+        return new EqualsBuilder().append(domain, rhs.domain).append(eventId, rhs.eventId).append(eventName, rhs.eventName).append(eventType, rhs.eventType).append(internalHeaderFields, rhs.internalHeaderFields).append(lastEpochMicrosec, rhs.lastEpochMicrosec).append(nfcNamingCode, rhs.nfcNamingCode).append(nfNamingCode, rhs.nfNamingCode).append(nfVendorName, rhs.nfVendorName).append(priority, rhs.priority).append(reportingEntityId, rhs.reportingEntityId).append(reportingEntityName, rhs.reportingEntityName).append(sequence, rhs.sequence).append(sourceId, rhs.sourceId).append(sourceName, rhs.sourceName).append(startEpochMicrosec, rhs.startEpochMicrosec).append(timeZoneOffset, rhs.timeZoneOffset).append(version, rhs.version).append(vesEventListenerVersion, rhs.vesEventListenerVersion).isEquals();

+    }

+

+    public enum Domain {

+

+        FAULT("fault"),

+        HEARTBEAT("heartbeat"),

+        MEASUREMENT("measurement"),

+        MOBILE_FLOW("mobileFlow"),

+        NOTIFICATION("notification"),

+        OTHER("other"),

+        PNF_REGISTRATION("pnfRegistration"),

+        SIP_SIGNALING("sipSignaling"),

+        STATE_CHANGE("stateChange"),

+        SYSLOG("syslog"),

+        THRESHOLD_CROSSING_ALERT("thresholdCrossingAlert"),

+        VOICE_QUALITY("voiceQuality");

+        private final String value;

+        private final static Map<String, CommonEventHeader.Domain> CONSTANTS = new HashMap<String, CommonEventHeader.Domain>();

+

+        static {

+            for (CommonEventHeader.Domain c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private Domain(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static CommonEventHeader.Domain fromValue(String value) {

+            CommonEventHeader.Domain constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum Priority {

+

+        HIGH("High"),

+        MEDIUM("Medium"),

+        NORMAL("Normal"),

+        LOW("Low");

+        private final String value;

+        private final static Map<String, CommonEventHeader.Priority> CONSTANTS = new HashMap<String, CommonEventHeader.Priority>();

+

+        static {

+            for (CommonEventHeader.Priority c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private Priority(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static CommonEventHeader.Priority fromValue(String value) {

+            CommonEventHeader.Priority constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum Version {

+

+        _4_0_1("4.0.1");

+        private final String value;

+        private final static Map<String, CommonEventHeader.Version> CONSTANTS = new HashMap<String, CommonEventHeader.Version>();

+

+        static {

+            for (CommonEventHeader.Version c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private Version(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static CommonEventHeader.Version fromValue(String value) {

+            CommonEventHeader.Version constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum VesEventListenerVersion {

+

+        _7_0_1("7.0.1");

+        private final String value;

+        private final static Map<String, CommonEventHeader.VesEventListenerVersion> CONSTANTS = new HashMap<String, CommonEventHeader.VesEventListenerVersion>();

+

+        static {

+            for (CommonEventHeader.VesEventListenerVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private VesEventListenerVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static CommonEventHeader.VesEventListenerVersion fromValue(String value) {

+            CommonEventHeader.VesEventListenerVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CpuUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CpuUsageArray.java
new file mode 100644
index 0000000..4d075a6
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CpuUsageArray.java
@@ -0,0 +1,511 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * usage of an identified CPU

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "cpuCapacityContention",

+    "cpuDemandAvg",

+    "cpuDemandMhz",

+    "cpuDemandPct",

+    "cpuIdentifier",

+    "cpuIdle",

+    "cpuLatencyAvg",

+    "cpuOverheadAvg",

+    "cpuSwapWaitTime",

+    "cpuUsageInterrupt",

+    "cpuUsageNice",

+    "cpuUsageSoftIrq",

+    "cpuUsageSteal",

+    "cpuUsageSystem",

+    "cpuUsageUser",

+    "cpuWait",

+    "percentUsage"

+})

+public class CpuUsageArray {

+

+    /**

+     * the amount of time the CPU cannot run due to contention, in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuCapacityContention")

+    @JsonPropertyDescription("the amount of time the CPU cannot run due to contention, in milliseconds over the measurementInterval")

+    private Double cpuCapacityContention;

+    /**

+     * the total CPU time that the NF/NFC/VM could use if there was no contention, in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuDemandAvg")

+    @JsonPropertyDescription("the total CPU time that the NF/NFC/VM could use if there was no contention, in milliseconds over the measurementInterval")

+    private Double cpuDemandAvg;

+    /**

+     * CPU demand in megahertz

+     * 

+     */

+    @JsonProperty("cpuDemandMhz")

+    @JsonPropertyDescription("CPU demand in megahertz")

+    private Double cpuDemandMhz;

+    /**

+     * CPU demand as a percentage of the provisioned capacity

+     * 

+     */

+    @JsonProperty("cpuDemandPct")

+    @JsonPropertyDescription("CPU demand as a percentage of the provisioned capacity")

+    private Double cpuDemandPct;

+    /**

+     * cpu identifer

+     * (Required)

+     * 

+     */

+    @JsonProperty("cpuIdentifier")

+    @JsonPropertyDescription("cpu identifer")

+    private String cpuIdentifier;

+    /**

+     * percentage of CPU time spent in the idle task

+     * 

+     */

+    @JsonProperty("cpuIdle")

+    @JsonPropertyDescription("percentage of CPU time spent in the idle task")

+    private Double cpuIdle;

+    /**

+     * percentage of time the VM is unable to run because it is contending for access to the physical CPUs

+     * 

+     */

+    @JsonProperty("cpuLatencyAvg")

+    @JsonPropertyDescription("percentage of time the VM is unable to run because it is contending for access to the physical CPUs")

+    private Double cpuLatencyAvg;

+    /**

+     * the overhead demand above available allocations and reservations, in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuOverheadAvg")

+    @JsonPropertyDescription("the overhead demand above available allocations and reservations, in milliseconds over the measurementInterval")

+    private Double cpuOverheadAvg;

+    /**

+     * swap wait time. in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuSwapWaitTime")

+    @JsonPropertyDescription("swap wait time. in milliseconds over the measurementInterval")

+    private Double cpuSwapWaitTime;

+    /**

+     * percentage of time spent servicing interrupts

+     * 

+     */

+    @JsonProperty("cpuUsageInterrupt")

+    @JsonPropertyDescription("percentage of time spent servicing interrupts")

+    private Double cpuUsageInterrupt;

+    /**

+     * percentage of time spent running user space processes that have been niced

+     * 

+     */

+    @JsonProperty("cpuUsageNice")

+    @JsonPropertyDescription("percentage of time spent running user space processes that have been niced")

+    private Double cpuUsageNice;

+    /**

+     * percentage of time spent handling soft irq interrupts

+     * 

+     */

+    @JsonProperty("cpuUsageSoftIrq")

+    @JsonPropertyDescription("percentage of time spent handling soft irq interrupts")

+    private Double cpuUsageSoftIrq;

+    /**

+     * percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing

+     * 

+     */

+    @JsonProperty("cpuUsageSteal")

+    @JsonPropertyDescription("percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing")

+    private Double cpuUsageSteal;

+    /**

+     * percentage of time spent on system tasks running the kernel

+     * 

+     */

+    @JsonProperty("cpuUsageSystem")

+    @JsonPropertyDescription("percentage of time spent on system tasks running the kernel")

+    private Double cpuUsageSystem;

+    /**

+     * percentage of time spent running un-niced user space processes

+     * 

+     */

+    @JsonProperty("cpuUsageUser")

+    @JsonPropertyDescription("percentage of time spent running un-niced user space processes")

+    private Double cpuUsageUser;

+    /**

+     * percentage of CPU time spent waiting for I/O operations to complete

+     * 

+     */

+    @JsonProperty("cpuWait")

+    @JsonPropertyDescription("percentage of CPU time spent waiting for I/O operations to complete")

+    private Double cpuWait;

+    /**

+     * aggregate cpu usage of the virtual machine on which the xNFC reporting the event is running

+     * (Required)

+     * 

+     */

+    @JsonProperty("percentUsage")

+    @JsonPropertyDescription("aggregate cpu usage of the virtual machine on which the xNFC reporting the event is running")

+    private Double percentUsage;

+

+    /**

+     * the amount of time the CPU cannot run due to contention, in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuCapacityContention")

+    public Double getCpuCapacityContention() {

+        return cpuCapacityContention;

+    }

+

+    /**

+     * the amount of time the CPU cannot run due to contention, in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuCapacityContention")

+    public void setCpuCapacityContention(Double cpuCapacityContention) {

+        this.cpuCapacityContention = cpuCapacityContention;

+    }

+

+    /**

+     * the total CPU time that the NF/NFC/VM could use if there was no contention, in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuDemandAvg")

+    public Double getCpuDemandAvg() {

+        return cpuDemandAvg;

+    }

+

+    /**

+     * the total CPU time that the NF/NFC/VM could use if there was no contention, in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuDemandAvg")

+    public void setCpuDemandAvg(Double cpuDemandAvg) {

+        this.cpuDemandAvg = cpuDemandAvg;

+    }

+

+    /**

+     * CPU demand in megahertz

+     * 

+     */

+    @JsonProperty("cpuDemandMhz")

+    public Double getCpuDemandMhz() {

+        return cpuDemandMhz;

+    }

+

+    /**

+     * CPU demand in megahertz

+     * 

+     */

+    @JsonProperty("cpuDemandMhz")

+    public void setCpuDemandMhz(Double cpuDemandMhz) {

+        this.cpuDemandMhz = cpuDemandMhz;

+    }

+

+    /**

+     * CPU demand as a percentage of the provisioned capacity

+     * 

+     */

+    @JsonProperty("cpuDemandPct")

+    public Double getCpuDemandPct() {

+        return cpuDemandPct;

+    }

+

+    /**

+     * CPU demand as a percentage of the provisioned capacity

+     * 

+     */

+    @JsonProperty("cpuDemandPct")

+    public void setCpuDemandPct(Double cpuDemandPct) {

+        this.cpuDemandPct = cpuDemandPct;

+    }

+

+    /**

+     * cpu identifer

+     * (Required)

+     * 

+     */

+    @JsonProperty("cpuIdentifier")

+    public String getCpuIdentifier() {

+        return cpuIdentifier;

+    }

+

+    /**

+     * cpu identifer

+     * (Required)

+     * 

+     */

+    @JsonProperty("cpuIdentifier")

+    public void setCpuIdentifier(String cpuIdentifier) {

+        this.cpuIdentifier = cpuIdentifier;

+    }

+

+    /**

+     * percentage of CPU time spent in the idle task

+     * 

+     */

+    @JsonProperty("cpuIdle")

+    public Double getCpuIdle() {

+        return cpuIdle;

+    }

+

+    /**

+     * percentage of CPU time spent in the idle task

+     * 

+     */

+    @JsonProperty("cpuIdle")

+    public void setCpuIdle(Double cpuIdle) {

+        this.cpuIdle = cpuIdle;

+    }

+

+    /**

+     * percentage of time the VM is unable to run because it is contending for access to the physical CPUs

+     * 

+     */

+    @JsonProperty("cpuLatencyAvg")

+    public Double getCpuLatencyAvg() {

+        return cpuLatencyAvg;

+    }

+

+    /**

+     * percentage of time the VM is unable to run because it is contending for access to the physical CPUs

+     * 

+     */

+    @JsonProperty("cpuLatencyAvg")

+    public void setCpuLatencyAvg(Double cpuLatencyAvg) {

+        this.cpuLatencyAvg = cpuLatencyAvg;

+    }

+

+    /**

+     * the overhead demand above available allocations and reservations, in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuOverheadAvg")

+    public Double getCpuOverheadAvg() {

+        return cpuOverheadAvg;

+    }

+

+    /**

+     * the overhead demand above available allocations and reservations, in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuOverheadAvg")

+    public void setCpuOverheadAvg(Double cpuOverheadAvg) {

+        this.cpuOverheadAvg = cpuOverheadAvg;

+    }

+

+    /**

+     * swap wait time. in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuSwapWaitTime")

+    public Double getCpuSwapWaitTime() {

+        return cpuSwapWaitTime;

+    }

+

+    /**

+     * swap wait time. in milliseconds over the measurementInterval

+     * 

+     */

+    @JsonProperty("cpuSwapWaitTime")

+    public void setCpuSwapWaitTime(Double cpuSwapWaitTime) {

+        this.cpuSwapWaitTime = cpuSwapWaitTime;

+    }

+

+    /**

+     * percentage of time spent servicing interrupts

+     * 

+     */

+    @JsonProperty("cpuUsageInterrupt")

+    public Double getCpuUsageInterrupt() {

+        return cpuUsageInterrupt;

+    }

+

+    /**

+     * percentage of time spent servicing interrupts

+     * 

+     */

+    @JsonProperty("cpuUsageInterrupt")

+    public void setCpuUsageInterrupt(Double cpuUsageInterrupt) {

+        this.cpuUsageInterrupt = cpuUsageInterrupt;

+    }

+

+    /**

+     * percentage of time spent running user space processes that have been niced

+     * 

+     */

+    @JsonProperty("cpuUsageNice")

+    public Double getCpuUsageNice() {

+        return cpuUsageNice;

+    }

+

+    /**

+     * percentage of time spent running user space processes that have been niced

+     * 

+     */

+    @JsonProperty("cpuUsageNice")

+    public void setCpuUsageNice(Double cpuUsageNice) {

+        this.cpuUsageNice = cpuUsageNice;

+    }

+

+    /**

+     * percentage of time spent handling soft irq interrupts

+     * 

+     */

+    @JsonProperty("cpuUsageSoftIrq")

+    public Double getCpuUsageSoftIrq() {

+        return cpuUsageSoftIrq;

+    }

+

+    /**

+     * percentage of time spent handling soft irq interrupts

+     * 

+     */

+    @JsonProperty("cpuUsageSoftIrq")

+    public void setCpuUsageSoftIrq(Double cpuUsageSoftIrq) {

+        this.cpuUsageSoftIrq = cpuUsageSoftIrq;

+    }

+

+    /**

+     * percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing

+     * 

+     */

+    @JsonProperty("cpuUsageSteal")

+    public Double getCpuUsageSteal() {

+        return cpuUsageSteal;

+    }

+

+    /**

+     * percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing

+     * 

+     */

+    @JsonProperty("cpuUsageSteal")

+    public void setCpuUsageSteal(Double cpuUsageSteal) {

+        this.cpuUsageSteal = cpuUsageSteal;

+    }

+

+    /**

+     * percentage of time spent on system tasks running the kernel

+     * 

+     */

+    @JsonProperty("cpuUsageSystem")

+    public Double getCpuUsageSystem() {

+        return cpuUsageSystem;

+    }

+

+    /**

+     * percentage of time spent on system tasks running the kernel

+     * 

+     */

+    @JsonProperty("cpuUsageSystem")

+    public void setCpuUsageSystem(Double cpuUsageSystem) {

+        this.cpuUsageSystem = cpuUsageSystem;

+    }

+

+    /**

+     * percentage of time spent running un-niced user space processes

+     * 

+     */

+    @JsonProperty("cpuUsageUser")

+    public Double getCpuUsageUser() {

+        return cpuUsageUser;

+    }

+

+    /**

+     * percentage of time spent running un-niced user space processes

+     * 

+     */

+    @JsonProperty("cpuUsageUser")

+    public void setCpuUsageUser(Double cpuUsageUser) {

+        this.cpuUsageUser = cpuUsageUser;

+    }

+

+    /**

+     * percentage of CPU time spent waiting for I/O operations to complete

+     * 

+     */

+    @JsonProperty("cpuWait")

+    public Double getCpuWait() {

+        return cpuWait;

+    }

+

+    /**

+     * percentage of CPU time spent waiting for I/O operations to complete

+     * 

+     */

+    @JsonProperty("cpuWait")

+    public void setCpuWait(Double cpuWait) {

+        this.cpuWait = cpuWait;

+    }

+

+    /**

+     * aggregate cpu usage of the virtual machine on which the xNFC reporting the event is running

+     * (Required)

+     * 

+     */

+    @JsonProperty("percentUsage")

+    public Double getPercentUsage() {

+        return percentUsage;

+    }

+

+    /**

+     * aggregate cpu usage of the virtual machine on which the xNFC reporting the event is running

+     * (Required)

+     * 

+     */

+    @JsonProperty("percentUsage")

+    public void setPercentUsage(Double percentUsage) {

+        this.percentUsage = percentUsage;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(cpuCapacityContention).append(cpuDemandAvg).append(cpuDemandMhz).append(cpuDemandPct).append(cpuIdentifier).append(cpuIdle).append(cpuLatencyAvg).append(cpuOverheadAvg).append(cpuSwapWaitTime).append(cpuUsageInterrupt).append(cpuUsageNice).append(cpuUsageSoftIrq).append(cpuUsageSteal).append(cpuUsageSystem).append(cpuUsageUser).append(cpuWait).append(percentUsage).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof CpuUsageArray) == false) {

+            return false;

+        }

+        CpuUsageArray rhs = ((CpuUsageArray) other);

+        return new EqualsBuilder().append(cpuCapacityContention, rhs.cpuCapacityContention).append(cpuDemandAvg, rhs.cpuDemandAvg).append(cpuDemandMhz, rhs.cpuDemandMhz).append(cpuDemandPct, rhs.cpuDemandPct).append(cpuIdentifier, rhs.cpuIdentifier).append(cpuIdle, rhs.cpuIdle).append(cpuLatencyAvg, rhs.cpuLatencyAvg).append(cpuOverheadAvg, rhs.cpuOverheadAvg).append(cpuSwapWaitTime, rhs.cpuSwapWaitTime).append(cpuUsageInterrupt, rhs.cpuUsageInterrupt).append(cpuUsageNice, rhs.cpuUsageNice).append(cpuUsageSoftIrq, rhs.cpuUsageSoftIrq).append(cpuUsageSteal, rhs.cpuUsageSteal).append(cpuUsageSystem, rhs.cpuUsageSystem).append(cpuUsageUser, rhs.cpuUsageUser).append(cpuWait, rhs.cpuWait).append(percentUsage, rhs.percentUsage).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/DiskUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/DiskUsageArray.java
new file mode 100644
index 0000000..e505aa6
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/DiskUsageArray.java
@@ -0,0 +1,1496 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * usage of an identified disk

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "diskBusResets",

+    "diskCommandsAborted",

+    "diskCommandsAvg",

+    "diskFlushRequests",

+    "diskFlushTime",

+    "diskIdentifier",

+    "diskIoTimeAvg",

+    "diskIoTimeLast",

+    "diskIoTimeMax",

+    "diskIoTimeMin",

+    "diskMergedReadAvg",

+    "diskMergedReadLast",

+    "diskMergedReadMax",

+    "diskMergedReadMin",

+    "diskMergedWriteAvg",

+    "diskMergedWriteLast",

+    "diskMergedWriteMax",

+    "diskMergedWriteMin",

+    "diskOctetsReadAvg",

+    "diskOctetsReadLast",

+    "diskOctetsReadMax",

+    "diskOctetsReadMin",

+    "diskOctetsWriteAvg",

+    "diskOctetsWriteLast",

+    "diskOctetsWriteMax",

+    "diskOctetsWriteMin",

+    "diskOpsReadAvg",

+    "diskOpsReadLast",

+    "diskOpsReadMax",

+    "diskOpsReadMin",

+    "diskOpsWriteAvg",

+    "diskOpsWriteLast",

+    "diskOpsWriteMax",

+    "diskOpsWriteMin",

+    "diskPendingOperationsAvg",

+    "diskPendingOperationsLast",

+    "diskPendingOperationsMax",

+    "diskPendingOperationsMin",

+    "diskReadCommandsAvg",

+    "diskTime",

+    "diskTimeReadAvg",

+    "diskTimeReadLast",

+    "diskTimeReadMax",

+    "diskTimeReadMin",

+    "diskTimeWriteAvg",

+    "diskTimeWriteLast",

+    "diskTimeWriteMax",

+    "diskTimeWriteMin",

+    "diskTotalReadLatencyAvg",

+    "diskTotalWriteLatencyAvg",

+    "diskWeightedIoTimeAvg",

+    "diskWeightedIoTimeLast",

+    "diskWeightedIoTimeMax",

+    "diskWeightedIoTimeMin",

+    "diskWriteCommandsAvg"

+})

+public class DiskUsageArray {

+

+    /**

+     * number of bus resets over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskBusResets")

+    @JsonPropertyDescription("number of bus resets over the measurementInterval")

+    private Double diskBusResets;

+    /**

+     * number of disk commands aborted over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskCommandsAborted")

+    @JsonPropertyDescription("number of disk commands aborted over the measurementInterval")

+    private Double diskCommandsAborted;

+    /**

+     * average number of commands per second over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskCommandsAvg")

+    @JsonPropertyDescription("average number of commands per second over the measurementInterval")

+    private Double diskCommandsAvg;

+    /**

+     * total flush requests of the disk cache over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskFlushRequests")

+    @JsonPropertyDescription("total flush requests of the disk cache over the measurementInterval")

+    private Double diskFlushRequests;

+    /**

+     * milliseconds spent on disk cache flushing over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskFlushTime")

+    @JsonPropertyDescription("milliseconds spent on disk cache flushing over the measurementInterval")

+    private Double diskFlushTime;

+    /**

+     * disk identifier

+     * (Required)

+     * 

+     */

+    @JsonProperty("diskIdentifier")

+    @JsonPropertyDescription("disk identifier")

+    private String diskIdentifier;

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeAvg")

+    @JsonPropertyDescription("milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval")

+    private Double diskIoTimeAvg;

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeLast")

+    @JsonPropertyDescription("milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval")

+    private Double diskIoTimeLast;

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeMax")

+    @JsonPropertyDescription("milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval")

+    private Double diskIoTimeMax;

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeMin")

+    @JsonPropertyDescription("milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval")

+    private Double diskIoTimeMin;

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadAvg")

+    @JsonPropertyDescription("number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval")

+    private Double diskMergedReadAvg;

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadLast")

+    @JsonPropertyDescription("number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval")

+    private Double diskMergedReadLast;

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadMax")

+    @JsonPropertyDescription("number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval")

+    private Double diskMergedReadMax;

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadMin")

+    @JsonPropertyDescription("number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval")

+    private Double diskMergedReadMin;

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteAvg")

+    @JsonPropertyDescription("number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval")

+    private Double diskMergedWriteAvg;

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteLast")

+    @JsonPropertyDescription("number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval")

+    private Double diskMergedWriteLast;

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteMax")

+    @JsonPropertyDescription("number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval")

+    private Double diskMergedWriteMax;

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteMin")

+    @JsonPropertyDescription("number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval")

+    private Double diskMergedWriteMin;

+    /**

+     * number of octets per second read from a disk or partition; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadAvg")

+    @JsonPropertyDescription("number of octets per second read from a disk or partition; provide the average measurement within the measurement interval")

+    private Double diskOctetsReadAvg;

+    /**

+     * number of octets per second read from a disk or partition; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadLast")

+    @JsonPropertyDescription("number of octets per second read from a disk or partition; provide the last measurement within the measurement interval")

+    private Double diskOctetsReadLast;

+    /**

+     * number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadMax")

+    @JsonPropertyDescription("number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval")

+    private Double diskOctetsReadMax;

+    /**

+     * number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadMin")

+    @JsonPropertyDescription("number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval")

+    private Double diskOctetsReadMin;

+    /**

+     * number of octets per second written to a disk or partition; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteAvg")

+    @JsonPropertyDescription("number of octets per second written to a disk or partition; provide the average measurement within the measurement interval")

+    private Double diskOctetsWriteAvg;

+    /**

+     * number of octets per second written to a disk or partition; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteLast")

+    @JsonPropertyDescription("number of octets per second written to a disk or partition; provide the last measurement within the measurement interval")

+    private Double diskOctetsWriteLast;

+    /**

+     * number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteMax")

+    @JsonPropertyDescription("number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval")

+    private Double diskOctetsWriteMax;

+    /**

+     * number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteMin")

+    @JsonPropertyDescription("number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval")

+    private Double diskOctetsWriteMin;

+    /**

+     * number of read operations per second issued to the disk; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadAvg")

+    @JsonPropertyDescription("number of read operations per second issued to the disk; provide the average measurement within the measurement interval")

+    private Double diskOpsReadAvg;

+    /**

+     * number of read operations per second issued to the disk; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadLast")

+    @JsonPropertyDescription("number of read operations per second issued to the disk; provide the last measurement within the measurement interval")

+    private Double diskOpsReadLast;

+    /**

+     * number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadMax")

+    @JsonPropertyDescription("number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval")

+    private Double diskOpsReadMax;

+    /**

+     * number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadMin")

+    @JsonPropertyDescription("number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval")

+    private Double diskOpsReadMin;

+    /**

+     * number of write operations per second issued to the disk; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteAvg")

+    @JsonPropertyDescription("number of write operations per second issued to the disk; provide the average measurement within the measurement interval")

+    private Double diskOpsWriteAvg;

+    /**

+     * number of write operations per second issued to the disk; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteLast")

+    @JsonPropertyDescription("number of write operations per second issued to the disk; provide the last measurement within the measurement interval")

+    private Double diskOpsWriteLast;

+    /**

+     * number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteMax")

+    @JsonPropertyDescription("number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval")

+    private Double diskOpsWriteMax;

+    /**

+     * number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteMin")

+    @JsonPropertyDescription("number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval")

+    private Double diskOpsWriteMin;

+    /**

+     * queue size of pending I/O operations per second; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsAvg")

+    @JsonPropertyDescription("queue size of pending I/O operations per second; provide the average measurement within the measurement interval")

+    private Double diskPendingOperationsAvg;

+    /**

+     * queue size of pending I/O operations per second; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsLast")

+    @JsonPropertyDescription("queue size of pending I/O operations per second; provide the last measurement within the measurement interval")

+    private Double diskPendingOperationsLast;

+    /**

+     * queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsMax")

+    @JsonPropertyDescription("queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval")

+    private Double diskPendingOperationsMax;

+    /**

+     * queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsMin")

+    @JsonPropertyDescription("queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval")

+    private Double diskPendingOperationsMin;

+    /**

+     * average number of read commands issued per second to the disk over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskReadCommandsAvg")

+    @JsonPropertyDescription("average number of read commands issued per second to the disk over the measurementInterval")

+    private Double diskReadCommandsAvg;

+    /**

+     * nanoseconds spent on disk cache reads/writes within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTime")

+    @JsonPropertyDescription("nanoseconds spent on disk cache reads/writes within the measurement interval")

+    private Double diskTime;

+    /**

+     * milliseconds a read operation took to complete; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadAvg")

+    @JsonPropertyDescription("milliseconds a read operation took to complete; provide the average measurement within the measurement interval")

+    private Double diskTimeReadAvg;

+    /**

+     * milliseconds a read operation took to complete; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadLast")

+    @JsonPropertyDescription("milliseconds a read operation took to complete; provide the last measurement within the measurement interval")

+    private Double diskTimeReadLast;

+    /**

+     * milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadMax")

+    @JsonPropertyDescription("milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval")

+    private Double diskTimeReadMax;

+    /**

+     * milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadMin")

+    @JsonPropertyDescription("milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval")

+    private Double diskTimeReadMin;

+    /**

+     * milliseconds a write operation took to complete; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteAvg")

+    @JsonPropertyDescription("milliseconds a write operation took to complete; provide the average measurement within the measurement interval")

+    private Double diskTimeWriteAvg;

+    /**

+     * milliseconds a write operation took to complete; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteLast")

+    @JsonPropertyDescription("milliseconds a write operation took to complete; provide the last measurement within the measurement interval")

+    private Double diskTimeWriteLast;

+    /**

+     * milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteMax")

+    @JsonPropertyDescription("milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval")

+    private Double diskTimeWriteMax;

+    /**

+     * milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteMin")

+    @JsonPropertyDescription("milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval")

+    private Double diskTimeWriteMin;

+    /**

+     * average read time from the perspective of a Guest OS: sum of the Kernel Read Latency and Physical Device Read Latency in milliseconds over the measurement interval

+     * 

+     */

+    @JsonProperty("diskTotalReadLatencyAvg")

+    @JsonPropertyDescription("average read time from the perspective of a Guest OS: sum of the Kernel Read Latency and Physical Device Read Latency in milliseconds over the measurement interval")

+    private Double diskTotalReadLatencyAvg;

+    /**

+     * average write time from the perspective of a Guest OS: sum of the Kernel Write Latency and Physical Device Write Latency in milliseconds over the measurement interval

+     * 

+     */

+    @JsonProperty("diskTotalWriteLatencyAvg")

+    @JsonPropertyDescription("average write time from the perspective of a Guest OS: sum of the Kernel Write Latency and Physical Device Write Latency in milliseconds over the measurement interval")

+    private Double diskTotalWriteLatencyAvg;

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the average within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeAvg")

+    @JsonPropertyDescription("measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the average within the collection interval")

+    private Double diskWeightedIoTimeAvg;

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the last within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeLast")

+    @JsonPropertyDescription("measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the last within the collection interval")

+    private Double diskWeightedIoTimeLast;

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the maximum within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeMax")

+    @JsonPropertyDescription("measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the maximum within the collection interval")

+    private Double diskWeightedIoTimeMax;

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the minimum within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeMin")

+    @JsonPropertyDescription("measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the minimum within the collection interval")

+    private Double diskWeightedIoTimeMin;

+    /**

+     * average number of write commands issued per second to the disk over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskWriteCommandsAvg")

+    @JsonPropertyDescription("average number of write commands issued per second to the disk over the measurementInterval")

+    private Double diskWriteCommandsAvg;

+

+    /**

+     * number of bus resets over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskBusResets")

+    public Double getDiskBusResets() {

+        return diskBusResets;

+    }

+

+    /**

+     * number of bus resets over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskBusResets")

+    public void setDiskBusResets(Double diskBusResets) {

+        this.diskBusResets = diskBusResets;

+    }

+

+    /**

+     * number of disk commands aborted over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskCommandsAborted")

+    public Double getDiskCommandsAborted() {

+        return diskCommandsAborted;

+    }

+

+    /**

+     * number of disk commands aborted over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskCommandsAborted")

+    public void setDiskCommandsAborted(Double diskCommandsAborted) {

+        this.diskCommandsAborted = diskCommandsAborted;

+    }

+

+    /**

+     * average number of commands per second over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskCommandsAvg")

+    public Double getDiskCommandsAvg() {

+        return diskCommandsAvg;

+    }

+

+    /**

+     * average number of commands per second over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskCommandsAvg")

+    public void setDiskCommandsAvg(Double diskCommandsAvg) {

+        this.diskCommandsAvg = diskCommandsAvg;

+    }

+

+    /**

+     * total flush requests of the disk cache over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskFlushRequests")

+    public Double getDiskFlushRequests() {

+        return diskFlushRequests;

+    }

+

+    /**

+     * total flush requests of the disk cache over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskFlushRequests")

+    public void setDiskFlushRequests(Double diskFlushRequests) {

+        this.diskFlushRequests = diskFlushRequests;

+    }

+

+    /**

+     * milliseconds spent on disk cache flushing over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskFlushTime")

+    public Double getDiskFlushTime() {

+        return diskFlushTime;

+    }

+

+    /**

+     * milliseconds spent on disk cache flushing over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskFlushTime")

+    public void setDiskFlushTime(Double diskFlushTime) {

+        this.diskFlushTime = diskFlushTime;

+    }

+

+    /**

+     * disk identifier

+     * (Required)

+     * 

+     */

+    @JsonProperty("diskIdentifier")

+    public String getDiskIdentifier() {

+        return diskIdentifier;

+    }

+

+    /**

+     * disk identifier

+     * (Required)

+     * 

+     */

+    @JsonProperty("diskIdentifier")

+    public void setDiskIdentifier(String diskIdentifier) {

+        this.diskIdentifier = diskIdentifier;

+    }

+

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeAvg")

+    public Double getDiskIoTimeAvg() {

+        return diskIoTimeAvg;

+    }

+

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeAvg")

+    public void setDiskIoTimeAvg(Double diskIoTimeAvg) {

+        this.diskIoTimeAvg = diskIoTimeAvg;

+    }

+

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeLast")

+    public Double getDiskIoTimeLast() {

+        return diskIoTimeLast;

+    }

+

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeLast")

+    public void setDiskIoTimeLast(Double diskIoTimeLast) {

+        this.diskIoTimeLast = diskIoTimeLast;

+    }

+

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeMax")

+    public Double getDiskIoTimeMax() {

+        return diskIoTimeMax;

+    }

+

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeMax")

+    public void setDiskIoTimeMax(Double diskIoTimeMax) {

+        this.diskIoTimeMax = diskIoTimeMax;

+    }

+

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeMin")

+    public Double getDiskIoTimeMin() {

+        return diskIoTimeMin;

+    }

+

+    /**

+     * milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskIoTimeMin")

+    public void setDiskIoTimeMin(Double diskIoTimeMin) {

+        this.diskIoTimeMin = diskIoTimeMin;

+    }

+

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadAvg")

+    public Double getDiskMergedReadAvg() {

+        return diskMergedReadAvg;

+    }

+

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadAvg")

+    public void setDiskMergedReadAvg(Double diskMergedReadAvg) {

+        this.diskMergedReadAvg = diskMergedReadAvg;

+    }

+

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadLast")

+    public Double getDiskMergedReadLast() {

+        return diskMergedReadLast;

+    }

+

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadLast")

+    public void setDiskMergedReadLast(Double diskMergedReadLast) {

+        this.diskMergedReadLast = diskMergedReadLast;

+    }

+

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadMax")

+    public Double getDiskMergedReadMax() {

+        return diskMergedReadMax;

+    }

+

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadMax")

+    public void setDiskMergedReadMax(Double diskMergedReadMax) {

+        this.diskMergedReadMax = diskMergedReadMax;

+    }

+

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadMin")

+    public Double getDiskMergedReadMin() {

+        return diskMergedReadMin;

+    }

+

+    /**

+     * number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedReadMin")

+    public void setDiskMergedReadMin(Double diskMergedReadMin) {

+        this.diskMergedReadMin = diskMergedReadMin;

+    }

+

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteAvg")

+    public Double getDiskMergedWriteAvg() {

+        return diskMergedWriteAvg;

+    }

+

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteAvg")

+    public void setDiskMergedWriteAvg(Double diskMergedWriteAvg) {

+        this.diskMergedWriteAvg = diskMergedWriteAvg;

+    }

+

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteLast")

+    public Double getDiskMergedWriteLast() {

+        return diskMergedWriteLast;

+    }

+

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteLast")

+    public void setDiskMergedWriteLast(Double diskMergedWriteLast) {

+        this.diskMergedWriteLast = diskMergedWriteLast;

+    }

+

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteMax")

+    public Double getDiskMergedWriteMax() {

+        return diskMergedWriteMax;

+    }

+

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteMax")

+    public void setDiskMergedWriteMax(Double diskMergedWriteMax) {

+        this.diskMergedWriteMax = diskMergedWriteMax;

+    }

+

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteMin")

+    public Double getDiskMergedWriteMin() {

+        return diskMergedWriteMin;

+    }

+

+    /**

+     * number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskMergedWriteMin")

+    public void setDiskMergedWriteMin(Double diskMergedWriteMin) {

+        this.diskMergedWriteMin = diskMergedWriteMin;

+    }

+

+    /**

+     * number of octets per second read from a disk or partition; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadAvg")

+    public Double getDiskOctetsReadAvg() {

+        return diskOctetsReadAvg;

+    }

+

+    /**

+     * number of octets per second read from a disk or partition; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadAvg")

+    public void setDiskOctetsReadAvg(Double diskOctetsReadAvg) {

+        this.diskOctetsReadAvg = diskOctetsReadAvg;

+    }

+

+    /**

+     * number of octets per second read from a disk or partition; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadLast")

+    public Double getDiskOctetsReadLast() {

+        return diskOctetsReadLast;

+    }

+

+    /**

+     * number of octets per second read from a disk or partition; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadLast")

+    public void setDiskOctetsReadLast(Double diskOctetsReadLast) {

+        this.diskOctetsReadLast = diskOctetsReadLast;

+    }

+

+    /**

+     * number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadMax")

+    public Double getDiskOctetsReadMax() {

+        return diskOctetsReadMax;

+    }

+

+    /**

+     * number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadMax")

+    public void setDiskOctetsReadMax(Double diskOctetsReadMax) {

+        this.diskOctetsReadMax = diskOctetsReadMax;

+    }

+

+    /**

+     * number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadMin")

+    public Double getDiskOctetsReadMin() {

+        return diskOctetsReadMin;

+    }

+

+    /**

+     * number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsReadMin")

+    public void setDiskOctetsReadMin(Double diskOctetsReadMin) {

+        this.diskOctetsReadMin = diskOctetsReadMin;

+    }

+

+    /**

+     * number of octets per second written to a disk or partition; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteAvg")

+    public Double getDiskOctetsWriteAvg() {

+        return diskOctetsWriteAvg;

+    }

+

+    /**

+     * number of octets per second written to a disk or partition; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteAvg")

+    public void setDiskOctetsWriteAvg(Double diskOctetsWriteAvg) {

+        this.diskOctetsWriteAvg = diskOctetsWriteAvg;

+    }

+

+    /**

+     * number of octets per second written to a disk or partition; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteLast")

+    public Double getDiskOctetsWriteLast() {

+        return diskOctetsWriteLast;

+    }

+

+    /**

+     * number of octets per second written to a disk or partition; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteLast")

+    public void setDiskOctetsWriteLast(Double diskOctetsWriteLast) {

+        this.diskOctetsWriteLast = diskOctetsWriteLast;

+    }

+

+    /**

+     * number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteMax")

+    public Double getDiskOctetsWriteMax() {

+        return diskOctetsWriteMax;

+    }

+

+    /**

+     * number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteMax")

+    public void setDiskOctetsWriteMax(Double diskOctetsWriteMax) {

+        this.diskOctetsWriteMax = diskOctetsWriteMax;

+    }

+

+    /**

+     * number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteMin")

+    public Double getDiskOctetsWriteMin() {

+        return diskOctetsWriteMin;

+    }

+

+    /**

+     * number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOctetsWriteMin")

+    public void setDiskOctetsWriteMin(Double diskOctetsWriteMin) {

+        this.diskOctetsWriteMin = diskOctetsWriteMin;

+    }

+

+    /**

+     * number of read operations per second issued to the disk; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadAvg")

+    public Double getDiskOpsReadAvg() {

+        return diskOpsReadAvg;

+    }

+

+    /**

+     * number of read operations per second issued to the disk; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadAvg")

+    public void setDiskOpsReadAvg(Double diskOpsReadAvg) {

+        this.diskOpsReadAvg = diskOpsReadAvg;

+    }

+

+    /**

+     * number of read operations per second issued to the disk; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadLast")

+    public Double getDiskOpsReadLast() {

+        return diskOpsReadLast;

+    }

+

+    /**

+     * number of read operations per second issued to the disk; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadLast")

+    public void setDiskOpsReadLast(Double diskOpsReadLast) {

+        this.diskOpsReadLast = diskOpsReadLast;

+    }

+

+    /**

+     * number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadMax")

+    public Double getDiskOpsReadMax() {

+        return diskOpsReadMax;

+    }

+

+    /**

+     * number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadMax")

+    public void setDiskOpsReadMax(Double diskOpsReadMax) {

+        this.diskOpsReadMax = diskOpsReadMax;

+    }

+

+    /**

+     * number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadMin")

+    public Double getDiskOpsReadMin() {

+        return diskOpsReadMin;

+    }

+

+    /**

+     * number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsReadMin")

+    public void setDiskOpsReadMin(Double diskOpsReadMin) {

+        this.diskOpsReadMin = diskOpsReadMin;

+    }

+

+    /**

+     * number of write operations per second issued to the disk; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteAvg")

+    public Double getDiskOpsWriteAvg() {

+        return diskOpsWriteAvg;

+    }

+

+    /**

+     * number of write operations per second issued to the disk; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteAvg")

+    public void setDiskOpsWriteAvg(Double diskOpsWriteAvg) {

+        this.diskOpsWriteAvg = diskOpsWriteAvg;

+    }

+

+    /**

+     * number of write operations per second issued to the disk; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteLast")

+    public Double getDiskOpsWriteLast() {

+        return diskOpsWriteLast;

+    }

+

+    /**

+     * number of write operations per second issued to the disk; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteLast")

+    public void setDiskOpsWriteLast(Double diskOpsWriteLast) {

+        this.diskOpsWriteLast = diskOpsWriteLast;

+    }

+

+    /**

+     * number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteMax")

+    public Double getDiskOpsWriteMax() {

+        return diskOpsWriteMax;

+    }

+

+    /**

+     * number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteMax")

+    public void setDiskOpsWriteMax(Double diskOpsWriteMax) {

+        this.diskOpsWriteMax = diskOpsWriteMax;

+    }

+

+    /**

+     * number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteMin")

+    public Double getDiskOpsWriteMin() {

+        return diskOpsWriteMin;

+    }

+

+    /**

+     * number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskOpsWriteMin")

+    public void setDiskOpsWriteMin(Double diskOpsWriteMin) {

+        this.diskOpsWriteMin = diskOpsWriteMin;

+    }

+

+    /**

+     * queue size of pending I/O operations per second; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsAvg")

+    public Double getDiskPendingOperationsAvg() {

+        return diskPendingOperationsAvg;

+    }

+

+    /**

+     * queue size of pending I/O operations per second; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsAvg")

+    public void setDiskPendingOperationsAvg(Double diskPendingOperationsAvg) {

+        this.diskPendingOperationsAvg = diskPendingOperationsAvg;

+    }

+

+    /**

+     * queue size of pending I/O operations per second; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsLast")

+    public Double getDiskPendingOperationsLast() {

+        return diskPendingOperationsLast;

+    }

+

+    /**

+     * queue size of pending I/O operations per second; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsLast")

+    public void setDiskPendingOperationsLast(Double diskPendingOperationsLast) {

+        this.diskPendingOperationsLast = diskPendingOperationsLast;

+    }

+

+    /**

+     * queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsMax")

+    public Double getDiskPendingOperationsMax() {

+        return diskPendingOperationsMax;

+    }

+

+    /**

+     * queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsMax")

+    public void setDiskPendingOperationsMax(Double diskPendingOperationsMax) {

+        this.diskPendingOperationsMax = diskPendingOperationsMax;

+    }

+

+    /**

+     * queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsMin")

+    public Double getDiskPendingOperationsMin() {

+        return diskPendingOperationsMin;

+    }

+

+    /**

+     * queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskPendingOperationsMin")

+    public void setDiskPendingOperationsMin(Double diskPendingOperationsMin) {

+        this.diskPendingOperationsMin = diskPendingOperationsMin;

+    }

+

+    /**

+     * average number of read commands issued per second to the disk over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskReadCommandsAvg")

+    public Double getDiskReadCommandsAvg() {

+        return diskReadCommandsAvg;

+    }

+

+    /**

+     * average number of read commands issued per second to the disk over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskReadCommandsAvg")

+    public void setDiskReadCommandsAvg(Double diskReadCommandsAvg) {

+        this.diskReadCommandsAvg = diskReadCommandsAvg;

+    }

+

+    /**

+     * nanoseconds spent on disk cache reads/writes within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTime")

+    public Double getDiskTime() {

+        return diskTime;

+    }

+

+    /**

+     * nanoseconds spent on disk cache reads/writes within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTime")

+    public void setDiskTime(Double diskTime) {

+        this.diskTime = diskTime;

+    }

+

+    /**

+     * milliseconds a read operation took to complete; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadAvg")

+    public Double getDiskTimeReadAvg() {

+        return diskTimeReadAvg;

+    }

+

+    /**

+     * milliseconds a read operation took to complete; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadAvg")

+    public void setDiskTimeReadAvg(Double diskTimeReadAvg) {

+        this.diskTimeReadAvg = diskTimeReadAvg;

+    }

+

+    /**

+     * milliseconds a read operation took to complete; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadLast")

+    public Double getDiskTimeReadLast() {

+        return diskTimeReadLast;

+    }

+

+    /**

+     * milliseconds a read operation took to complete; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadLast")

+    public void setDiskTimeReadLast(Double diskTimeReadLast) {

+        this.diskTimeReadLast = diskTimeReadLast;

+    }

+

+    /**

+     * milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadMax")

+    public Double getDiskTimeReadMax() {

+        return diskTimeReadMax;

+    }

+

+    /**

+     * milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadMax")

+    public void setDiskTimeReadMax(Double diskTimeReadMax) {

+        this.diskTimeReadMax = diskTimeReadMax;

+    }

+

+    /**

+     * milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadMin")

+    public Double getDiskTimeReadMin() {

+        return diskTimeReadMin;

+    }

+

+    /**

+     * milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeReadMin")

+    public void setDiskTimeReadMin(Double diskTimeReadMin) {

+        this.diskTimeReadMin = diskTimeReadMin;

+    }

+

+    /**

+     * milliseconds a write operation took to complete; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteAvg")

+    public Double getDiskTimeWriteAvg() {

+        return diskTimeWriteAvg;

+    }

+

+    /**

+     * milliseconds a write operation took to complete; provide the average measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteAvg")

+    public void setDiskTimeWriteAvg(Double diskTimeWriteAvg) {

+        this.diskTimeWriteAvg = diskTimeWriteAvg;

+    }

+

+    /**

+     * milliseconds a write operation took to complete; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteLast")

+    public Double getDiskTimeWriteLast() {

+        return diskTimeWriteLast;

+    }

+

+    /**

+     * milliseconds a write operation took to complete; provide the last measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteLast")

+    public void setDiskTimeWriteLast(Double diskTimeWriteLast) {

+        this.diskTimeWriteLast = diskTimeWriteLast;

+    }

+

+    /**

+     * milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteMax")

+    public Double getDiskTimeWriteMax() {

+        return diskTimeWriteMax;

+    }

+

+    /**

+     * milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteMax")

+    public void setDiskTimeWriteMax(Double diskTimeWriteMax) {

+        this.diskTimeWriteMax = diskTimeWriteMax;

+    }

+

+    /**

+     * milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteMin")

+    public Double getDiskTimeWriteMin() {

+        return diskTimeWriteMin;

+    }

+

+    /**

+     * milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval

+     * 

+     */

+    @JsonProperty("diskTimeWriteMin")

+    public void setDiskTimeWriteMin(Double diskTimeWriteMin) {

+        this.diskTimeWriteMin = diskTimeWriteMin;

+    }

+

+    /**

+     * average read time from the perspective of a Guest OS: sum of the Kernel Read Latency and Physical Device Read Latency in milliseconds over the measurement interval

+     * 

+     */

+    @JsonProperty("diskTotalReadLatencyAvg")

+    public Double getDiskTotalReadLatencyAvg() {

+        return diskTotalReadLatencyAvg;

+    }

+

+    /**

+     * average read time from the perspective of a Guest OS: sum of the Kernel Read Latency and Physical Device Read Latency in milliseconds over the measurement interval

+     * 

+     */

+    @JsonProperty("diskTotalReadLatencyAvg")

+    public void setDiskTotalReadLatencyAvg(Double diskTotalReadLatencyAvg) {

+        this.diskTotalReadLatencyAvg = diskTotalReadLatencyAvg;

+    }

+

+    /**

+     * average write time from the perspective of a Guest OS: sum of the Kernel Write Latency and Physical Device Write Latency in milliseconds over the measurement interval

+     * 

+     */

+    @JsonProperty("diskTotalWriteLatencyAvg")

+    public Double getDiskTotalWriteLatencyAvg() {

+        return diskTotalWriteLatencyAvg;

+    }

+

+    /**

+     * average write time from the perspective of a Guest OS: sum of the Kernel Write Latency and Physical Device Write Latency in milliseconds over the measurement interval

+     * 

+     */

+    @JsonProperty("diskTotalWriteLatencyAvg")

+    public void setDiskTotalWriteLatencyAvg(Double diskTotalWriteLatencyAvg) {

+        this.diskTotalWriteLatencyAvg = diskTotalWriteLatencyAvg;

+    }

+

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the average within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeAvg")

+    public Double getDiskWeightedIoTimeAvg() {

+        return diskWeightedIoTimeAvg;

+    }

+

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the average within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeAvg")

+    public void setDiskWeightedIoTimeAvg(Double diskWeightedIoTimeAvg) {

+        this.diskWeightedIoTimeAvg = diskWeightedIoTimeAvg;

+    }

+

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the last within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeLast")

+    public Double getDiskWeightedIoTimeLast() {

+        return diskWeightedIoTimeLast;

+    }

+

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the last within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeLast")

+    public void setDiskWeightedIoTimeLast(Double diskWeightedIoTimeLast) {

+        this.diskWeightedIoTimeLast = diskWeightedIoTimeLast;

+    }

+

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the maximum within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeMax")

+    public Double getDiskWeightedIoTimeMax() {

+        return diskWeightedIoTimeMax;

+    }

+

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the maximum within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeMax")

+    public void setDiskWeightedIoTimeMax(Double diskWeightedIoTimeMax) {

+        this.diskWeightedIoTimeMax = diskWeightedIoTimeMax;

+    }

+

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the minimum within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeMin")

+    public Double getDiskWeightedIoTimeMin() {

+        return diskWeightedIoTimeMin;

+    }

+

+    /**

+     * measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the minimum within the collection interval

+     * 

+     */

+    @JsonProperty("diskWeightedIoTimeMin")

+    public void setDiskWeightedIoTimeMin(Double diskWeightedIoTimeMin) {

+        this.diskWeightedIoTimeMin = diskWeightedIoTimeMin;

+    }

+

+    /**

+     * average number of write commands issued per second to the disk over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskWriteCommandsAvg")

+    public Double getDiskWriteCommandsAvg() {

+        return diskWriteCommandsAvg;

+    }

+

+    /**

+     * average number of write commands issued per second to the disk over the measurementInterval

+     * 

+     */

+    @JsonProperty("diskWriteCommandsAvg")

+    public void setDiskWriteCommandsAvg(Double diskWriteCommandsAvg) {

+        this.diskWriteCommandsAvg = diskWriteCommandsAvg;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(diskBusResets).append(diskCommandsAborted).append(diskCommandsAvg).append(diskFlushRequests).append(diskFlushTime).append(diskIdentifier).append(diskIoTimeAvg).append(diskIoTimeLast).append(diskIoTimeMax).append(diskIoTimeMin).append(diskMergedReadAvg).append(diskMergedReadLast).append(diskMergedReadMax).append(diskMergedReadMin).append(diskMergedWriteAvg).append(diskMergedWriteLast).append(diskMergedWriteMax).append(diskMergedWriteMin).append(diskOctetsReadAvg).append(diskOctetsReadLast).append(diskOctetsReadMax).append(diskOctetsReadMin).append(diskOctetsWriteAvg).append(diskOctetsWriteLast).append(diskOctetsWriteMax).append(diskOctetsWriteMin).append(diskOpsReadAvg).append(diskOpsReadLast).append(diskOpsReadMax).append(diskOpsReadMin).append(diskOpsWriteAvg).append(diskOpsWriteLast).append(diskOpsWriteMax).append(diskOpsWriteMin).append(diskPendingOperationsAvg).append(diskPendingOperationsLast).append(diskPendingOperationsMax).append(diskPendingOperationsMin).append(diskReadCommandsAvg).append(diskTime).append(diskTimeReadAvg).append(diskTimeReadLast).append(diskTimeReadMax).append(diskTimeReadMin).append(diskTimeWriteAvg).append(diskTimeWriteLast).append(diskTimeWriteMax).append(diskTimeWriteMin).append(diskTotalReadLatencyAvg).append(diskTotalWriteLatencyAvg).append(diskWeightedIoTimeAvg).append(diskWeightedIoTimeLast).append(diskWeightedIoTimeMax).append(diskWeightedIoTimeMin).append(diskWriteCommandsAvg).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof DiskUsageArray) == false) {

+            return false;

+        }

+        DiskUsageArray rhs = ((DiskUsageArray) other);

+        return new EqualsBuilder().append(diskBusResets, rhs.diskBusResets).append(diskCommandsAborted, rhs.diskCommandsAborted).append(diskCommandsAvg, rhs.diskCommandsAvg).append(diskFlushRequests, rhs.diskFlushRequests).append(diskFlushTime, rhs.diskFlushTime).append(diskIdentifier, rhs.diskIdentifier).append(diskIoTimeAvg, rhs.diskIoTimeAvg).append(diskIoTimeLast, rhs.diskIoTimeLast).append(diskIoTimeMax, rhs.diskIoTimeMax).append(diskIoTimeMin, rhs.diskIoTimeMin).append(diskMergedReadAvg, rhs.diskMergedReadAvg).append(diskMergedReadLast, rhs.diskMergedReadLast).append(diskMergedReadMax, rhs.diskMergedReadMax).append(diskMergedReadMin, rhs.diskMergedReadMin).append(diskMergedWriteAvg, rhs.diskMergedWriteAvg).append(diskMergedWriteLast, rhs.diskMergedWriteLast).append(diskMergedWriteMax, rhs.diskMergedWriteMax).append(diskMergedWriteMin, rhs.diskMergedWriteMin).append(diskOctetsReadAvg, rhs.diskOctetsReadAvg).append(diskOctetsReadLast, rhs.diskOctetsReadLast).append(diskOctetsReadMax, rhs.diskOctetsReadMax).append(diskOctetsReadMin, rhs.diskOctetsReadMin).append(diskOctetsWriteAvg, rhs.diskOctetsWriteAvg).append(diskOctetsWriteLast, rhs.diskOctetsWriteLast).append(diskOctetsWriteMax, rhs.diskOctetsWriteMax).append(diskOctetsWriteMin, rhs.diskOctetsWriteMin).append(diskOpsReadAvg, rhs.diskOpsReadAvg).append(diskOpsReadLast, rhs.diskOpsReadLast).append(diskOpsReadMax, rhs.diskOpsReadMax).append(diskOpsReadMin, rhs.diskOpsReadMin).append(diskOpsWriteAvg, rhs.diskOpsWriteAvg).append(diskOpsWriteLast, rhs.diskOpsWriteLast).append(diskOpsWriteMax, rhs.diskOpsWriteMax).append(diskOpsWriteMin, rhs.diskOpsWriteMin).append(diskPendingOperationsAvg, rhs.diskPendingOperationsAvg).append(diskPendingOperationsLast, rhs.diskPendingOperationsLast).append(diskPendingOperationsMax, rhs.diskPendingOperationsMax).append(diskPendingOperationsMin, rhs.diskPendingOperationsMin).append(diskReadCommandsAvg, rhs.diskReadCommandsAvg).append(diskTime, rhs.diskTime).append(diskTimeReadAvg, rhs.diskTimeReadAvg).append(diskTimeReadLast, rhs.diskTimeReadLast).append(diskTimeReadMax, rhs.diskTimeReadMax).append(diskTimeReadMin, rhs.diskTimeReadMin).append(diskTimeWriteAvg, rhs.diskTimeWriteAvg).append(diskTimeWriteLast, rhs.diskTimeWriteLast).append(diskTimeWriteMax, rhs.diskTimeWriteMax).append(diskTimeWriteMin, rhs.diskTimeWriteMin).append(diskTotalReadLatencyAvg, rhs.diskTotalReadLatencyAvg).append(diskTotalWriteLatencyAvg, rhs.diskTotalWriteLatencyAvg).append(diskWeightedIoTimeAvg, rhs.diskWeightedIoTimeAvg).append(diskWeightedIoTimeLast, rhs.diskWeightedIoTimeLast).append(diskWeightedIoTimeMax, rhs.diskWeightedIoTimeMax).append(diskWeightedIoTimeMin, rhs.diskWeightedIoTimeMin).append(diskWriteCommandsAvg, rhs.diskWriteCommandsAvg).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/EndOfCallVqmSummaries.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/EndOfCallVqmSummaries.java
new file mode 100644
index 0000000..5ddbe43
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/EndOfCallVqmSummaries.java
@@ -0,0 +1,866 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * provides end of call voice quality metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "adjacencyName",

+    "endpointAverageJitter",

+    "endpointDescription",

+    "endpointMaxJitter",

+    "endpointRtpOctetsDiscarded",

+    "endpointRtpOctetsLost",

+    "endpointRtpOctetsReceived",

+    "endpointRtpOctetsSent",

+    "endpointRtpPacketsDiscarded",

+    "endpointRtpPacketsLost",

+    "endpointRtpPacketsReceived",

+    "endpointRtpPacketsSent",

+    "localAverageJitter",

+    "localAverageJitterBufferDelay",

+    "localMaxJitter",

+    "localMaxJitterBufferDelay",

+    "localRtpOctetsDiscarded",

+    "localRtpOctetsLost",

+    "localRtpOctetsReceived",

+    "localRtpOctetsSent",

+    "localRtpPacketsDiscarded",

+    "localRtpPacketsLost",

+    "localRtpPacketsReceived",

+    "localRtpPacketsSent",

+    "mosCqe",

+    "oneWayDelay",

+    "packetLossPercent",

+    "rFactor",

+    "roundTripDelay"

+})

+public class EndOfCallVqmSummaries {

+

+    /**

+     *  adjacency name

+     * (Required)

+     * 

+     */

+    @JsonProperty("adjacencyName")

+    @JsonPropertyDescription(" adjacency name")

+    private String adjacencyName;

+    /**

+     * endpoint average jitter

+     * 

+     */

+    @JsonProperty("endpointAverageJitter")

+    @JsonPropertyDescription("endpoint average jitter")

+    private Double endpointAverageJitter;

+    /**

+     * either Caller or Callee

+     * (Required)

+     * 

+     */

+    @JsonProperty("endpointDescription")

+    @JsonPropertyDescription("either Caller or Callee")

+    private EndOfCallVqmSummaries.EndpointDescription endpointDescription;

+    /**

+     * endpoint maximum jitter

+     * 

+     */

+    @JsonProperty("endpointMaxJitter")

+    @JsonPropertyDescription("endpoint maximum jitter")

+    private Double endpointMaxJitter;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsDiscarded")

+    @JsonPropertyDescription("")

+    private Double endpointRtpOctetsDiscarded;

+    /**

+     * endpoint RTP octets lost

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsLost")

+    @JsonPropertyDescription("endpoint RTP octets lost")

+    private Double endpointRtpOctetsLost;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsReceived")

+    @JsonPropertyDescription("")

+    private Double endpointRtpOctetsReceived;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsSent")

+    @JsonPropertyDescription("")

+    private Double endpointRtpOctetsSent;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsDiscarded")

+    @JsonPropertyDescription("")

+    private Double endpointRtpPacketsDiscarded;

+    /**

+     * endpoint RTP packets lost

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsLost")

+    @JsonPropertyDescription("endpoint RTP packets lost")

+    private Double endpointRtpPacketsLost;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsReceived")

+    @JsonPropertyDescription("")

+    private Double endpointRtpPacketsReceived;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsSent")

+    @JsonPropertyDescription("")

+    private Double endpointRtpPacketsSent;

+    /**

+     * Local average jitter

+     * 

+     */

+    @JsonProperty("localAverageJitter")

+    @JsonPropertyDescription("Local average jitter")

+    private Double localAverageJitter;

+    /**

+     * Local average jitter delay

+     * 

+     */

+    @JsonProperty("localAverageJitterBufferDelay")

+    @JsonPropertyDescription("Local average jitter delay")

+    private Double localAverageJitterBufferDelay;

+    /**

+     * Local maximum jitter

+     * 

+     */

+    @JsonProperty("localMaxJitter")

+    @JsonPropertyDescription("Local maximum jitter")

+    private Double localMaxJitter;

+    /**

+     * Local maximum jitter delay

+     * 

+     */

+    @JsonProperty("localMaxJitterBufferDelay")

+    @JsonPropertyDescription("Local maximum jitter delay")

+    private Double localMaxJitterBufferDelay;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpOctetsDiscarded")

+    @JsonPropertyDescription("")

+    private Double localRtpOctetsDiscarded;

+    /**

+     * Local RTP octets lost

+     * 

+     */

+    @JsonProperty("localRtpOctetsLost")

+    @JsonPropertyDescription("Local RTP octets lost")

+    private Double localRtpOctetsLost;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpOctetsReceived")

+    @JsonPropertyDescription("")

+    private Double localRtpOctetsReceived;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpOctetsSent")

+    @JsonPropertyDescription("")

+    private Double localRtpOctetsSent;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpPacketsDiscarded")

+    @JsonPropertyDescription("")

+    private Double localRtpPacketsDiscarded;

+    /**

+     * Local RTP packets lost

+     * 

+     */

+    @JsonProperty("localRtpPacketsLost")

+    @JsonPropertyDescription("Local RTP packets lost")

+    private Double localRtpPacketsLost;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpPacketsReceived")

+    @JsonPropertyDescription("")

+    private Double localRtpPacketsReceived;

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpPacketsSent")

+    @JsonPropertyDescription("")

+    private Double localRtpPacketsSent;

+    /**

+     *  1-5 1dp

+     * 

+     */

+    @JsonProperty("mosCqe")

+    @JsonPropertyDescription("1-5 1dp")

+    private Double mosCqe;

+    /**

+     * one-way path delay in milliseconds

+     * 

+     */

+    @JsonProperty("oneWayDelay")

+    @JsonPropertyDescription("one-way path delay in milliseconds")

+    private Double oneWayDelay;

+    /**

+     * Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)

+     * 

+     */

+    @JsonProperty("packetLossPercent")

+    @JsonPropertyDescription("Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)")

+    private Double packetLossPercent;

+    /**

+     *  0-100

+     * 

+     */

+    @JsonProperty("rFactor")

+    @JsonPropertyDescription("0-100")

+    private Double rFactor;

+    /**

+     * millisecs

+     * 

+     */

+    @JsonProperty("roundTripDelay")

+    @JsonPropertyDescription("millisecs")

+    private Double roundTripDelay;

+

+    /**

+     *  adjacency name

+     * (Required)

+     * 

+     */

+    @JsonProperty("adjacencyName")

+    public String getAdjacencyName() {

+        return adjacencyName;

+    }

+

+    /**

+     *  adjacency name

+     * (Required)

+     * 

+     */

+    @JsonProperty("adjacencyName")

+    public void setAdjacencyName(String adjacencyName) {

+        this.adjacencyName = adjacencyName;

+    }

+

+    /**

+     * endpoint average jitter

+     * 

+     */

+    @JsonProperty("endpointAverageJitter")

+    public Double getEndpointAverageJitter() {

+        return endpointAverageJitter;

+    }

+

+    /**

+     * endpoint average jitter

+     * 

+     */

+    @JsonProperty("endpointAverageJitter")

+    public void setEndpointAverageJitter(Double endpointAverageJitter) {

+        this.endpointAverageJitter = endpointAverageJitter;

+    }

+

+    /**

+     * either Caller or Callee

+     * (Required)

+     * 

+     */

+    @JsonProperty("endpointDescription")

+    public EndOfCallVqmSummaries.EndpointDescription getEndpointDescription() {

+        return endpointDescription;

+    }

+

+    /**

+     * either Caller or Callee

+     * (Required)

+     * 

+     */

+    @JsonProperty("endpointDescription")

+    public void setEndpointDescription(EndOfCallVqmSummaries.EndpointDescription endpointDescription) {

+        this.endpointDescription = endpointDescription;

+    }

+

+    /**

+     * endpoint maximum jitter

+     * 

+     */

+    @JsonProperty("endpointMaxJitter")

+    public Double getEndpointMaxJitter() {

+        return endpointMaxJitter;

+    }

+

+    /**

+     * endpoint maximum jitter

+     * 

+     */

+    @JsonProperty("endpointMaxJitter")

+    public void setEndpointMaxJitter(Double endpointMaxJitter) {

+        this.endpointMaxJitter = endpointMaxJitter;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsDiscarded")

+    public Double getEndpointRtpOctetsDiscarded() {

+        return endpointRtpOctetsDiscarded;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsDiscarded")

+    public void setEndpointRtpOctetsDiscarded(Double endpointRtpOctetsDiscarded) {

+        this.endpointRtpOctetsDiscarded = endpointRtpOctetsDiscarded;

+    }

+

+    /**

+     * endpoint RTP octets lost

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsLost")

+    public Double getEndpointRtpOctetsLost() {

+        return endpointRtpOctetsLost;

+    }

+

+    /**

+     * endpoint RTP octets lost

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsLost")

+    public void setEndpointRtpOctetsLost(Double endpointRtpOctetsLost) {

+        this.endpointRtpOctetsLost = endpointRtpOctetsLost;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsReceived")

+    public Double getEndpointRtpOctetsReceived() {

+        return endpointRtpOctetsReceived;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsReceived")

+    public void setEndpointRtpOctetsReceived(Double endpointRtpOctetsReceived) {

+        this.endpointRtpOctetsReceived = endpointRtpOctetsReceived;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsSent")

+    public Double getEndpointRtpOctetsSent() {

+        return endpointRtpOctetsSent;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpOctetsSent")

+    public void setEndpointRtpOctetsSent(Double endpointRtpOctetsSent) {

+        this.endpointRtpOctetsSent = endpointRtpOctetsSent;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsDiscarded")

+    public Double getEndpointRtpPacketsDiscarded() {

+        return endpointRtpPacketsDiscarded;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsDiscarded")

+    public void setEndpointRtpPacketsDiscarded(Double endpointRtpPacketsDiscarded) {

+        this.endpointRtpPacketsDiscarded = endpointRtpPacketsDiscarded;

+    }

+

+    /**

+     * endpoint RTP packets lost

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsLost")

+    public Double getEndpointRtpPacketsLost() {

+        return endpointRtpPacketsLost;

+    }

+

+    /**

+     * endpoint RTP packets lost

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsLost")

+    public void setEndpointRtpPacketsLost(Double endpointRtpPacketsLost) {

+        this.endpointRtpPacketsLost = endpointRtpPacketsLost;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsReceived")

+    public Double getEndpointRtpPacketsReceived() {

+        return endpointRtpPacketsReceived;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsReceived")

+    public void setEndpointRtpPacketsReceived(Double endpointRtpPacketsReceived) {

+        this.endpointRtpPacketsReceived = endpointRtpPacketsReceived;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsSent")

+    public Double getEndpointRtpPacketsSent() {

+        return endpointRtpPacketsSent;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("endpointRtpPacketsSent")

+    public void setEndpointRtpPacketsSent(Double endpointRtpPacketsSent) {

+        this.endpointRtpPacketsSent = endpointRtpPacketsSent;

+    }

+

+    /**

+     * Local average jitter

+     * 

+     */

+    @JsonProperty("localAverageJitter")

+    public Double getLocalAverageJitter() {

+        return localAverageJitter;

+    }

+

+    /**

+     * Local average jitter

+     * 

+     */

+    @JsonProperty("localAverageJitter")

+    public void setLocalAverageJitter(Double localAverageJitter) {

+        this.localAverageJitter = localAverageJitter;

+    }

+

+    /**

+     * Local average jitter delay

+     * 

+     */

+    @JsonProperty("localAverageJitterBufferDelay")

+    public Double getLocalAverageJitterBufferDelay() {

+        return localAverageJitterBufferDelay;

+    }

+

+    /**

+     * Local average jitter delay

+     * 

+     */

+    @JsonProperty("localAverageJitterBufferDelay")

+    public void setLocalAverageJitterBufferDelay(Double localAverageJitterBufferDelay) {

+        this.localAverageJitterBufferDelay = localAverageJitterBufferDelay;

+    }

+

+    /**

+     * Local maximum jitter

+     * 

+     */

+    @JsonProperty("localMaxJitter")

+    public Double getLocalMaxJitter() {

+        return localMaxJitter;

+    }

+

+    /**

+     * Local maximum jitter

+     * 

+     */

+    @JsonProperty("localMaxJitter")

+    public void setLocalMaxJitter(Double localMaxJitter) {

+        this.localMaxJitter = localMaxJitter;

+    }

+

+    /**

+     * Local maximum jitter delay

+     * 

+     */

+    @JsonProperty("localMaxJitterBufferDelay")

+    public Double getLocalMaxJitterBufferDelay() {

+        return localMaxJitterBufferDelay;

+    }

+

+    /**

+     * Local maximum jitter delay

+     * 

+     */

+    @JsonProperty("localMaxJitterBufferDelay")

+    public void setLocalMaxJitterBufferDelay(Double localMaxJitterBufferDelay) {

+        this.localMaxJitterBufferDelay = localMaxJitterBufferDelay;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpOctetsDiscarded")

+    public Double getLocalRtpOctetsDiscarded() {

+        return localRtpOctetsDiscarded;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpOctetsDiscarded")

+    public void setLocalRtpOctetsDiscarded(Double localRtpOctetsDiscarded) {

+        this.localRtpOctetsDiscarded = localRtpOctetsDiscarded;

+    }

+

+    /**

+     * Local RTP octets lost

+     * 

+     */

+    @JsonProperty("localRtpOctetsLost")

+    public Double getLocalRtpOctetsLost() {

+        return localRtpOctetsLost;

+    }

+

+    /**

+     * Local RTP octets lost

+     * 

+     */

+    @JsonProperty("localRtpOctetsLost")

+    public void setLocalRtpOctetsLost(Double localRtpOctetsLost) {

+        this.localRtpOctetsLost = localRtpOctetsLost;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpOctetsReceived")

+    public Double getLocalRtpOctetsReceived() {

+        return localRtpOctetsReceived;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpOctetsReceived")

+    public void setLocalRtpOctetsReceived(Double localRtpOctetsReceived) {

+        this.localRtpOctetsReceived = localRtpOctetsReceived;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpOctetsSent")

+    public Double getLocalRtpOctetsSent() {

+        return localRtpOctetsSent;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpOctetsSent")

+    public void setLocalRtpOctetsSent(Double localRtpOctetsSent) {

+        this.localRtpOctetsSent = localRtpOctetsSent;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpPacketsDiscarded")

+    public Double getLocalRtpPacketsDiscarded() {

+        return localRtpPacketsDiscarded;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpPacketsDiscarded")

+    public void setLocalRtpPacketsDiscarded(Double localRtpPacketsDiscarded) {

+        this.localRtpPacketsDiscarded = localRtpPacketsDiscarded;

+    }

+

+    /**

+     * Local RTP packets lost

+     * 

+     */

+    @JsonProperty("localRtpPacketsLost")

+    public Double getLocalRtpPacketsLost() {

+        return localRtpPacketsLost;

+    }

+

+    /**

+     * Local RTP packets lost

+     * 

+     */

+    @JsonProperty("localRtpPacketsLost")

+    public void setLocalRtpPacketsLost(Double localRtpPacketsLost) {

+        this.localRtpPacketsLost = localRtpPacketsLost;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpPacketsReceived")

+    public Double getLocalRtpPacketsReceived() {

+        return localRtpPacketsReceived;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpPacketsReceived")

+    public void setLocalRtpPacketsReceived(Double localRtpPacketsReceived) {

+        this.localRtpPacketsReceived = localRtpPacketsReceived;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpPacketsSent")

+    public Double getLocalRtpPacketsSent() {

+        return localRtpPacketsSent;

+    }

+

+    /**

+     * 

+     * 

+     */

+    @JsonProperty("localRtpPacketsSent")

+    public void setLocalRtpPacketsSent(Double localRtpPacketsSent) {

+        this.localRtpPacketsSent = localRtpPacketsSent;

+    }

+

+    /**

+     *  1-5 1dp

+     * 

+     */

+    @JsonProperty("mosCqe")

+    public Double getMosCqe() {

+        return mosCqe;

+    }

+

+    /**

+     *  1-5 1dp

+     * 

+     */

+    @JsonProperty("mosCqe")

+    public void setMosCqe(Double mosCqe) {

+        this.mosCqe = mosCqe;

+    }

+

+    /**

+     * one-way path delay in milliseconds

+     * 

+     */

+    @JsonProperty("oneWayDelay")

+    public Double getOneWayDelay() {

+        return oneWayDelay;

+    }

+

+    /**

+     * one-way path delay in milliseconds

+     * 

+     */

+    @JsonProperty("oneWayDelay")

+    public void setOneWayDelay(Double oneWayDelay) {

+        this.oneWayDelay = oneWayDelay;

+    }

+

+    /**

+     * Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)

+     * 

+     */

+    @JsonProperty("packetLossPercent")

+    public Double getPacketLossPercent() {

+        return packetLossPercent;

+    }

+

+    /**

+     * Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)

+     * 

+     */

+    @JsonProperty("packetLossPercent")

+    public void setPacketLossPercent(Double packetLossPercent) {

+        this.packetLossPercent = packetLossPercent;

+    }

+

+    /**

+     *  0-100

+     * 

+     */

+    @JsonProperty("rFactor")

+    public Double getRFactor() {

+        return rFactor;

+    }

+

+    /**

+     *  0-100

+     * 

+     */

+    @JsonProperty("rFactor")

+    public void setRFactor(Double rFactor) {

+        this.rFactor = rFactor;

+    }

+

+    /**

+     * millisecs

+     * 

+     */

+    @JsonProperty("roundTripDelay")

+    public Double getRoundTripDelay() {

+        return roundTripDelay;

+    }

+

+    /**

+     * millisecs

+     * 

+     */

+    @JsonProperty("roundTripDelay")

+    public void setRoundTripDelay(Double roundTripDelay) {

+        this.roundTripDelay = roundTripDelay;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(adjacencyName).append(endpointAverageJitter).append(endpointDescription).append(endpointMaxJitter).append(endpointRtpOctetsDiscarded).append(endpointRtpOctetsLost).append(endpointRtpOctetsReceived).append(endpointRtpOctetsSent).append(endpointRtpPacketsDiscarded).append(endpointRtpPacketsLost).append(endpointRtpPacketsReceived).append(endpointRtpPacketsSent).append(localAverageJitter).append(localAverageJitterBufferDelay).append(localMaxJitter).append(localMaxJitterBufferDelay).append(localRtpOctetsDiscarded).append(localRtpOctetsLost).append(localRtpOctetsReceived).append(localRtpOctetsSent).append(localRtpPacketsDiscarded).append(localRtpPacketsLost).append(localRtpPacketsReceived).append(localRtpPacketsSent).append(mosCqe).append(oneWayDelay).append(packetLossPercent).append(rFactor).append(roundTripDelay).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof EndOfCallVqmSummaries) == false) {

+            return false;

+        }

+        EndOfCallVqmSummaries rhs = ((EndOfCallVqmSummaries) other);

+        return new EqualsBuilder().append(adjacencyName, rhs.adjacencyName).append(endpointAverageJitter, rhs.endpointAverageJitter).append(endpointDescription, rhs.endpointDescription).append(endpointMaxJitter, rhs.endpointMaxJitter).append(endpointRtpOctetsDiscarded, rhs.endpointRtpOctetsDiscarded).append(endpointRtpOctetsLost, rhs.endpointRtpOctetsLost).append(endpointRtpOctetsReceived, rhs.endpointRtpOctetsReceived).append(endpointRtpOctetsSent, rhs.endpointRtpOctetsSent).append(endpointRtpPacketsDiscarded, rhs.endpointRtpPacketsDiscarded).append(endpointRtpPacketsLost, rhs.endpointRtpPacketsLost).append(endpointRtpPacketsReceived, rhs.endpointRtpPacketsReceived).append(endpointRtpPacketsSent, rhs.endpointRtpPacketsSent).append(localAverageJitter, rhs.localAverageJitter).append(localAverageJitterBufferDelay, rhs.localAverageJitterBufferDelay).append(localMaxJitter, rhs.localMaxJitter).append(localMaxJitterBufferDelay, rhs.localMaxJitterBufferDelay).append(localRtpOctetsDiscarded, rhs.localRtpOctetsDiscarded).append(localRtpOctetsLost, rhs.localRtpOctetsLost).append(localRtpOctetsReceived, rhs.localRtpOctetsReceived).append(localRtpOctetsSent, rhs.localRtpOctetsSent).append(localRtpPacketsDiscarded, rhs.localRtpPacketsDiscarded).append(localRtpPacketsLost, rhs.localRtpPacketsLost).append(localRtpPacketsReceived, rhs.localRtpPacketsReceived).append(localRtpPacketsSent, rhs.localRtpPacketsSent).append(mosCqe, rhs.mosCqe).append(oneWayDelay, rhs.oneWayDelay).append(packetLossPercent, rhs.packetLossPercent).append(rFactor, rhs.rFactor).append(roundTripDelay, rhs.roundTripDelay).isEquals();

+    }

+

+    public enum EndpointDescription {

+

+        CALLER("Caller"),

+        CALLEE("Callee");

+        private final String value;

+        private final static Map<String, EndOfCallVqmSummaries.EndpointDescription> CONSTANTS = new HashMap<String, EndOfCallVqmSummaries.EndpointDescription>();

+

+        static {

+            for (EndOfCallVqmSummaries.EndpointDescription c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private EndpointDescription(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static EndOfCallVqmSummaries.EndpointDescription fromValue(String value) {

+            EndOfCallVqmSummaries.EndpointDescription constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Event.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Event.java
new file mode 100644
index 0000000..e2e6265
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Event.java
@@ -0,0 +1,404 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * the root level of the common event format

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "commonEventHeader",

+    "faultFields",

+    "heartbeatFields",

+    "measurementFields",

+    "mobileFlowFields",

+    "notificationFields",

+    "otherFields",

+    "pnfRegistrationFields",

+    "sipSignalingFields",

+    "stateChangeFields",

+    "syslogFields",

+    "thresholdCrossingAlertFields",

+    "voiceQualityFields"

+})

+public class Event {

+

+    /**

+     * fields common to all events

+     * (Required)

+     * 

+     */

+    @JsonProperty("commonEventHeader")

+    @JsonPropertyDescription("fields common to all events")

+    private CommonEventHeader commonEventHeader;

+    /**

+     * fields specific to fault events

+     * 

+     */

+    @JsonProperty("faultFields")

+    @JsonPropertyDescription("fields specific to fault events")

+    private FaultFields faultFields;

+    /**

+     * optional field block for fields specific to heartbeat events

+     * 

+     */

+    @JsonProperty("heartbeatFields")

+    @JsonPropertyDescription("optional field block for fields specific to heartbeat events")

+    private HeartbeatFields heartbeatFields;

+    /**

+     * measurement fields

+     * 

+     */

+    @JsonProperty("measurementFields")

+    @JsonPropertyDescription("measurement fields")

+    private MeasurementFields measurementFields;

+    /**

+     * mobileFlow fields

+     * 

+     */

+    @JsonProperty("mobileFlowFields")

+    @JsonPropertyDescription("mobileFlow fields")

+    private MobileFlowFields mobileFlowFields;

+    /**

+     * notification fields

+     * 

+     */

+    @JsonProperty("notificationFields")

+    @JsonPropertyDescription("notification fields")

+    private NotificationFields notificationFields;

+    /**

+     * fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration

+     * 

+     */

+    @JsonProperty("otherFields")

+    @JsonPropertyDescription("fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration")

+    private OtherFields otherFields;

+    /**

+     * hardware device registration fields

+     * 

+     */

+    @JsonProperty("pnfRegistrationFields")

+    @JsonPropertyDescription("hardware device registration fields")

+    private PnfRegistrationFields pnfRegistrationFields;

+    /**

+     * sip signaling fields

+     * 

+     */

+    @JsonProperty("sipSignalingFields")

+    @JsonPropertyDescription("sip signaling fields")

+    private SipSignalingFields sipSignalingFields;

+    /**

+     * stateChange fields

+     * 

+     */

+    @JsonProperty("stateChangeFields")

+    @JsonPropertyDescription("stateChange fields")

+    private StateChangeFields stateChangeFields;

+    /**

+     * sysLog fields

+     * 

+     */

+    @JsonProperty("syslogFields")

+    @JsonPropertyDescription("sysLog fields")

+    private SyslogFields syslogFields;

+    /**

+     * fields specific to threshold crossing alert events

+     * 

+     */

+    @JsonProperty("thresholdCrossingAlertFields")

+    @JsonPropertyDescription("fields specific to threshold crossing alert events")

+    private ThresholdCrossingAlertFields thresholdCrossingAlertFields;

+    /**

+     * provides statistics related to customer facing voice products

+     * 

+     */

+    @JsonProperty("voiceQualityFields")

+    @JsonPropertyDescription("provides statistics related to customer facing voice products")

+    private VoiceQualityFields voiceQualityFields;

+

+    /**

+     * fields common to all events

+     * (Required)

+     * 

+     */

+    @JsonProperty("commonEventHeader")

+    public CommonEventHeader getCommonEventHeader() {

+        return commonEventHeader;

+    }

+

+    /**

+     * fields common to all events

+     * (Required)

+     * 

+     */

+    @JsonProperty("commonEventHeader")

+    public void setCommonEventHeader(CommonEventHeader commonEventHeader) {

+        this.commonEventHeader = commonEventHeader;

+    }

+

+    /**

+     * fields specific to fault events

+     * 

+     */

+    @JsonProperty("faultFields")

+    public FaultFields getFaultFields() {

+        return faultFields;

+    }

+

+    /**

+     * fields specific to fault events

+     * 

+     */

+    @JsonProperty("faultFields")

+    public void setFaultFields(FaultFields faultFields) {

+        this.faultFields = faultFields;

+    }

+

+    /**

+     * optional field block for fields specific to heartbeat events

+     * 

+     */

+    @JsonProperty("heartbeatFields")

+    public HeartbeatFields getHeartbeatFields() {

+        return heartbeatFields;

+    }

+

+    /**

+     * optional field block for fields specific to heartbeat events

+     * 

+     */

+    @JsonProperty("heartbeatFields")

+    public void setHeartbeatFields(HeartbeatFields heartbeatFields) {

+        this.heartbeatFields = heartbeatFields;

+    }

+

+    /**

+     * measurement fields

+     * 

+     */

+    @JsonProperty("measurementFields")

+    public MeasurementFields getMeasurementFields() {

+        return measurementFields;

+    }

+

+    /**

+     * measurement fields

+     * 

+     */

+    @JsonProperty("measurementFields")

+    public void setMeasurementFields(MeasurementFields measurementFields) {

+        this.measurementFields = measurementFields;

+    }

+

+    /**

+     * mobileFlow fields

+     * 

+     */

+    @JsonProperty("mobileFlowFields")

+    public MobileFlowFields getMobileFlowFields() {

+        return mobileFlowFields;

+    }

+

+    /**

+     * mobileFlow fields

+     * 

+     */

+    @JsonProperty("mobileFlowFields")

+    public void setMobileFlowFields(MobileFlowFields mobileFlowFields) {

+        this.mobileFlowFields = mobileFlowFields;

+    }

+

+    /**

+     * notification fields

+     * 

+     */

+    @JsonProperty("notificationFields")

+    public NotificationFields getNotificationFields() {

+        return notificationFields;

+    }

+

+    /**

+     * notification fields

+     * 

+     */

+    @JsonProperty("notificationFields")

+    public void setNotificationFields(NotificationFields notificationFields) {

+        this.notificationFields = notificationFields;

+    }

+

+    /**

+     * fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration

+     * 

+     */

+    @JsonProperty("otherFields")

+    public OtherFields getOtherFields() {

+        return otherFields;

+    }

+

+    /**

+     * fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration

+     * 

+     */

+    @JsonProperty("otherFields")

+    public void setOtherFields(OtherFields otherFields) {

+        this.otherFields = otherFields;

+    }

+

+    /**

+     * hardware device registration fields

+     * 

+     */

+    @JsonProperty("pnfRegistrationFields")

+    public PnfRegistrationFields getPnfRegistrationFields() {

+        return pnfRegistrationFields;

+    }

+

+    /**

+     * hardware device registration fields

+     * 

+     */

+    @JsonProperty("pnfRegistrationFields")

+    public void setPnfRegistrationFields(PnfRegistrationFields pnfRegistrationFields) {

+        this.pnfRegistrationFields = pnfRegistrationFields;

+    }

+

+    /**

+     * sip signaling fields

+     * 

+     */

+    @JsonProperty("sipSignalingFields")

+    public SipSignalingFields getSipSignalingFields() {

+        return sipSignalingFields;

+    }

+

+    /**

+     * sip signaling fields

+     * 

+     */

+    @JsonProperty("sipSignalingFields")

+    public void setSipSignalingFields(SipSignalingFields sipSignalingFields) {

+        this.sipSignalingFields = sipSignalingFields;

+    }

+

+    /**

+     * stateChange fields

+     * 

+     */

+    @JsonProperty("stateChangeFields")

+    public StateChangeFields getStateChangeFields() {

+        return stateChangeFields;

+    }

+

+    /**

+     * stateChange fields

+     * 

+     */

+    @JsonProperty("stateChangeFields")

+    public void setStateChangeFields(StateChangeFields stateChangeFields) {

+        this.stateChangeFields = stateChangeFields;

+    }

+

+    /**

+     * sysLog fields

+     * 

+     */

+    @JsonProperty("syslogFields")

+    public SyslogFields getSyslogFields() {

+        return syslogFields;

+    }

+

+    /**

+     * sysLog fields

+     * 

+     */

+    @JsonProperty("syslogFields")

+    public void setSyslogFields(SyslogFields syslogFields) {

+        this.syslogFields = syslogFields;

+    }

+

+    /**

+     * fields specific to threshold crossing alert events

+     * 

+     */

+    @JsonProperty("thresholdCrossingAlertFields")

+    public ThresholdCrossingAlertFields getThresholdCrossingAlertFields() {

+        return thresholdCrossingAlertFields;

+    }

+

+    /**

+     * fields specific to threshold crossing alert events

+     * 

+     */

+    @JsonProperty("thresholdCrossingAlertFields")

+    public void setThresholdCrossingAlertFields(ThresholdCrossingAlertFields thresholdCrossingAlertFields) {

+        this.thresholdCrossingAlertFields = thresholdCrossingAlertFields;

+    }

+

+    /**

+     * provides statistics related to customer facing voice products

+     * 

+     */

+    @JsonProperty("voiceQualityFields")

+    public VoiceQualityFields getVoiceQualityFields() {

+        return voiceQualityFields;

+    }

+

+    /**

+     * provides statistics related to customer facing voice products

+     * 

+     */

+    @JsonProperty("voiceQualityFields")

+    public void setVoiceQualityFields(VoiceQualityFields voiceQualityFields) {

+        this.voiceQualityFields = voiceQualityFields;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(commonEventHeader).append(faultFields).append(heartbeatFields).append(measurementFields).append(mobileFlowFields).append(notificationFields).append(otherFields).append(pnfRegistrationFields).append(sipSignalingFields).append(stateChangeFields).append(syslogFields).append(thresholdCrossingAlertFields).append(voiceQualityFields).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof Event) == false) {

+            return false;

+        }

+        Event rhs = ((Event) other);

+        return new EqualsBuilder().append(commonEventHeader, rhs.commonEventHeader).append(faultFields, rhs.faultFields).append(heartbeatFields, rhs.heartbeatFields).append(measurementFields, rhs.measurementFields).append(mobileFlowFields, rhs.mobileFlowFields).append(notificationFields, rhs.notificationFields).append(otherFields, rhs.otherFields).append(pnfRegistrationFields, rhs.pnfRegistrationFields).append(sipSignalingFields, rhs.sipSignalingFields).append(stateChangeFields, rhs.stateChangeFields).append(syslogFields, rhs.syslogFields).append(thresholdCrossingAlertFields, rhs.thresholdCrossingAlertFields).append(voiceQualityFields, rhs.voiceQualityFields).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/FaultFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/FaultFields.java
new file mode 100644
index 0000000..c62bd4c
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/FaultFields.java
@@ -0,0 +1,441 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * fields specific to fault events

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "alarmAdditionalInformation",

+    "alarmCondition",

+    "alarmInterfaceA",

+    "eventCategory",

+    "eventSeverity",

+    "eventSourceType",

+    "faultFieldsVersion",

+    "specificProblem",

+    "vfStatus"

+})

+public class FaultFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("alarmAdditionalInformation")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation alarmAdditionalInformation;

+    /**

+     * alarm condition reported by the device

+     * (Required)

+     * 

+     */

+    @JsonProperty("alarmCondition")

+    @JsonPropertyDescription("alarm condition reported by the device")

+    private String alarmCondition;

+    /**

+     * card, port, channel or interface name of the device generating the alarm

+     * 

+     */

+    @JsonProperty("alarmInterfaceA")

+    @JsonPropertyDescription("card, port, channel or interface name of the device generating the alarm")

+    private String alarmInterfaceA;

+    /**

+     * Event category, for example: license, link, routing, security, signaling

+     * 

+     */

+    @JsonProperty("eventCategory")

+    @JsonPropertyDescription("Event category, for example: license, link, routing, security, signaling")

+    private String eventCategory;

+    /**

+     * event severity

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSeverity")

+    @JsonPropertyDescription("event severity")

+    private FaultFields.EventSeverity eventSeverity;

+    /**

+     * type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSourceType")

+    @JsonPropertyDescription("type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction")

+    private String eventSourceType;

+    /**

+     * version of the faultFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("faultFieldsVersion")

+    @JsonPropertyDescription("version of the faultFields block")

+    private FaultFields.FaultFieldsVersion faultFieldsVersion;

+    /**

+     * short description of the alarm or problem

+     * (Required)

+     * 

+     */

+    @JsonProperty("specificProblem")

+    @JsonPropertyDescription("short description of the alarm or problem")

+    private String specificProblem;

+    /**

+     * virtual function status enumeration

+     * (Required)

+     * 

+     */

+    @JsonProperty("vfStatus")

+    @JsonPropertyDescription("virtual function status enumeration")

+    private FaultFields.VfStatus vfStatus;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("alarmAdditionalInformation")

+    public AlarmAdditionalInformation getAlarmAdditionalInformation() {

+        return alarmAdditionalInformation;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("alarmAdditionalInformation")

+    public void setAlarmAdditionalInformation(AlarmAdditionalInformation alarmAdditionalInformation) {

+        this.alarmAdditionalInformation = alarmAdditionalInformation;

+    }

+

+    /**

+     * alarm condition reported by the device

+     * (Required)

+     * 

+     */

+    @JsonProperty("alarmCondition")

+    public String getAlarmCondition() {

+        return alarmCondition;

+    }

+

+    /**

+     * alarm condition reported by the device

+     * (Required)

+     * 

+     */

+    @JsonProperty("alarmCondition")

+    public void setAlarmCondition(String alarmCondition) {

+        this.alarmCondition = alarmCondition;

+    }

+

+    /**

+     * card, port, channel or interface name of the device generating the alarm

+     * 

+     */

+    @JsonProperty("alarmInterfaceA")

+    public String getAlarmInterfaceA() {

+        return alarmInterfaceA;

+    }

+

+    /**

+     * card, port, channel or interface name of the device generating the alarm

+     * 

+     */

+    @JsonProperty("alarmInterfaceA")

+    public void setAlarmInterfaceA(String alarmInterfaceA) {

+        this.alarmInterfaceA = alarmInterfaceA;

+    }

+

+    /**

+     * Event category, for example: license, link, routing, security, signaling

+     * 

+     */

+    @JsonProperty("eventCategory")

+    public String getEventCategory() {

+        return eventCategory;

+    }

+

+    /**

+     * Event category, for example: license, link, routing, security, signaling

+     * 

+     */

+    @JsonProperty("eventCategory")

+    public void setEventCategory(String eventCategory) {

+        this.eventCategory = eventCategory;

+    }

+

+    /**

+     * event severity

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSeverity")

+    public FaultFields.EventSeverity getEventSeverity() {

+        return eventSeverity;

+    }

+

+    /**

+     * event severity

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSeverity")

+    public void setEventSeverity(FaultFields.EventSeverity eventSeverity) {

+        this.eventSeverity = eventSeverity;

+    }

+

+    /**

+     * type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSourceType")

+    public String getEventSourceType() {

+        return eventSourceType;

+    }

+

+    /**

+     * type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSourceType")

+    public void setEventSourceType(String eventSourceType) {

+        this.eventSourceType = eventSourceType;

+    }

+

+    /**

+     * version of the faultFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("faultFieldsVersion")

+    public FaultFields.FaultFieldsVersion getFaultFieldsVersion() {

+        return faultFieldsVersion;

+    }

+

+    /**

+     * version of the faultFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("faultFieldsVersion")

+    public void setFaultFieldsVersion(FaultFields.FaultFieldsVersion faultFieldsVersion) {

+        this.faultFieldsVersion = faultFieldsVersion;

+    }

+

+    /**

+     * short description of the alarm or problem

+     * (Required)

+     * 

+     */

+    @JsonProperty("specificProblem")

+    public String getSpecificProblem() {

+        return specificProblem;

+    }

+

+    /**

+     * short description of the alarm or problem

+     * (Required)

+     * 

+     */

+    @JsonProperty("specificProblem")

+    public void setSpecificProblem(String specificProblem) {

+        this.specificProblem = specificProblem;

+    }

+

+    /**

+     * virtual function status enumeration

+     * (Required)

+     * 

+     */

+    @JsonProperty("vfStatus")

+    public FaultFields.VfStatus getVfStatus() {

+        return vfStatus;

+    }

+

+    /**

+     * virtual function status enumeration

+     * (Required)

+     * 

+     */

+    @JsonProperty("vfStatus")

+    public void setVfStatus(FaultFields.VfStatus vfStatus) {

+        this.vfStatus = vfStatus;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(alarmAdditionalInformation).append(alarmCondition).append(alarmInterfaceA).append(eventCategory).append(eventSeverity).append(eventSourceType).append(faultFieldsVersion).append(specificProblem).append(vfStatus).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof FaultFields) == false) {

+            return false;

+        }

+        FaultFields rhs = ((FaultFields) other);

+        return new EqualsBuilder().append(alarmAdditionalInformation, rhs.alarmAdditionalInformation).append(alarmCondition, rhs.alarmCondition).append(alarmInterfaceA, rhs.alarmInterfaceA).append(eventCategory, rhs.eventCategory).append(eventSeverity, rhs.eventSeverity).append(eventSourceType, rhs.eventSourceType).append(faultFieldsVersion, rhs.faultFieldsVersion).append(specificProblem, rhs.specificProblem).append(vfStatus, rhs.vfStatus).isEquals();

+    }

+

+    public enum EventSeverity {

+

+        CRITICAL("CRITICAL"),

+        MAJOR("MAJOR"),

+        MINOR("MINOR"),

+        WARNING("WARNING"),

+        NORMAL("NORMAL");

+        private final String value;

+        private final static Map<String, FaultFields.EventSeverity> CONSTANTS = new HashMap<String, FaultFields.EventSeverity>();

+

+        static {

+            for (FaultFields.EventSeverity c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private EventSeverity(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static FaultFields.EventSeverity fromValue(String value) {

+            FaultFields.EventSeverity constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum FaultFieldsVersion {

+

+        _4_0("4.0");

+        private final String value;

+        private final static Map<String, FaultFields.FaultFieldsVersion> CONSTANTS = new HashMap<String, FaultFields.FaultFieldsVersion>();

+

+        static {

+            for (FaultFields.FaultFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private FaultFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static FaultFields.FaultFieldsVersion fromValue(String value) {

+            FaultFields.FaultFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum VfStatus {

+

+        ACTIVE("Active"),

+        IDLE("Idle"),

+        PREPARING_TO_TERMINATE("Preparing to terminate"),

+        READY_TO_TERMINATE("Ready to terminate"),

+        REQUESTING_TERMINATION("Requesting termination");

+        private final String value;

+        private final static Map<String, FaultFields.VfStatus> CONSTANTS = new HashMap<String, FaultFields.VfStatus>();

+

+        static {

+            for (FaultFields.VfStatus c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private VfStatus(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static FaultFields.VfStatus fromValue(String value) {

+            FaultFields.VfStatus constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/FilesystemUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/FilesystemUsageArray.java
index 83fa2c1..f36ff0f 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/FilesystemUsageArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/FilesystemUsageArray.java
@@ -1,165 +1,258 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "blockConfigured",
-    "blockIops",
-    "blockUsed",
-    "ephemeralConfigured",
-    "ephemeralIops",
-    "ephemeralUsed",
-    "filesystemName"
-})
-public class FilesystemUsageArray {
-
-    @JsonProperty("blockConfigured")
-    private Double blockConfigured;
-    @JsonProperty("blockIops")
-    private Double blockIops;
-    @JsonProperty("blockUsed")
-    private Double blockUsed;
-    @JsonProperty("ephemeralConfigured")
-    private Double ephemeralConfigured;
-    @JsonProperty("ephemeralIops")
-    private Double ephemeralIops;
-    @JsonProperty("ephemeralUsed")
-    private Double ephemeralUsed;
-    @JsonProperty("filesystemName")
-    private String filesystemName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("blockConfigured")
-    public Double getBlockConfigured() {
-        return blockConfigured;
-    }
-
-    @JsonProperty("blockConfigured")
-    public void setBlockConfigured(Double blockConfigured) {
-        this.blockConfigured = blockConfigured;
-    }
-
-    @JsonProperty("blockIops")
-    public Double getBlockIops() {
-        return blockIops;
-    }
-
-    @JsonProperty("blockIops")
-    public void setBlockIops(Double blockIops) {
-        this.blockIops = blockIops;
-    }
-
-    @JsonProperty("blockUsed")
-    public Double getBlockUsed() {
-        return blockUsed;
-    }
-
-    @JsonProperty("blockUsed")
-    public void setBlockUsed(Double blockUsed) {
-        this.blockUsed = blockUsed;
-    }
-
-    @JsonProperty("ephemeralConfigured")
-    public Double getEphemeralConfigured() {
-        return ephemeralConfigured;
-    }
-
-    @JsonProperty("ephemeralConfigured")
-    public void setEphemeralConfigured(Double ephemeralConfigured) {
-        this.ephemeralConfigured = ephemeralConfigured;
-    }
-
-    @JsonProperty("ephemeralIops")
-    public Double getEphemeralIops() {
-        return ephemeralIops;
-    }
-
-    @JsonProperty("ephemeralIops")
-    public void setEphemeralIops(Double ephemeralIops) {
-        this.ephemeralIops = ephemeralIops;
-    }
-
-    @JsonProperty("ephemeralUsed")
-    public Double getEphemeralUsed() {
-        return ephemeralUsed;
-    }
-
-    @JsonProperty("ephemeralUsed")
-    public void setEphemeralUsed(Double ephemeralUsed) {
-        this.ephemeralUsed = ephemeralUsed;
-    }
-
-    @JsonProperty("filesystemName")
-    public String getFilesystemName() {
-        return filesystemName;
-    }
-
-    @JsonProperty("filesystemName")
-    public void setFilesystemName(String filesystemName) {
-        this.filesystemName = filesystemName;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("blockConfigured", blockConfigured).append("blockIops", blockIops).append("blockUsed", blockUsed).append("ephemeralConfigured", ephemeralConfigured).append("ephemeralIops", ephemeralIops).append("ephemeralUsed", ephemeralUsed).append("filesystemName", filesystemName).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(ephemeralUsed).append(blockConfigured).append(filesystemName).append(additionalProperties).append(ephemeralConfigured).append(ephemeralIops).append(blockIops).append(blockUsed).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof FilesystemUsageArray) == false) {
-            return false;
-        }
-        FilesystemUsageArray rhs = ((FilesystemUsageArray) other);
-        return new EqualsBuilder().append(ephemeralUsed, rhs.ephemeralUsed).append(blockConfigured, rhs.blockConfigured).append(filesystemName, rhs.filesystemName).append(additionalProperties, rhs.additionalProperties).append(ephemeralConfigured, rhs.ephemeralConfigured).append(ephemeralIops, rhs.ephemeralIops).append(blockIops, rhs.blockIops).append(blockUsed, rhs.blockUsed).isEquals();
-    }
-
-}
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * disk usage of an identified virtual machine in gigabytes and/or gigabytes per second

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "blockConfigured",

+    "blockIops",

+    "blockUsed",

+    "ephemeralConfigured",

+    "ephemeralIops",

+    "ephemeralUsed",

+    "filesystemName"

+})

+public class FilesystemUsageArray {

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("blockConfigured")

+    private Double blockConfigured;

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("blockIops")

+    private Double blockIops;

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("blockUsed")

+    private Double blockUsed;

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("ephemeralConfigured")

+    private Double ephemeralConfigured;

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("ephemeralIops")

+    private Double ephemeralIops;

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("ephemeralUsed")

+    private Double ephemeralUsed;

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("filesystemName")

+    private String filesystemName;

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("blockConfigured")

+    public Double getBlockConfigured() {

+        return blockConfigured;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("blockConfigured")

+    public void setBlockConfigured(Double blockConfigured) {

+        this.blockConfigured = blockConfigured;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("blockIops")

+    public Double getBlockIops() {

+        return blockIops;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("blockIops")

+    public void setBlockIops(Double blockIops) {

+        this.blockIops = blockIops;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("blockUsed")

+    public Double getBlockUsed() {

+        return blockUsed;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("blockUsed")

+    public void setBlockUsed(Double blockUsed) {

+        this.blockUsed = blockUsed;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("ephemeralConfigured")

+    public Double getEphemeralConfigured() {

+        return ephemeralConfigured;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("ephemeralConfigured")

+    public void setEphemeralConfigured(Double ephemeralConfigured) {

+        this.ephemeralConfigured = ephemeralConfigured;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("ephemeralIops")

+    public Double getEphemeralIops() {

+        return ephemeralIops;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("ephemeralIops")

+    public void setEphemeralIops(Double ephemeralIops) {

+        this.ephemeralIops = ephemeralIops;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("ephemeralUsed")

+    public Double getEphemeralUsed() {

+        return ephemeralUsed;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("ephemeralUsed")

+    public void setEphemeralUsed(Double ephemeralUsed) {

+        this.ephemeralUsed = ephemeralUsed;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("filesystemName")

+    public String getFilesystemName() {

+        return filesystemName;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("filesystemName")

+    public void setFilesystemName(String filesystemName) {

+        this.filesystemName = filesystemName;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(blockConfigured).append(blockIops).append(blockUsed).append(ephemeralConfigured).append(ephemeralIops).append(ephemeralUsed).append(filesystemName).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof FilesystemUsageArray) == false) {

+            return false;

+        }

+        FilesystemUsageArray rhs = ((FilesystemUsageArray) other);

+        return new EqualsBuilder().append(blockConfigured, rhs.blockConfigured).append(blockIops, rhs.blockIops).append(blockUsed, rhs.blockUsed).append(ephemeralConfigured, rhs.ephemeralConfigured).append(ephemeralIops, rhs.ephemeralIops).append(ephemeralUsed, rhs.ephemeralUsed).append(filesystemName, rhs.filesystemName).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/GtpPerFlowMetrics.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/GtpPerFlowMetrics.java
new file mode 100644
index 0000000..e915e5c
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/GtpPerFlowMetrics.java
@@ -0,0 +1,1455 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.List;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * Mobility GTP Protocol per flow metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "avgBitErrorRate",

+    "avgPacketDelayVariation",

+    "avgPacketLatency",

+    "avgReceiveThroughput",

+    "avgTransmitThroughput",

+    "durConnectionFailedStatus",

+    "durTunnelFailedStatus",

+    "flowActivatedBy",

+    "flowActivationEpoch",

+    "flowActivationMicrosec",

+    "flowActivationTime",

+    "flowDeactivatedBy",

+    "flowDeactivationEpoch",

+    "flowDeactivationMicrosec",

+    "flowDeactivationTime",

+    "flowStatus",

+    "gtpConnectionStatus",

+    "gtpTunnelStatus",

+    "ipTosCountList",

+    "ipTosList",

+    "largePacketRtt",

+    "largePacketThreshold",

+    "maxPacketDelayVariation",

+    "maxReceiveBitRate",

+    "maxTransmitBitRate",

+    "mobileQciCosCountList",

+    "mobileQciCosList",

+    "numActivationFailures",

+    "numBitErrors",

+    "numBytesReceived",

+    "numBytesTransmitted",

+    "numDroppedPackets",

+    "numGtpEchoFailures",

+    "numGtpTunnelErrors",

+    "numHttpErrors",

+    "numL7BytesReceived",

+    "numL7BytesTransmitted",

+    "numLostPackets",

+    "numOutOfOrderPackets",

+    "numPacketErrors",

+    "numPacketsReceivedExclRetrans",

+    "numPacketsReceivedInclRetrans",

+    "numPacketsTransmittedInclRetrans",

+    "numRetries",

+    "numTimeouts",

+    "numTunneledL7BytesReceived",

+    "roundTripTime",

+    "tcpFlagCountList",

+    "tcpFlagList",

+    "timeToFirstByte"

+})

+public class GtpPerFlowMetrics {

+

+    /**

+     * average bit error rate

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgBitErrorRate")

+    @JsonPropertyDescription("average bit error rate")

+    private Double avgBitErrorRate;

+    /**

+     * Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgPacketDelayVariation")

+    @JsonPropertyDescription("Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets")

+    private Double avgPacketDelayVariation;

+    /**

+     * average delivery latency

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgPacketLatency")

+    @JsonPropertyDescription("average delivery latency")

+    private Double avgPacketLatency;

+    /**

+     * average receive throughput

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgReceiveThroughput")

+    @JsonPropertyDescription("average receive throughput")

+    private Double avgReceiveThroughput;

+    /**

+     * average transmit throughput

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgTransmitThroughput")

+    @JsonPropertyDescription("average transmit throughput")

+    private Double avgTransmitThroughput;

+    /**

+     * duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval

+     * 

+     */

+    @JsonProperty("durConnectionFailedStatus")

+    @JsonPropertyDescription("duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval")

+    private Double durConnectionFailedStatus;

+    /**

+     * Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval

+     * 

+     */

+    @JsonProperty("durTunnelFailedStatus")

+    @JsonPropertyDescription("Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval")

+    private Double durTunnelFailedStatus;

+    /**

+     * Endpoint activating the flow

+     * 

+     */

+    @JsonProperty("flowActivatedBy")

+    @JsonPropertyDescription("Endpoint activating the flow")

+    private String flowActivatedBy;

+    /**

+     * Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowActivationEpoch")

+    @JsonPropertyDescription("Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available")

+    private Double flowActivationEpoch;

+    /**

+     * Integer microseconds for the start of the flow connection

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowActivationMicrosec")

+    @JsonPropertyDescription("Integer microseconds for the start of the flow connection")

+    private Double flowActivationMicrosec;

+    /**

+     * time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * 

+     */

+    @JsonProperty("flowActivationTime")

+    @JsonPropertyDescription("time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800")

+    private String flowActivationTime;

+    /**

+     * Endpoint deactivating the flow

+     * 

+     */

+    @JsonProperty("flowDeactivatedBy")

+    @JsonPropertyDescription("Endpoint deactivating the flow")

+    private String flowDeactivatedBy;

+    /**

+     * Time for the start of the flow connection, in integer UTC epoch time aka UNIX time

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDeactivationEpoch")

+    @JsonPropertyDescription("Time for the start of the flow connection, in integer UTC epoch time aka UNIX time")

+    private Double flowDeactivationEpoch;

+    /**

+     * Integer microseconds for the start of the flow connection

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDeactivationMicrosec")

+    @JsonPropertyDescription("Integer microseconds for the start of the flow connection")

+    private Double flowDeactivationMicrosec;

+    /**

+     * Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDeactivationTime")

+    @JsonPropertyDescription("Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800")

+    private String flowDeactivationTime;

+    /**

+     * connection status at reporting time as a working / inactive / failed indicator value

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowStatus")

+    @JsonPropertyDescription("connection status at reporting time as a working / inactive / failed indicator value")

+    private String flowStatus;

+    /**

+     * Current connection state at reporting time

+     * 

+     */

+    @JsonProperty("gtpConnectionStatus")

+    @JsonPropertyDescription("Current connection state at reporting time")

+    private String gtpConnectionStatus;

+    /**

+     * Current tunnel state  at reporting time

+     * 

+     */

+    @JsonProperty("gtpTunnelStatus")

+    @JsonPropertyDescription("Current tunnel state  at reporting time")

+    private String gtpTunnelStatus;

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("ipTosCountList")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation ipTosCountList;

+    /**

+     * Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'

+     * 

+     */

+    @JsonProperty("ipTosList")

+    @JsonPropertyDescription("Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'")

+    private List<String> ipTosList = new ArrayList<String>();

+    /**

+     * large packet round trip time

+     * 

+     */

+    @JsonProperty("largePacketRtt")

+    @JsonPropertyDescription("large packet round trip time")

+    private Double largePacketRtt;

+    /**

+     * large packet threshold being applied

+     * 

+     */

+    @JsonProperty("largePacketThreshold")

+    @JsonPropertyDescription("large packet threshold being applied")

+    private Double largePacketThreshold;

+    /**

+     * Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("maxPacketDelayVariation")

+    @JsonPropertyDescription("Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets")

+    private Double maxPacketDelayVariation;

+    /**

+     * maximum receive bit rate

+     * 

+     */

+    @JsonProperty("maxReceiveBitRate")

+    @JsonPropertyDescription("maximum receive bit rate")

+    private Double maxReceiveBitRate;

+    /**

+     * maximum transmit bit rate

+     * 

+     */

+    @JsonProperty("maxTransmitBitRate")

+    @JsonPropertyDescription("maximum transmit bit rate")

+    private Double maxTransmitBitRate;

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("mobileQciCosCountList")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation mobileQciCosCountList;

+    /**

+     * Array of unique LTE QCI or UMTS class-of-service values observed in the flow

+     * 

+     */

+    @JsonProperty("mobileQciCosList")

+    @JsonPropertyDescription("Array of unique LTE QCI or UMTS class-of-service values observed in the flow")

+    private List<String> mobileQciCosList = new ArrayList<String>();

+    /**

+     * Number of failed activation requests, as observed by the reporting node

+     * (Required)

+     * 

+     */

+    @JsonProperty("numActivationFailures")

+    @JsonPropertyDescription("Number of failed activation requests, as observed by the reporting node")

+    private Double numActivationFailures;

+    /**

+     * number of errored bits

+     * (Required)

+     * 

+     */

+    @JsonProperty("numBitErrors")

+    @JsonPropertyDescription("number of errored bits")

+    private Double numBitErrors;

+    /**

+     * number of bytes received, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numBytesReceived")

+    @JsonPropertyDescription("number of bytes received, including retransmissions")

+    private Double numBytesReceived;

+    /**

+     * number of bytes transmitted, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numBytesTransmitted")

+    @JsonPropertyDescription("number of bytes transmitted, including retransmissions")

+    private Double numBytesTransmitted;

+    /**

+     * number of received packets dropped due to errors per virtual interface

+     * (Required)

+     * 

+     */

+    @JsonProperty("numDroppedPackets")

+    @JsonPropertyDescription("number of received packets dropped due to errors per virtual interface")

+    private Double numDroppedPackets;

+    /**

+     * Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2

+     * 

+     */

+    @JsonProperty("numGtpEchoFailures")

+    @JsonPropertyDescription("Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2")

+    private Double numGtpEchoFailures;

+    /**

+     * Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1

+     * 

+     */

+    @JsonProperty("numGtpTunnelErrors")

+    @JsonPropertyDescription("Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1")

+    private Double numGtpTunnelErrors;

+    /**

+     * Http error count

+     * 

+     */

+    @JsonProperty("numHttpErrors")

+    @JsonPropertyDescription("Http error count")

+    private Double numHttpErrors;

+    /**

+     * number of tunneled layer 7 bytes received, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numL7BytesReceived")

+    @JsonPropertyDescription("number of tunneled layer 7 bytes received, including retransmissions")

+    private Double numL7BytesReceived;

+    /**

+     * number of tunneled layer 7 bytes transmitted, excluding retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numL7BytesTransmitted")

+    @JsonPropertyDescription("number of tunneled layer 7 bytes transmitted, excluding retransmissions")

+    private Double numL7BytesTransmitted;

+    /**

+     * number of lost packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("numLostPackets")

+    @JsonPropertyDescription("number of lost packets")

+    private Double numLostPackets;

+    /**

+     * number of out-of-order packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("numOutOfOrderPackets")

+    @JsonPropertyDescription("number of out-of-order packets")

+    private Double numOutOfOrderPackets;

+    /**

+     * number of errored packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketErrors")

+    @JsonPropertyDescription("number of errored packets")

+    private Double numPacketErrors;

+    /**

+     * number of packets received, excluding retransmission

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketsReceivedExclRetrans")

+    @JsonPropertyDescription("number of packets received, excluding retransmission")

+    private Double numPacketsReceivedExclRetrans;

+    /**

+     * number of packets received, including retransmission

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketsReceivedInclRetrans")

+    @JsonPropertyDescription("number of packets received, including retransmission")

+    private Double numPacketsReceivedInclRetrans;

+    /**

+     * number of packets transmitted, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketsTransmittedInclRetrans")

+    @JsonPropertyDescription("number of packets transmitted, including retransmissions")

+    private Double numPacketsTransmittedInclRetrans;

+    /**

+     * number of packet retries

+     * (Required)

+     * 

+     */

+    @JsonProperty("numRetries")

+    @JsonPropertyDescription("number of packet retries")

+    private Double numRetries;

+    /**

+     * number of packet timeouts

+     * (Required)

+     * 

+     */

+    @JsonProperty("numTimeouts")

+    @JsonPropertyDescription("number of packet timeouts")

+    private Double numTimeouts;

+    /**

+     * number of tunneled layer 7 bytes received, excluding retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numTunneledL7BytesReceived")

+    @JsonPropertyDescription("number of tunneled layer 7 bytes received, excluding retransmissions")

+    private Double numTunneledL7BytesReceived;

+    /**

+     * round trip time

+     * (Required)

+     * 

+     */

+    @JsonProperty("roundTripTime")

+    @JsonPropertyDescription("round trip time")

+    private Double roundTripTime;

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("tcpFlagCountList")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation tcpFlagCountList;

+    /**

+     * Array of unique TCP Flags observed in the flow

+     * 

+     */

+    @JsonProperty("tcpFlagList")

+    @JsonPropertyDescription("Array of unique TCP Flags observed in the flow")

+    private List<String> tcpFlagList = new ArrayList<String>();

+    /**

+     * Time in milliseconds between the connection activation and first byte received

+     * (Required)

+     * 

+     */

+    @JsonProperty("timeToFirstByte")

+    @JsonPropertyDescription("Time in milliseconds between the connection activation and first byte received")

+    private Double timeToFirstByte;

+

+    /**

+     * average bit error rate

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgBitErrorRate")

+    public Double getAvgBitErrorRate() {

+        return avgBitErrorRate;

+    }

+

+    /**

+     * average bit error rate

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgBitErrorRate")

+    public void setAvgBitErrorRate(Double avgBitErrorRate) {

+        this.avgBitErrorRate = avgBitErrorRate;

+    }

+

+    /**

+     * Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgPacketDelayVariation")

+    public Double getAvgPacketDelayVariation() {

+        return avgPacketDelayVariation;

+    }

+

+    /**

+     * Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgPacketDelayVariation")

+    public void setAvgPacketDelayVariation(Double avgPacketDelayVariation) {

+        this.avgPacketDelayVariation = avgPacketDelayVariation;

+    }

+

+    /**

+     * average delivery latency

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgPacketLatency")

+    public Double getAvgPacketLatency() {

+        return avgPacketLatency;

+    }

+

+    /**

+     * average delivery latency

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgPacketLatency")

+    public void setAvgPacketLatency(Double avgPacketLatency) {

+        this.avgPacketLatency = avgPacketLatency;

+    }

+

+    /**

+     * average receive throughput

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgReceiveThroughput")

+    public Double getAvgReceiveThroughput() {

+        return avgReceiveThroughput;

+    }

+

+    /**

+     * average receive throughput

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgReceiveThroughput")

+    public void setAvgReceiveThroughput(Double avgReceiveThroughput) {

+        this.avgReceiveThroughput = avgReceiveThroughput;

+    }

+

+    /**

+     * average transmit throughput

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgTransmitThroughput")

+    public Double getAvgTransmitThroughput() {

+        return avgTransmitThroughput;

+    }

+

+    /**

+     * average transmit throughput

+     * (Required)

+     * 

+     */

+    @JsonProperty("avgTransmitThroughput")

+    public void setAvgTransmitThroughput(Double avgTransmitThroughput) {

+        this.avgTransmitThroughput = avgTransmitThroughput;

+    }

+

+    /**

+     * duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval

+     * 

+     */

+    @JsonProperty("durConnectionFailedStatus")

+    public Double getDurConnectionFailedStatus() {

+        return durConnectionFailedStatus;

+    }

+

+    /**

+     * duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval

+     * 

+     */

+    @JsonProperty("durConnectionFailedStatus")

+    public void setDurConnectionFailedStatus(Double durConnectionFailedStatus) {

+        this.durConnectionFailedStatus = durConnectionFailedStatus;

+    }

+

+    /**

+     * Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval

+     * 

+     */

+    @JsonProperty("durTunnelFailedStatus")

+    public Double getDurTunnelFailedStatus() {

+        return durTunnelFailedStatus;

+    }

+

+    /**

+     * Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval

+     * 

+     */

+    @JsonProperty("durTunnelFailedStatus")

+    public void setDurTunnelFailedStatus(Double durTunnelFailedStatus) {

+        this.durTunnelFailedStatus = durTunnelFailedStatus;

+    }

+

+    /**

+     * Endpoint activating the flow

+     * 

+     */

+    @JsonProperty("flowActivatedBy")

+    public String getFlowActivatedBy() {

+        return flowActivatedBy;

+    }

+

+    /**

+     * Endpoint activating the flow

+     * 

+     */

+    @JsonProperty("flowActivatedBy")

+    public void setFlowActivatedBy(String flowActivatedBy) {

+        this.flowActivatedBy = flowActivatedBy;

+    }

+

+    /**

+     * Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowActivationEpoch")

+    public Double getFlowActivationEpoch() {

+        return flowActivationEpoch;

+    }

+

+    /**

+     * Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowActivationEpoch")

+    public void setFlowActivationEpoch(Double flowActivationEpoch) {

+        this.flowActivationEpoch = flowActivationEpoch;

+    }

+

+    /**

+     * Integer microseconds for the start of the flow connection

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowActivationMicrosec")

+    public Double getFlowActivationMicrosec() {

+        return flowActivationMicrosec;

+    }

+

+    /**

+     * Integer microseconds for the start of the flow connection

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowActivationMicrosec")

+    public void setFlowActivationMicrosec(Double flowActivationMicrosec) {

+        this.flowActivationMicrosec = flowActivationMicrosec;

+    }

+

+    /**

+     * time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * 

+     */

+    @JsonProperty("flowActivationTime")

+    public String getFlowActivationTime() {

+        return flowActivationTime;

+    }

+

+    /**

+     * time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * 

+     */

+    @JsonProperty("flowActivationTime")

+    public void setFlowActivationTime(String flowActivationTime) {

+        this.flowActivationTime = flowActivationTime;

+    }

+

+    /**

+     * Endpoint deactivating the flow

+     * 

+     */

+    @JsonProperty("flowDeactivatedBy")

+    public String getFlowDeactivatedBy() {

+        return flowDeactivatedBy;

+    }

+

+    /**

+     * Endpoint deactivating the flow

+     * 

+     */

+    @JsonProperty("flowDeactivatedBy")

+    public void setFlowDeactivatedBy(String flowDeactivatedBy) {

+        this.flowDeactivatedBy = flowDeactivatedBy;

+    }

+

+    /**

+     * Time for the start of the flow connection, in integer UTC epoch time aka UNIX time

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDeactivationEpoch")

+    public Double getFlowDeactivationEpoch() {

+        return flowDeactivationEpoch;

+    }

+

+    /**

+     * Time for the start of the flow connection, in integer UTC epoch time aka UNIX time

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDeactivationEpoch")

+    public void setFlowDeactivationEpoch(Double flowDeactivationEpoch) {

+        this.flowDeactivationEpoch = flowDeactivationEpoch;

+    }

+

+    /**

+     * Integer microseconds for the start of the flow connection

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDeactivationMicrosec")

+    public Double getFlowDeactivationMicrosec() {

+        return flowDeactivationMicrosec;

+    }

+

+    /**

+     * Integer microseconds for the start of the flow connection

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDeactivationMicrosec")

+    public void setFlowDeactivationMicrosec(Double flowDeactivationMicrosec) {

+        this.flowDeactivationMicrosec = flowDeactivationMicrosec;

+    }

+

+    /**

+     * Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDeactivationTime")

+    public String getFlowDeactivationTime() {

+        return flowDeactivationTime;

+    }

+

+    /**

+     * Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDeactivationTime")

+    public void setFlowDeactivationTime(String flowDeactivationTime) {

+        this.flowDeactivationTime = flowDeactivationTime;

+    }

+

+    /**

+     * connection status at reporting time as a working / inactive / failed indicator value

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowStatus")

+    public String getFlowStatus() {

+        return flowStatus;

+    }

+

+    /**

+     * connection status at reporting time as a working / inactive / failed indicator value

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowStatus")

+    public void setFlowStatus(String flowStatus) {

+        this.flowStatus = flowStatus;

+    }

+

+    /**

+     * Current connection state at reporting time

+     * 

+     */

+    @JsonProperty("gtpConnectionStatus")

+    public String getGtpConnectionStatus() {

+        return gtpConnectionStatus;

+    }

+

+    /**

+     * Current connection state at reporting time

+     * 

+     */

+    @JsonProperty("gtpConnectionStatus")

+    public void setGtpConnectionStatus(String gtpConnectionStatus) {

+        this.gtpConnectionStatus = gtpConnectionStatus;

+    }

+

+    /**

+     * Current tunnel state  at reporting time

+     * 

+     */

+    @JsonProperty("gtpTunnelStatus")

+    public String getGtpTunnelStatus() {

+        return gtpTunnelStatus;

+    }

+

+    /**

+     * Current tunnel state  at reporting time

+     * 

+     */

+    @JsonProperty("gtpTunnelStatus")

+    public void setGtpTunnelStatus(String gtpTunnelStatus) {

+        this.gtpTunnelStatus = gtpTunnelStatus;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("ipTosCountList")

+    public AlarmAdditionalInformation getIpTosCountList() {

+        return ipTosCountList;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("ipTosCountList")

+    public void setIpTosCountList(AlarmAdditionalInformation ipTosCountList) {

+        this.ipTosCountList = ipTosCountList;

+    }

+

+    /**

+     * Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'

+     * 

+     */

+    @JsonProperty("ipTosList")

+    public List<String> getIpTosList() {

+        return ipTosList;

+    }

+

+    /**

+     * Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'

+     * 

+     */

+    @JsonProperty("ipTosList")

+    public void setIpTosList(List<String> ipTosList) {

+        this.ipTosList = ipTosList;

+    }

+

+    /**

+     * large packet round trip time

+     * 

+     */

+    @JsonProperty("largePacketRtt")

+    public Double getLargePacketRtt() {

+        return largePacketRtt;

+    }

+

+    /**

+     * large packet round trip time

+     * 

+     */

+    @JsonProperty("largePacketRtt")

+    public void setLargePacketRtt(Double largePacketRtt) {

+        this.largePacketRtt = largePacketRtt;

+    }

+

+    /**

+     * large packet threshold being applied

+     * 

+     */

+    @JsonProperty("largePacketThreshold")

+    public Double getLargePacketThreshold() {

+        return largePacketThreshold;

+    }

+

+    /**

+     * large packet threshold being applied

+     * 

+     */

+    @JsonProperty("largePacketThreshold")

+    public void setLargePacketThreshold(Double largePacketThreshold) {

+        this.largePacketThreshold = largePacketThreshold;

+    }

+

+    /**

+     * Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("maxPacketDelayVariation")

+    public Double getMaxPacketDelayVariation() {

+        return maxPacketDelayVariation;

+    }

+

+    /**

+     * Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("maxPacketDelayVariation")

+    public void setMaxPacketDelayVariation(Double maxPacketDelayVariation) {

+        this.maxPacketDelayVariation = maxPacketDelayVariation;

+    }

+

+    /**

+     * maximum receive bit rate

+     * 

+     */

+    @JsonProperty("maxReceiveBitRate")

+    public Double getMaxReceiveBitRate() {

+        return maxReceiveBitRate;

+    }

+

+    /**

+     * maximum receive bit rate

+     * 

+     */

+    @JsonProperty("maxReceiveBitRate")

+    public void setMaxReceiveBitRate(Double maxReceiveBitRate) {

+        this.maxReceiveBitRate = maxReceiveBitRate;

+    }

+

+    /**

+     * maximum transmit bit rate

+     * 

+     */

+    @JsonProperty("maxTransmitBitRate")

+    public Double getMaxTransmitBitRate() {

+        return maxTransmitBitRate;

+    }

+

+    /**

+     * maximum transmit bit rate

+     * 

+     */

+    @JsonProperty("maxTransmitBitRate")

+    public void setMaxTransmitBitRate(Double maxTransmitBitRate) {

+        this.maxTransmitBitRate = maxTransmitBitRate;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("mobileQciCosCountList")

+    public AlarmAdditionalInformation getMobileQciCosCountList() {

+        return mobileQciCosCountList;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("mobileQciCosCountList")

+    public void setMobileQciCosCountList(AlarmAdditionalInformation mobileQciCosCountList) {

+        this.mobileQciCosCountList = mobileQciCosCountList;

+    }

+

+    /**

+     * Array of unique LTE QCI or UMTS class-of-service values observed in the flow

+     * 

+     */

+    @JsonProperty("mobileQciCosList")

+    public List<String> getMobileQciCosList() {

+        return mobileQciCosList;

+    }

+

+    /**

+     * Array of unique LTE QCI or UMTS class-of-service values observed in the flow

+     * 

+     */

+    @JsonProperty("mobileQciCosList")

+    public void setMobileQciCosList(List<String> mobileQciCosList) {

+        this.mobileQciCosList = mobileQciCosList;

+    }

+

+    /**

+     * Number of failed activation requests, as observed by the reporting node

+     * (Required)

+     * 

+     */

+    @JsonProperty("numActivationFailures")

+    public Double getNumActivationFailures() {

+        return numActivationFailures;

+    }

+

+    /**

+     * Number of failed activation requests, as observed by the reporting node

+     * (Required)

+     * 

+     */

+    @JsonProperty("numActivationFailures")

+    public void setNumActivationFailures(Double numActivationFailures) {

+        this.numActivationFailures = numActivationFailures;

+    }

+

+    /**

+     * number of errored bits

+     * (Required)

+     * 

+     */

+    @JsonProperty("numBitErrors")

+    public Double getNumBitErrors() {

+        return numBitErrors;

+    }

+

+    /**

+     * number of errored bits

+     * (Required)

+     * 

+     */

+    @JsonProperty("numBitErrors")

+    public void setNumBitErrors(Double numBitErrors) {

+        this.numBitErrors = numBitErrors;

+    }

+

+    /**

+     * number of bytes received, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numBytesReceived")

+    public Double getNumBytesReceived() {

+        return numBytesReceived;

+    }

+

+    /**

+     * number of bytes received, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numBytesReceived")

+    public void setNumBytesReceived(Double numBytesReceived) {

+        this.numBytesReceived = numBytesReceived;

+    }

+

+    /**

+     * number of bytes transmitted, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numBytesTransmitted")

+    public Double getNumBytesTransmitted() {

+        return numBytesTransmitted;

+    }

+

+    /**

+     * number of bytes transmitted, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numBytesTransmitted")

+    public void setNumBytesTransmitted(Double numBytesTransmitted) {

+        this.numBytesTransmitted = numBytesTransmitted;

+    }

+

+    /**

+     * number of received packets dropped due to errors per virtual interface

+     * (Required)

+     * 

+     */

+    @JsonProperty("numDroppedPackets")

+    public Double getNumDroppedPackets() {

+        return numDroppedPackets;

+    }

+

+    /**

+     * number of received packets dropped due to errors per virtual interface

+     * (Required)

+     * 

+     */

+    @JsonProperty("numDroppedPackets")

+    public void setNumDroppedPackets(Double numDroppedPackets) {

+        this.numDroppedPackets = numDroppedPackets;

+    }

+

+    /**

+     * Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2

+     * 

+     */

+    @JsonProperty("numGtpEchoFailures")

+    public Double getNumGtpEchoFailures() {

+        return numGtpEchoFailures;

+    }

+

+    /**

+     * Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2

+     * 

+     */

+    @JsonProperty("numGtpEchoFailures")

+    public void setNumGtpEchoFailures(Double numGtpEchoFailures) {

+        this.numGtpEchoFailures = numGtpEchoFailures;

+    }

+

+    /**

+     * Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1

+     * 

+     */

+    @JsonProperty("numGtpTunnelErrors")

+    public Double getNumGtpTunnelErrors() {

+        return numGtpTunnelErrors;

+    }

+

+    /**

+     * Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1

+     * 

+     */

+    @JsonProperty("numGtpTunnelErrors")

+    public void setNumGtpTunnelErrors(Double numGtpTunnelErrors) {

+        this.numGtpTunnelErrors = numGtpTunnelErrors;

+    }

+

+    /**

+     * Http error count

+     * 

+     */

+    @JsonProperty("numHttpErrors")

+    public Double getNumHttpErrors() {

+        return numHttpErrors;

+    }

+

+    /**

+     * Http error count

+     * 

+     */

+    @JsonProperty("numHttpErrors")

+    public void setNumHttpErrors(Double numHttpErrors) {

+        this.numHttpErrors = numHttpErrors;

+    }

+

+    /**

+     * number of tunneled layer 7 bytes received, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numL7BytesReceived")

+    public Double getNumL7BytesReceived() {

+        return numL7BytesReceived;

+    }

+

+    /**

+     * number of tunneled layer 7 bytes received, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numL7BytesReceived")

+    public void setNumL7BytesReceived(Double numL7BytesReceived) {

+        this.numL7BytesReceived = numL7BytesReceived;

+    }

+

+    /**

+     * number of tunneled layer 7 bytes transmitted, excluding retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numL7BytesTransmitted")

+    public Double getNumL7BytesTransmitted() {

+        return numL7BytesTransmitted;

+    }

+

+    /**

+     * number of tunneled layer 7 bytes transmitted, excluding retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numL7BytesTransmitted")

+    public void setNumL7BytesTransmitted(Double numL7BytesTransmitted) {

+        this.numL7BytesTransmitted = numL7BytesTransmitted;

+    }

+

+    /**

+     * number of lost packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("numLostPackets")

+    public Double getNumLostPackets() {

+        return numLostPackets;

+    }

+

+    /**

+     * number of lost packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("numLostPackets")

+    public void setNumLostPackets(Double numLostPackets) {

+        this.numLostPackets = numLostPackets;

+    }

+

+    /**

+     * number of out-of-order packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("numOutOfOrderPackets")

+    public Double getNumOutOfOrderPackets() {

+        return numOutOfOrderPackets;

+    }

+

+    /**

+     * number of out-of-order packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("numOutOfOrderPackets")

+    public void setNumOutOfOrderPackets(Double numOutOfOrderPackets) {

+        this.numOutOfOrderPackets = numOutOfOrderPackets;

+    }

+

+    /**

+     * number of errored packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketErrors")

+    public Double getNumPacketErrors() {

+        return numPacketErrors;

+    }

+

+    /**

+     * number of errored packets

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketErrors")

+    public void setNumPacketErrors(Double numPacketErrors) {

+        this.numPacketErrors = numPacketErrors;

+    }

+

+    /**

+     * number of packets received, excluding retransmission

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketsReceivedExclRetrans")

+    public Double getNumPacketsReceivedExclRetrans() {

+        return numPacketsReceivedExclRetrans;

+    }

+

+    /**

+     * number of packets received, excluding retransmission

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketsReceivedExclRetrans")

+    public void setNumPacketsReceivedExclRetrans(Double numPacketsReceivedExclRetrans) {

+        this.numPacketsReceivedExclRetrans = numPacketsReceivedExclRetrans;

+    }

+

+    /**

+     * number of packets received, including retransmission

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketsReceivedInclRetrans")

+    public Double getNumPacketsReceivedInclRetrans() {

+        return numPacketsReceivedInclRetrans;

+    }

+

+    /**

+     * number of packets received, including retransmission

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketsReceivedInclRetrans")

+    public void setNumPacketsReceivedInclRetrans(Double numPacketsReceivedInclRetrans) {

+        this.numPacketsReceivedInclRetrans = numPacketsReceivedInclRetrans;

+    }

+

+    /**

+     * number of packets transmitted, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketsTransmittedInclRetrans")

+    public Double getNumPacketsTransmittedInclRetrans() {

+        return numPacketsTransmittedInclRetrans;

+    }

+

+    /**

+     * number of packets transmitted, including retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numPacketsTransmittedInclRetrans")

+    public void setNumPacketsTransmittedInclRetrans(Double numPacketsTransmittedInclRetrans) {

+        this.numPacketsTransmittedInclRetrans = numPacketsTransmittedInclRetrans;

+    }

+

+    /**

+     * number of packet retries

+     * (Required)

+     * 

+     */

+    @JsonProperty("numRetries")

+    public Double getNumRetries() {

+        return numRetries;

+    }

+

+    /**

+     * number of packet retries

+     * (Required)

+     * 

+     */

+    @JsonProperty("numRetries")

+    public void setNumRetries(Double numRetries) {

+        this.numRetries = numRetries;

+    }

+

+    /**

+     * number of packet timeouts

+     * (Required)

+     * 

+     */

+    @JsonProperty("numTimeouts")

+    public Double getNumTimeouts() {

+        return numTimeouts;

+    }

+

+    /**

+     * number of packet timeouts

+     * (Required)

+     * 

+     */

+    @JsonProperty("numTimeouts")

+    public void setNumTimeouts(Double numTimeouts) {

+        this.numTimeouts = numTimeouts;

+    }

+

+    /**

+     * number of tunneled layer 7 bytes received, excluding retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numTunneledL7BytesReceived")

+    public Double getNumTunneledL7BytesReceived() {

+        return numTunneledL7BytesReceived;

+    }

+

+    /**

+     * number of tunneled layer 7 bytes received, excluding retransmissions

+     * (Required)

+     * 

+     */

+    @JsonProperty("numTunneledL7BytesReceived")

+    public void setNumTunneledL7BytesReceived(Double numTunneledL7BytesReceived) {

+        this.numTunneledL7BytesReceived = numTunneledL7BytesReceived;

+    }

+

+    /**

+     * round trip time

+     * (Required)

+     * 

+     */

+    @JsonProperty("roundTripTime")

+    public Double getRoundTripTime() {

+        return roundTripTime;

+    }

+

+    /**

+     * round trip time

+     * (Required)

+     * 

+     */

+    @JsonProperty("roundTripTime")

+    public void setRoundTripTime(Double roundTripTime) {

+        this.roundTripTime = roundTripTime;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("tcpFlagCountList")

+    public AlarmAdditionalInformation getTcpFlagCountList() {

+        return tcpFlagCountList;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("tcpFlagCountList")

+    public void setTcpFlagCountList(AlarmAdditionalInformation tcpFlagCountList) {

+        this.tcpFlagCountList = tcpFlagCountList;

+    }

+

+    /**

+     * Array of unique TCP Flags observed in the flow

+     * 

+     */

+    @JsonProperty("tcpFlagList")

+    public List<String> getTcpFlagList() {

+        return tcpFlagList;

+    }

+

+    /**

+     * Array of unique TCP Flags observed in the flow

+     * 

+     */

+    @JsonProperty("tcpFlagList")

+    public void setTcpFlagList(List<String> tcpFlagList) {

+        this.tcpFlagList = tcpFlagList;

+    }

+

+    /**

+     * Time in milliseconds between the connection activation and first byte received

+     * (Required)

+     * 

+     */

+    @JsonProperty("timeToFirstByte")

+    public Double getTimeToFirstByte() {

+        return timeToFirstByte;

+    }

+

+    /**

+     * Time in milliseconds between the connection activation and first byte received

+     * (Required)

+     * 

+     */

+    @JsonProperty("timeToFirstByte")

+    public void setTimeToFirstByte(Double timeToFirstByte) {

+        this.timeToFirstByte = timeToFirstByte;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(avgBitErrorRate).append(avgPacketDelayVariation).append(avgPacketLatency).append(avgReceiveThroughput).append(avgTransmitThroughput).append(durConnectionFailedStatus).append(durTunnelFailedStatus).append(flowActivatedBy).append(flowActivationEpoch).append(flowActivationMicrosec).append(flowActivationTime).append(flowDeactivatedBy).append(flowDeactivationEpoch).append(flowDeactivationMicrosec).append(flowDeactivationTime).append(flowStatus).append(gtpConnectionStatus).append(gtpTunnelStatus).append(ipTosCountList).append(ipTosList).append(largePacketRtt).append(largePacketThreshold).append(maxPacketDelayVariation).append(maxReceiveBitRate).append(maxTransmitBitRate).append(mobileQciCosCountList).append(mobileQciCosList).append(numActivationFailures).append(numBitErrors).append(numBytesReceived).append(numBytesTransmitted).append(numDroppedPackets).append(numGtpEchoFailures).append(numGtpTunnelErrors).append(numHttpErrors).append(numL7BytesReceived).append(numL7BytesTransmitted).append(numLostPackets).append(numOutOfOrderPackets).append(numPacketErrors).append(numPacketsReceivedExclRetrans).append(numPacketsReceivedInclRetrans).append(numPacketsTransmittedInclRetrans).append(numRetries).append(numTimeouts).append(numTunneledL7BytesReceived).append(roundTripTime).append(tcpFlagCountList).append(tcpFlagList).append(timeToFirstByte).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof GtpPerFlowMetrics) == false) {

+            return false;

+        }

+        GtpPerFlowMetrics rhs = ((GtpPerFlowMetrics) other);

+        return new EqualsBuilder().append(avgBitErrorRate, rhs.avgBitErrorRate).append(avgPacketDelayVariation, rhs.avgPacketDelayVariation).append(avgPacketLatency, rhs.avgPacketLatency).append(avgReceiveThroughput, rhs.avgReceiveThroughput).append(avgTransmitThroughput, rhs.avgTransmitThroughput).append(durConnectionFailedStatus, rhs.durConnectionFailedStatus).append(durTunnelFailedStatus, rhs.durTunnelFailedStatus).append(flowActivatedBy, rhs.flowActivatedBy).append(flowActivationEpoch, rhs.flowActivationEpoch).append(flowActivationMicrosec, rhs.flowActivationMicrosec).append(flowActivationTime, rhs.flowActivationTime).append(flowDeactivatedBy, rhs.flowDeactivatedBy).append(flowDeactivationEpoch, rhs.flowDeactivationEpoch).append(flowDeactivationMicrosec, rhs.flowDeactivationMicrosec).append(flowDeactivationTime, rhs.flowDeactivationTime).append(flowStatus, rhs.flowStatus).append(gtpConnectionStatus, rhs.gtpConnectionStatus).append(gtpTunnelStatus, rhs.gtpTunnelStatus).append(ipTosCountList, rhs.ipTosCountList).append(ipTosList, rhs.ipTosList).append(largePacketRtt, rhs.largePacketRtt).append(largePacketThreshold, rhs.largePacketThreshold).append(maxPacketDelayVariation, rhs.maxPacketDelayVariation).append(maxReceiveBitRate, rhs.maxReceiveBitRate).append(maxTransmitBitRate, rhs.maxTransmitBitRate).append(mobileQciCosCountList, rhs.mobileQciCosCountList).append(mobileQciCosList, rhs.mobileQciCosList).append(numActivationFailures, rhs.numActivationFailures).append(numBitErrors, rhs.numBitErrors).append(numBytesReceived, rhs.numBytesReceived).append(numBytesTransmitted, rhs.numBytesTransmitted).append(numDroppedPackets, rhs.numDroppedPackets).append(numGtpEchoFailures, rhs.numGtpEchoFailures).append(numGtpTunnelErrors, rhs.numGtpTunnelErrors).append(numHttpErrors, rhs.numHttpErrors).append(numL7BytesReceived, rhs.numL7BytesReceived).append(numL7BytesTransmitted, rhs.numL7BytesTransmitted).append(numLostPackets, rhs.numLostPackets).append(numOutOfOrderPackets, rhs.numOutOfOrderPackets).append(numPacketErrors, rhs.numPacketErrors).append(numPacketsReceivedExclRetrans, rhs.numPacketsReceivedExclRetrans).append(numPacketsReceivedInclRetrans, rhs.numPacketsReceivedInclRetrans).append(numPacketsTransmittedInclRetrans, rhs.numPacketsTransmittedInclRetrans).append(numRetries, rhs.numRetries).append(numTimeouts, rhs.numTimeouts).append(numTunneledL7BytesReceived, rhs.numTunneledL7BytesReceived).append(roundTripTime, rhs.roundTripTime).append(tcpFlagCountList, rhs.tcpFlagCountList).append(tcpFlagList, rhs.tcpFlagList).append(timeToFirstByte, rhs.timeToFirstByte).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HeartbeatFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HeartbeatFields.java
new file mode 100644
index 0000000..b650fca
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HeartbeatFields.java
@@ -0,0 +1,189 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * optional field block for fields specific to heartbeat events

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalFields",

+    "heartbeatFieldsVersion",

+    "heartbeatInterval"

+})

+public class HeartbeatFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalFields;

+    /**

+     * version of the heartbeatFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("heartbeatFieldsVersion")

+    @JsonPropertyDescription("version of the heartbeatFields block")

+    private HeartbeatFields.HeartbeatFieldsVersion heartbeatFieldsVersion;

+    /**

+     * current heartbeat interval in seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("heartbeatInterval")

+    @JsonPropertyDescription("current heartbeat interval in seconds")

+    private Integer heartbeatInterval;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public AlarmAdditionalInformation getAdditionalFields() {

+        return additionalFields;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public void setAdditionalFields(AlarmAdditionalInformation additionalFields) {

+        this.additionalFields = additionalFields;

+    }

+

+    /**

+     * version of the heartbeatFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("heartbeatFieldsVersion")

+    public HeartbeatFields.HeartbeatFieldsVersion getHeartbeatFieldsVersion() {

+        return heartbeatFieldsVersion;

+    }

+

+    /**

+     * version of the heartbeatFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("heartbeatFieldsVersion")

+    public void setHeartbeatFieldsVersion(HeartbeatFields.HeartbeatFieldsVersion heartbeatFieldsVersion) {

+        this.heartbeatFieldsVersion = heartbeatFieldsVersion;

+    }

+

+    /**

+     * current heartbeat interval in seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("heartbeatInterval")

+    public Integer getHeartbeatInterval() {

+        return heartbeatInterval;

+    }

+

+    /**

+     * current heartbeat interval in seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("heartbeatInterval")

+    public void setHeartbeatInterval(Integer heartbeatInterval) {

+        this.heartbeatInterval = heartbeatInterval;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalFields).append(heartbeatFieldsVersion).append(heartbeatInterval).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof HeartbeatFields) == false) {

+            return false;

+        }

+        HeartbeatFields rhs = ((HeartbeatFields) other);

+        return new EqualsBuilder().append(additionalFields, rhs.additionalFields).append(heartbeatFieldsVersion, rhs.heartbeatFieldsVersion).append(heartbeatInterval, rhs.heartbeatInterval).isEquals();

+    }

+

+    public enum HeartbeatFieldsVersion {

+

+        _3_0("3.0");

+        private final String value;

+        private final static Map<String, HeartbeatFields.HeartbeatFieldsVersion> CONSTANTS = new HashMap<String, HeartbeatFields.HeartbeatFieldsVersion>();

+

+        static {

+            for (HeartbeatFields.HeartbeatFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private HeartbeatFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static HeartbeatFields.HeartbeatFieldsVersion fromValue(String value) {

+            HeartbeatFields.HeartbeatFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HugePagesArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HugePagesArray.java
new file mode 100644
index 0000000..5ffe324
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HugePagesArray.java
@@ -0,0 +1,248 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * metrics on system hugepages

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "bytesFree",

+    "bytesUsed",

+    "hugePagesIdentifier",

+    "percentFree",

+    "percentUsed",

+    "vmPageNumberFree",

+    "vmPageNumberUsed"

+})

+public class HugePagesArray {

+

+    /**

+     * number of free hugepages in bytes

+     * 

+     */

+    @JsonProperty("bytesFree")

+    @JsonPropertyDescription("number of free hugepages in bytes")

+    private Double bytesFree;

+    /**

+     * number of used hugepages in bytes

+     * 

+     */

+    @JsonProperty("bytesUsed")

+    @JsonPropertyDescription("number of used hugepages in bytes")

+    private Double bytesUsed;

+    /**

+     * hugePages identifier

+     * (Required)

+     * 

+     */

+    @JsonProperty("hugePagesIdentifier")

+    @JsonPropertyDescription("hugePages identifier")

+    private Double hugePagesIdentifier;

+    /**

+     * number of free hugepages in percent

+     * 

+     */

+    @JsonProperty("percentFree")

+    @JsonPropertyDescription("number of free hugepages in percent")

+    private Double percentFree;

+    /**

+     * number of free hugepages in percent

+     * 

+     */

+    @JsonProperty("percentUsed")

+    @JsonPropertyDescription("number of free hugepages in percent")

+    private Double percentUsed;

+    /**

+     * number of free vmPages in numbers

+     * 

+     */

+    @JsonProperty("vmPageNumberFree")

+    @JsonPropertyDescription("number of free vmPages in numbers")

+    private Double vmPageNumberFree;

+    /**

+     * number of used vmPages in numbers

+     * 

+     */

+    @JsonProperty("vmPageNumberUsed")

+    @JsonPropertyDescription("number of used vmPages in numbers")

+    private Double vmPageNumberUsed;

+

+    /**

+     * number of free hugepages in bytes

+     * 

+     */

+    @JsonProperty("bytesFree")

+    public Double getBytesFree() {

+        return bytesFree;

+    }

+

+    /**

+     * number of free hugepages in bytes

+     * 

+     */

+    @JsonProperty("bytesFree")

+    public void setBytesFree(Double bytesFree) {

+        this.bytesFree = bytesFree;

+    }

+

+    /**

+     * number of used hugepages in bytes

+     * 

+     */

+    @JsonProperty("bytesUsed")

+    public Double getBytesUsed() {

+        return bytesUsed;

+    }

+

+    /**

+     * number of used hugepages in bytes

+     * 

+     */

+    @JsonProperty("bytesUsed")

+    public void setBytesUsed(Double bytesUsed) {

+        this.bytesUsed = bytesUsed;

+    }

+

+    /**

+     * hugePages identifier

+     * (Required)

+     * 

+     */

+    @JsonProperty("hugePagesIdentifier")

+    public Double getHugePagesIdentifier() {

+        return hugePagesIdentifier;

+    }

+

+    /**

+     * hugePages identifier

+     * (Required)

+     * 

+     */

+    @JsonProperty("hugePagesIdentifier")

+    public void setHugePagesIdentifier(Double hugePagesIdentifier) {

+        this.hugePagesIdentifier = hugePagesIdentifier;

+    }

+

+    /**

+     * number of free hugepages in percent

+     * 

+     */

+    @JsonProperty("percentFree")

+    public Double getPercentFree() {

+        return percentFree;

+    }

+

+    /**

+     * number of free hugepages in percent

+     * 

+     */

+    @JsonProperty("percentFree")

+    public void setPercentFree(Double percentFree) {

+        this.percentFree = percentFree;

+    }

+

+    /**

+     * number of free hugepages in percent

+     * 

+     */

+    @JsonProperty("percentUsed")

+    public Double getPercentUsed() {

+        return percentUsed;

+    }

+

+    /**

+     * number of free hugepages in percent

+     * 

+     */

+    @JsonProperty("percentUsed")

+    public void setPercentUsed(Double percentUsed) {

+        this.percentUsed = percentUsed;

+    }

+

+    /**

+     * number of free vmPages in numbers

+     * 

+     */

+    @JsonProperty("vmPageNumberFree")

+    public Double getVmPageNumberFree() {

+        return vmPageNumberFree;

+    }

+

+    /**

+     * number of free vmPages in numbers

+     * 

+     */

+    @JsonProperty("vmPageNumberFree")

+    public void setVmPageNumberFree(Double vmPageNumberFree) {

+        this.vmPageNumberFree = vmPageNumberFree;

+    }

+

+    /**

+     * number of used vmPages in numbers

+     * 

+     */

+    @JsonProperty("vmPageNumberUsed")

+    public Double getVmPageNumberUsed() {

+        return vmPageNumberUsed;

+    }

+

+    /**

+     * number of used vmPages in numbers

+     * 

+     */

+    @JsonProperty("vmPageNumberUsed")

+    public void setVmPageNumberUsed(Double vmPageNumberUsed) {

+        this.vmPageNumberUsed = vmPageNumberUsed;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(bytesFree).append(bytesUsed).append(hugePagesIdentifier).append(percentFree).append(percentUsed).append(vmPageNumberFree).append(vmPageNumberUsed).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof HugePagesArray) == false) {

+            return false;

+        }

+        HugePagesArray rhs = ((HugePagesArray) other);

+        return new EqualsBuilder().append(bytesFree, rhs.bytesFree).append(bytesUsed, rhs.bytesUsed).append(hugePagesIdentifier, rhs.hugePagesIdentifier).append(percentFree, rhs.percentFree).append(percentUsed, rhs.percentUsed).append(vmPageNumberFree, rhs.vmPageNumberFree).append(vmPageNumberUsed, rhs.vmPageNumberUsed).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/InternalHeaderFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/InternalHeaderFields.java
index e504011..4b34a24 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/InternalHeaderFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/InternalHeaderFields.java
@@ -1,74 +1,79 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-
-})
-public class InternalHeaderFields {
-
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof InternalHeaderFields) == false) {
-            return false;
-        }
-        InternalHeaderFields rhs = ((InternalHeaderFields) other);
-        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonAnyGetter;

+import com.fasterxml.jackson.annotation.JsonAnySetter;

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * enrichment fields for internal VES Event Listener service use only, not supplied by event sources

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+

+})

+public class InternalHeaderFields {

+

+    @JsonIgnore

+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @JsonAnyGetter

+    public Map<String, Object> getAdditionalProperties() {

+        return this.additionalProperties;

+    }

+

+    @JsonAnySetter

+    public void setAdditionalProperty(String name, Object value) {

+        this.additionalProperties.put(name, value);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalProperties).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof InternalHeaderFields) == false) {

+            return false;

+        }

+        InternalHeaderFields rhs = ((InternalHeaderFields) other);

+        return new EqualsBuilder().append(additionalProperties, rhs.additionalProperties).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Ipmi.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Ipmi.java
new file mode 100644
index 0000000..be17bff
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Ipmi.java
@@ -0,0 +1,403 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.List;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "exitAirTemperature",

+    "frontPanelTemperature",

+    "ioModuleTemperature",

+    "ipmiBaseboardTemperatureArray",

+    "ipmiBaseboardVoltageRegulatorArray",

+    "ipmiBatteryArray",

+    "ipmiFanArray",

+    "ipmiHsbpArray",

+    "ipmiGlobalAggregateTemperatureMarginArray",

+    "ipmiNicArray",

+    "ipmiPowerSupplyArray",

+    "ipmiProcessorArray",

+    "systemAirflow"

+})

+public class Ipmi {

+

+    /**

+     * system fan exit air flow temperature in celsius

+     * 

+     */

+    @JsonProperty("exitAirTemperature")

+    @JsonPropertyDescription("system fan exit air flow temperature in celsius")

+    private Double exitAirTemperature;

+    /**

+     * front panel temperature in celsius

+     * 

+     */

+    @JsonProperty("frontPanelTemperature")

+    @JsonPropertyDescription("front panel temperature in celsius")

+    private Double frontPanelTemperature;

+    /**

+     * io module temperature in celsius

+     * 

+     */

+    @JsonProperty("ioModuleTemperature")

+    @JsonPropertyDescription("io module temperature in celsius")

+    private Double ioModuleTemperature;

+    /**

+     * array of ipmiBaseboardTemperature objects

+     * 

+     */

+    @JsonProperty("ipmiBaseboardTemperatureArray")

+    @JsonPropertyDescription("array of ipmiBaseboardTemperature objects")

+    private List<IpmiBaseboardTemperatureArray> ipmiBaseboardTemperatureArray = new ArrayList<IpmiBaseboardTemperatureArray>();

+    /**

+     * array of ipmiBaseboardVoltageRegulator objects

+     * 

+     */

+    @JsonProperty("ipmiBaseboardVoltageRegulatorArray")

+    @JsonPropertyDescription("array of ipmiBaseboardVoltageRegulator objects")

+    private List<IpmiBaseboardVoltageRegulatorArray> ipmiBaseboardVoltageRegulatorArray = new ArrayList<IpmiBaseboardVoltageRegulatorArray>();

+    /**

+     * array of ipmiBattery objects

+     * 

+     */

+    @JsonProperty("ipmiBatteryArray")

+    @JsonPropertyDescription("array of ipmiBattery objects")

+    private List<IpmiBatteryArray> ipmiBatteryArray = new ArrayList<IpmiBatteryArray>();

+    /**

+     * array of ipmiFan objects

+     * 

+     */

+    @JsonProperty("ipmiFanArray")

+    @JsonPropertyDescription("array of ipmiFan objects")

+    private List<IpmiFanArray> ipmiFanArray = new ArrayList<IpmiFanArray>();

+    /**

+     * array of ipmiHsbp objects

+     * 

+     */

+    @JsonProperty("ipmiHsbpArray")

+    @JsonPropertyDescription("array of ipmiHsbp objects")

+    private List<IpmiHsbpArray> ipmiHsbpArray = new ArrayList<IpmiHsbpArray>();

+    /**

+     * array of ipmiGlobalAggregateTemperatureMargin objects

+     * 

+     */

+    @JsonProperty("ipmiGlobalAggregateTemperatureMarginArray")

+    @JsonPropertyDescription("array of ipmiGlobalAggregateTemperatureMargin objects")

+    private List<IpmiGlobalAggregateTemperatureMarginArray> ipmiGlobalAggregateTemperatureMarginArray = new ArrayList<IpmiGlobalAggregateTemperatureMarginArray>();

+    /**

+     * array of ipmiNic objects

+     * 

+     */

+    @JsonProperty("ipmiNicArray")

+    @JsonPropertyDescription("array of ipmiNic objects")

+    private List<IpmiNicArray> ipmiNicArray = new ArrayList<IpmiNicArray>();

+    /**

+     * array of ipmiPowerSupply objects

+     * 

+     */

+    @JsonProperty("ipmiPowerSupplyArray")

+    @JsonPropertyDescription("array of ipmiPowerSupply objects")

+    private List<IpmiPowerSupplyArray> ipmiPowerSupplyArray = new ArrayList<IpmiPowerSupplyArray>();

+    /**

+     * array of ipmiProcessor objects

+     * 

+     */

+    @JsonProperty("ipmiProcessorArray")

+    @JsonPropertyDescription("array of ipmiProcessor objects")

+    private List<IpmiProcessorArray> ipmiProcessorArray = new ArrayList<IpmiProcessorArray>();

+    /**

+     * airfflow in cubic feet per minute (cfm)

+     * 

+     */

+    @JsonProperty("systemAirflow")

+    @JsonPropertyDescription("airfflow in cubic feet per minute (cfm)")

+    private Double systemAirflow;

+

+    /**

+     * system fan exit air flow temperature in celsius

+     * 

+     */

+    @JsonProperty("exitAirTemperature")

+    public Double getExitAirTemperature() {

+        return exitAirTemperature;

+    }

+

+    /**

+     * system fan exit air flow temperature in celsius

+     * 

+     */

+    @JsonProperty("exitAirTemperature")

+    public void setExitAirTemperature(Double exitAirTemperature) {

+        this.exitAirTemperature = exitAirTemperature;

+    }

+

+    /**

+     * front panel temperature in celsius

+     * 

+     */

+    @JsonProperty("frontPanelTemperature")

+    public Double getFrontPanelTemperature() {

+        return frontPanelTemperature;

+    }

+

+    /**

+     * front panel temperature in celsius

+     * 

+     */

+    @JsonProperty("frontPanelTemperature")

+    public void setFrontPanelTemperature(Double frontPanelTemperature) {

+        this.frontPanelTemperature = frontPanelTemperature;

+    }

+

+    /**

+     * io module temperature in celsius

+     * 

+     */

+    @JsonProperty("ioModuleTemperature")

+    public Double getIoModuleTemperature() {

+        return ioModuleTemperature;

+    }

+

+    /**

+     * io module temperature in celsius

+     * 

+     */

+    @JsonProperty("ioModuleTemperature")

+    public void setIoModuleTemperature(Double ioModuleTemperature) {

+        this.ioModuleTemperature = ioModuleTemperature;

+    }

+

+    /**

+     * array of ipmiBaseboardTemperature objects

+     * 

+     */

+    @JsonProperty("ipmiBaseboardTemperatureArray")

+    public List<IpmiBaseboardTemperatureArray> getIpmiBaseboardTemperatureArray() {

+        return ipmiBaseboardTemperatureArray;

+    }

+

+    /**

+     * array of ipmiBaseboardTemperature objects

+     * 

+     */

+    @JsonProperty("ipmiBaseboardTemperatureArray")

+    public void setIpmiBaseboardTemperatureArray(List<IpmiBaseboardTemperatureArray> ipmiBaseboardTemperatureArray) {

+        this.ipmiBaseboardTemperatureArray = ipmiBaseboardTemperatureArray;

+    }

+

+    /**

+     * array of ipmiBaseboardVoltageRegulator objects

+     * 

+     */

+    @JsonProperty("ipmiBaseboardVoltageRegulatorArray")

+    public List<IpmiBaseboardVoltageRegulatorArray> getIpmiBaseboardVoltageRegulatorArray() {

+        return ipmiBaseboardVoltageRegulatorArray;

+    }

+

+    /**

+     * array of ipmiBaseboardVoltageRegulator objects

+     * 

+     */

+    @JsonProperty("ipmiBaseboardVoltageRegulatorArray")

+    public void setIpmiBaseboardVoltageRegulatorArray(List<IpmiBaseboardVoltageRegulatorArray> ipmiBaseboardVoltageRegulatorArray) {

+        this.ipmiBaseboardVoltageRegulatorArray = ipmiBaseboardVoltageRegulatorArray;

+    }

+

+    /**

+     * array of ipmiBattery objects

+     * 

+     */

+    @JsonProperty("ipmiBatteryArray")

+    public List<IpmiBatteryArray> getIpmiBatteryArray() {

+        return ipmiBatteryArray;

+    }

+

+    /**

+     * array of ipmiBattery objects

+     * 

+     */

+    @JsonProperty("ipmiBatteryArray")

+    public void setIpmiBatteryArray(List<IpmiBatteryArray> ipmiBatteryArray) {

+        this.ipmiBatteryArray = ipmiBatteryArray;

+    }

+

+    /**

+     * array of ipmiFan objects

+     * 

+     */

+    @JsonProperty("ipmiFanArray")

+    public List<IpmiFanArray> getIpmiFanArray() {

+        return ipmiFanArray;

+    }

+

+    /**

+     * array of ipmiFan objects

+     * 

+     */

+    @JsonProperty("ipmiFanArray")

+    public void setIpmiFanArray(List<IpmiFanArray> ipmiFanArray) {

+        this.ipmiFanArray = ipmiFanArray;

+    }

+

+    /**

+     * array of ipmiHsbp objects

+     * 

+     */

+    @JsonProperty("ipmiHsbpArray")

+    public List<IpmiHsbpArray> getIpmiHsbpArray() {

+        return ipmiHsbpArray;

+    }

+

+    /**

+     * array of ipmiHsbp objects

+     * 

+     */

+    @JsonProperty("ipmiHsbpArray")

+    public void setIpmiHsbpArray(List<IpmiHsbpArray> ipmiHsbpArray) {

+        this.ipmiHsbpArray = ipmiHsbpArray;

+    }

+

+    /**

+     * array of ipmiGlobalAggregateTemperatureMargin objects

+     * 

+     */

+    @JsonProperty("ipmiGlobalAggregateTemperatureMarginArray")

+    public List<IpmiGlobalAggregateTemperatureMarginArray> getIpmiGlobalAggregateTemperatureMarginArray() {

+        return ipmiGlobalAggregateTemperatureMarginArray;

+    }

+

+    /**

+     * array of ipmiGlobalAggregateTemperatureMargin objects

+     * 

+     */

+    @JsonProperty("ipmiGlobalAggregateTemperatureMarginArray")

+    public void setIpmiGlobalAggregateTemperatureMarginArray(List<IpmiGlobalAggregateTemperatureMarginArray> ipmiGlobalAggregateTemperatureMarginArray) {

+        this.ipmiGlobalAggregateTemperatureMarginArray = ipmiGlobalAggregateTemperatureMarginArray;

+    }

+

+    /**

+     * array of ipmiNic objects

+     * 

+     */

+    @JsonProperty("ipmiNicArray")

+    public List<IpmiNicArray> getIpmiNicArray() {

+        return ipmiNicArray;

+    }

+

+    /**

+     * array of ipmiNic objects

+     * 

+     */

+    @JsonProperty("ipmiNicArray")

+    public void setIpmiNicArray(List<IpmiNicArray> ipmiNicArray) {

+        this.ipmiNicArray = ipmiNicArray;

+    }

+

+    /**

+     * array of ipmiPowerSupply objects

+     * 

+     */

+    @JsonProperty("ipmiPowerSupplyArray")

+    public List<IpmiPowerSupplyArray> getIpmiPowerSupplyArray() {

+        return ipmiPowerSupplyArray;

+    }

+

+    /**

+     * array of ipmiPowerSupply objects

+     * 

+     */

+    @JsonProperty("ipmiPowerSupplyArray")

+    public void setIpmiPowerSupplyArray(List<IpmiPowerSupplyArray> ipmiPowerSupplyArray) {

+        this.ipmiPowerSupplyArray = ipmiPowerSupplyArray;

+    }

+

+    /**

+     * array of ipmiProcessor objects

+     * 

+     */

+    @JsonProperty("ipmiProcessorArray")

+    public List<IpmiProcessorArray> getIpmiProcessorArray() {

+        return ipmiProcessorArray;

+    }

+

+    /**

+     * array of ipmiProcessor objects

+     * 

+     */

+    @JsonProperty("ipmiProcessorArray")

+    public void setIpmiProcessorArray(List<IpmiProcessorArray> ipmiProcessorArray) {

+        this.ipmiProcessorArray = ipmiProcessorArray;

+    }

+

+    /**

+     * airfflow in cubic feet per minute (cfm)

+     * 

+     */

+    @JsonProperty("systemAirflow")

+    public Double getSystemAirflow() {

+        return systemAirflow;

+    }

+

+    /**

+     * airfflow in cubic feet per minute (cfm)

+     * 

+     */

+    @JsonProperty("systemAirflow")

+    public void setSystemAirflow(Double systemAirflow) {

+        this.systemAirflow = systemAirflow;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(exitAirTemperature).append(frontPanelTemperature).append(ioModuleTemperature).append(ipmiBaseboardTemperatureArray).append(ipmiBaseboardVoltageRegulatorArray).append(ipmiBatteryArray).append(ipmiFanArray).append(ipmiHsbpArray).append(ipmiGlobalAggregateTemperatureMarginArray).append(ipmiNicArray).append(ipmiPowerSupplyArray).append(ipmiProcessorArray).append(systemAirflow).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof Ipmi) == false) {

+            return false;

+        }

+        Ipmi rhs = ((Ipmi) other);

+        return new EqualsBuilder().append(exitAirTemperature, rhs.exitAirTemperature).append(frontPanelTemperature, rhs.frontPanelTemperature).append(ioModuleTemperature, rhs.ioModuleTemperature).append(ipmiBaseboardTemperatureArray, rhs.ipmiBaseboardTemperatureArray).append(ipmiBaseboardVoltageRegulatorArray, rhs.ipmiBaseboardVoltageRegulatorArray).append(ipmiBatteryArray, rhs.ipmiBatteryArray).append(ipmiFanArray, rhs.ipmiFanArray).append(ipmiHsbpArray, rhs.ipmiHsbpArray).append(ipmiGlobalAggregateTemperatureMarginArray, rhs.ipmiGlobalAggregateTemperatureMarginArray).append(ipmiNicArray, rhs.ipmiNicArray).append(ipmiPowerSupplyArray, rhs.ipmiPowerSupplyArray).append(ipmiProcessorArray, rhs.ipmiProcessorArray).append(systemAirflow, rhs.systemAirflow).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardTemperatureArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardTemperatureArray.java
new file mode 100644
index 0000000..1f492a8
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardTemperatureArray.java
@@ -0,0 +1,118 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface (ipmi) baseboard temperature metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "baseboardTemperatureIdentifier",

+    "baseboardTemperature"

+})

+public class IpmiBaseboardTemperatureArray {

+

+    /**

+     * identifier for the location where the temperature is taken

+     * (Required)

+     * 

+     */

+    @JsonProperty("baseboardTemperatureIdentifier")

+    @JsonPropertyDescription("identifier for the location where the temperature is taken")

+    private String baseboardTemperatureIdentifier;

+    /**

+     * baseboard temperature in celsius

+     * 

+     */

+    @JsonProperty("baseboardTemperature")

+    @JsonPropertyDescription("baseboard temperature in celsius")

+    private Double baseboardTemperature;

+

+    /**

+     * identifier for the location where the temperature is taken

+     * (Required)

+     * 

+     */

+    @JsonProperty("baseboardTemperatureIdentifier")

+    public String getBaseboardTemperatureIdentifier() {

+        return baseboardTemperatureIdentifier;

+    }

+

+    /**

+     * identifier for the location where the temperature is taken

+     * (Required)

+     * 

+     */

+    @JsonProperty("baseboardTemperatureIdentifier")

+    public void setBaseboardTemperatureIdentifier(String baseboardTemperatureIdentifier) {

+        this.baseboardTemperatureIdentifier = baseboardTemperatureIdentifier;

+    }

+

+    /**

+     * baseboard temperature in celsius

+     * 

+     */

+    @JsonProperty("baseboardTemperature")

+    public Double getBaseboardTemperature() {

+        return baseboardTemperature;

+    }

+

+    /**

+     * baseboard temperature in celsius

+     * 

+     */

+    @JsonProperty("baseboardTemperature")

+    public void setBaseboardTemperature(Double baseboardTemperature) {

+        this.baseboardTemperature = baseboardTemperature;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(baseboardTemperatureIdentifier).append(baseboardTemperature).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof IpmiBaseboardTemperatureArray) == false) {

+            return false;

+        }

+        IpmiBaseboardTemperatureArray rhs = ((IpmiBaseboardTemperatureArray) other);

+        return new EqualsBuilder().append(baseboardTemperatureIdentifier, rhs.baseboardTemperatureIdentifier).append(baseboardTemperature, rhs.baseboardTemperature).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardVoltageRegulatorArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardVoltageRegulatorArray.java
new file mode 100644
index 0000000..0fce2d9
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardVoltageRegulatorArray.java
@@ -0,0 +1,118 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface (ipmi) baseboard voltage regulator metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "baseboardVoltageRegulatorIdentifier",

+    "voltageRegulatorTemperature"

+})

+public class IpmiBaseboardVoltageRegulatorArray {

+

+    /**

+     * identifier for the baseboard voltage regulator

+     * (Required)

+     * 

+     */

+    @JsonProperty("baseboardVoltageRegulatorIdentifier")

+    @JsonPropertyDescription("identifier for the baseboard voltage regulator")

+    private String baseboardVoltageRegulatorIdentifier;

+    /**

+     * voltage regulator temperature in celsius

+     * 

+     */

+    @JsonProperty("voltageRegulatorTemperature")

+    @JsonPropertyDescription("voltage regulator temperature in celsius")

+    private Double voltageRegulatorTemperature;

+

+    /**

+     * identifier for the baseboard voltage regulator

+     * (Required)

+     * 

+     */

+    @JsonProperty("baseboardVoltageRegulatorIdentifier")

+    public String getBaseboardVoltageRegulatorIdentifier() {

+        return baseboardVoltageRegulatorIdentifier;

+    }

+

+    /**

+     * identifier for the baseboard voltage regulator

+     * (Required)

+     * 

+     */

+    @JsonProperty("baseboardVoltageRegulatorIdentifier")

+    public void setBaseboardVoltageRegulatorIdentifier(String baseboardVoltageRegulatorIdentifier) {

+        this.baseboardVoltageRegulatorIdentifier = baseboardVoltageRegulatorIdentifier;

+    }

+

+    /**

+     * voltage regulator temperature in celsius

+     * 

+     */

+    @JsonProperty("voltageRegulatorTemperature")

+    public Double getVoltageRegulatorTemperature() {

+        return voltageRegulatorTemperature;

+    }

+

+    /**

+     * voltage regulator temperature in celsius

+     * 

+     */

+    @JsonProperty("voltageRegulatorTemperature")

+    public void setVoltageRegulatorTemperature(Double voltageRegulatorTemperature) {

+        this.voltageRegulatorTemperature = voltageRegulatorTemperature;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(baseboardVoltageRegulatorIdentifier).append(voltageRegulatorTemperature).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof IpmiBaseboardVoltageRegulatorArray) == false) {

+            return false;

+        }

+        IpmiBaseboardVoltageRegulatorArray rhs = ((IpmiBaseboardVoltageRegulatorArray) other);

+        return new EqualsBuilder().append(baseboardVoltageRegulatorIdentifier, rhs.baseboardVoltageRegulatorIdentifier).append(voltageRegulatorTemperature, rhs.voltageRegulatorTemperature).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBatteryArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBatteryArray.java
new file mode 100644
index 0000000..6c9ab9a
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBatteryArray.java
@@ -0,0 +1,144 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface (ipmi) battery metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "batteryIdentifier",

+    "batteryType",

+    "batteryVoltageLevel"

+})

+public class IpmiBatteryArray {

+

+    /**

+     * identifier for the battery

+     * (Required)

+     * 

+     */

+    @JsonProperty("batteryIdentifier")

+    @JsonPropertyDescription("identifier for the battery")

+    private String batteryIdentifier;

+    /**

+     * type of battery

+     * 

+     */

+    @JsonProperty("batteryType")

+    @JsonPropertyDescription("type of battery")

+    private String batteryType;

+    /**

+     * battery voltage level

+     * 

+     */

+    @JsonProperty("batteryVoltageLevel")

+    @JsonPropertyDescription("battery voltage level")

+    private Double batteryVoltageLevel;

+

+    /**

+     * identifier for the battery

+     * (Required)

+     * 

+     */

+    @JsonProperty("batteryIdentifier")

+    public String getBatteryIdentifier() {

+        return batteryIdentifier;

+    }

+

+    /**

+     * identifier for the battery

+     * (Required)

+     * 

+     */

+    @JsonProperty("batteryIdentifier")

+    public void setBatteryIdentifier(String batteryIdentifier) {

+        this.batteryIdentifier = batteryIdentifier;

+    }

+

+    /**

+     * type of battery

+     * 

+     */

+    @JsonProperty("batteryType")

+    public String getBatteryType() {

+        return batteryType;

+    }

+

+    /**

+     * type of battery

+     * 

+     */

+    @JsonProperty("batteryType")

+    public void setBatteryType(String batteryType) {

+        this.batteryType = batteryType;

+    }

+

+    /**

+     * battery voltage level

+     * 

+     */

+    @JsonProperty("batteryVoltageLevel")

+    public Double getBatteryVoltageLevel() {

+        return batteryVoltageLevel;

+    }

+

+    /**

+     * battery voltage level

+     * 

+     */

+    @JsonProperty("batteryVoltageLevel")

+    public void setBatteryVoltageLevel(Double batteryVoltageLevel) {

+        this.batteryVoltageLevel = batteryVoltageLevel;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(batteryIdentifier).append(batteryType).append(batteryVoltageLevel).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof IpmiBatteryArray) == false) {

+            return false;

+        }

+        IpmiBatteryArray rhs = ((IpmiBatteryArray) other);

+        return new EqualsBuilder().append(batteryIdentifier, rhs.batteryIdentifier).append(batteryType, rhs.batteryType).append(batteryVoltageLevel, rhs.batteryVoltageLevel).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiFanArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiFanArray.java
new file mode 100644
index 0000000..c3af417
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiFanArray.java
@@ -0,0 +1,118 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface (ipmi) fan metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "fanIdentifier",

+    "fanSpeed"

+})

+public class IpmiFanArray {

+

+    /**

+     * identifier for the fan

+     * (Required)

+     * 

+     */

+    @JsonProperty("fanIdentifier")

+    @JsonPropertyDescription("identifier for the fan")

+    private String fanIdentifier;

+    /**

+     * fan speed in revolutions per minute (rpm)

+     * 

+     */

+    @JsonProperty("fanSpeed")

+    @JsonPropertyDescription("fan speed in revolutions per minute (rpm)")

+    private Double fanSpeed;

+

+    /**

+     * identifier for the fan

+     * (Required)

+     * 

+     */

+    @JsonProperty("fanIdentifier")

+    public String getFanIdentifier() {

+        return fanIdentifier;

+    }

+

+    /**

+     * identifier for the fan

+     * (Required)

+     * 

+     */

+    @JsonProperty("fanIdentifier")

+    public void setFanIdentifier(String fanIdentifier) {

+        this.fanIdentifier = fanIdentifier;

+    }

+

+    /**

+     * fan speed in revolutions per minute (rpm)

+     * 

+     */

+    @JsonProperty("fanSpeed")

+    public Double getFanSpeed() {

+        return fanSpeed;

+    }

+

+    /**

+     * fan speed in revolutions per minute (rpm)

+     * 

+     */

+    @JsonProperty("fanSpeed")

+    public void setFanSpeed(Double fanSpeed) {

+        this.fanSpeed = fanSpeed;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(fanIdentifier).append(fanSpeed).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof IpmiFanArray) == false) {

+            return false;

+        }

+        IpmiFanArray rhs = ((IpmiFanArray) other);

+        return new EqualsBuilder().append(fanIdentifier, rhs.fanIdentifier).append(fanSpeed, rhs.fanSpeed).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiGlobalAggregateTemperatureMarginArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiGlobalAggregateTemperatureMarginArray.java
new file mode 100644
index 0000000..8c80e35
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiGlobalAggregateTemperatureMarginArray.java
@@ -0,0 +1,121 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface (ipmi) global aggregate temperature margin

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "ipmiGlobalAggregateTemperatureMarginIdentifier",

+    "globalAggregateTemperatureMargin"

+})

+public class IpmiGlobalAggregateTemperatureMarginArray {

+

+    /**

+     * identifier for the ipmi global aggregate temperature margin metrics

+     * (Required)

+     * 

+     */

+    @JsonProperty("ipmiGlobalAggregateTemperatureMarginIdentifier")

+    @JsonPropertyDescription("identifier for the ipmi global aggregate temperature margin metrics")

+    private String ipmiGlobalAggregateTemperatureMarginIdentifier;

+    /**

+     * the difference between the current global aggregate temperature, in celsius, and the global aggregate throttling thermal trip point

+     * (Required)

+     * 

+     */

+    @JsonProperty("globalAggregateTemperatureMargin")

+    @JsonPropertyDescription("the difference between the current global aggregate temperature, in celsius, and the global aggregate throttling thermal trip point")

+    private Double globalAggregateTemperatureMargin;

+

+    /**

+     * identifier for the ipmi global aggregate temperature margin metrics

+     * (Required)

+     * 

+     */

+    @JsonProperty("ipmiGlobalAggregateTemperatureMarginIdentifier")

+    public String getIpmiGlobalAggregateTemperatureMarginIdentifier() {

+        return ipmiGlobalAggregateTemperatureMarginIdentifier;

+    }

+

+    /**

+     * identifier for the ipmi global aggregate temperature margin metrics

+     * (Required)

+     * 

+     */

+    @JsonProperty("ipmiGlobalAggregateTemperatureMarginIdentifier")

+    public void setIpmiGlobalAggregateTemperatureMarginIdentifier(String ipmiGlobalAggregateTemperatureMarginIdentifier) {

+        this.ipmiGlobalAggregateTemperatureMarginIdentifier = ipmiGlobalAggregateTemperatureMarginIdentifier;

+    }

+

+    /**

+     * the difference between the current global aggregate temperature, in celsius, and the global aggregate throttling thermal trip point

+     * (Required)

+     * 

+     */

+    @JsonProperty("globalAggregateTemperatureMargin")

+    public Double getGlobalAggregateTemperatureMargin() {

+        return globalAggregateTemperatureMargin;

+    }

+

+    /**

+     * the difference between the current global aggregate temperature, in celsius, and the global aggregate throttling thermal trip point

+     * (Required)

+     * 

+     */

+    @JsonProperty("globalAggregateTemperatureMargin")

+    public void setGlobalAggregateTemperatureMargin(Double globalAggregateTemperatureMargin) {

+        this.globalAggregateTemperatureMargin = globalAggregateTemperatureMargin;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(ipmiGlobalAggregateTemperatureMarginIdentifier).append(globalAggregateTemperatureMargin).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof IpmiGlobalAggregateTemperatureMarginArray) == false) {

+            return false;

+        }

+        IpmiGlobalAggregateTemperatureMarginArray rhs = ((IpmiGlobalAggregateTemperatureMarginArray) other);

+        return new EqualsBuilder().append(ipmiGlobalAggregateTemperatureMarginIdentifier, rhs.ipmiGlobalAggregateTemperatureMarginIdentifier).append(globalAggregateTemperatureMargin, rhs.globalAggregateTemperatureMargin).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiHsbpArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiHsbpArray.java
new file mode 100644
index 0000000..751d486
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiHsbpArray.java
@@ -0,0 +1,118 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface (ipmi) hot swap backplane power metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "hsbpIdentifier",

+    "hsbpTemperature"

+})

+public class IpmiHsbpArray {

+

+    /**

+     * identifier for the hot swap backplane power unit

+     * (Required)

+     * 

+     */

+    @JsonProperty("hsbpIdentifier")

+    @JsonPropertyDescription("identifier for the hot swap backplane power unit")

+    private String hsbpIdentifier;

+    /**

+     * hot swap backplane power temperature in celsius

+     * 

+     */

+    @JsonProperty("hsbpTemperature")

+    @JsonPropertyDescription("hot swap backplane power temperature in celsius")

+    private Double hsbpTemperature;

+

+    /**

+     * identifier for the hot swap backplane power unit

+     * (Required)

+     * 

+     */

+    @JsonProperty("hsbpIdentifier")

+    public String getHsbpIdentifier() {

+        return hsbpIdentifier;

+    }

+

+    /**

+     * identifier for the hot swap backplane power unit

+     * (Required)

+     * 

+     */

+    @JsonProperty("hsbpIdentifier")

+    public void setHsbpIdentifier(String hsbpIdentifier) {

+        this.hsbpIdentifier = hsbpIdentifier;

+    }

+

+    /**

+     * hot swap backplane power temperature in celsius

+     * 

+     */

+    @JsonProperty("hsbpTemperature")

+    public Double getHsbpTemperature() {

+        return hsbpTemperature;

+    }

+

+    /**

+     * hot swap backplane power temperature in celsius

+     * 

+     */

+    @JsonProperty("hsbpTemperature")

+    public void setHsbpTemperature(Double hsbpTemperature) {

+        this.hsbpTemperature = hsbpTemperature;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(hsbpIdentifier).append(hsbpTemperature).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof IpmiHsbpArray) == false) {

+            return false;

+        }

+        IpmiHsbpArray rhs = ((IpmiHsbpArray) other);

+        return new EqualsBuilder().append(hsbpIdentifier, rhs.hsbpIdentifier).append(hsbpTemperature, rhs.hsbpTemperature).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiNicArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiNicArray.java
new file mode 100644
index 0000000..ec84e99
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiNicArray.java
@@ -0,0 +1,118 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface (ipmi) network interface control card (nic) metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "nicIdentifier",

+    "nicTemperature"

+})

+public class IpmiNicArray {

+

+    /**

+     * identifier for the network interface control card

+     * (Required)

+     * 

+     */

+    @JsonProperty("nicIdentifier")

+    @JsonPropertyDescription("identifier for the network interface control card")

+    private String nicIdentifier;

+    /**

+     * nic temperature in celsius

+     * 

+     */

+    @JsonProperty("nicTemperature")

+    @JsonPropertyDescription("nic temperature in celsius")

+    private Double nicTemperature;

+

+    /**

+     * identifier for the network interface control card

+     * (Required)

+     * 

+     */

+    @JsonProperty("nicIdentifier")

+    public String getNicIdentifier() {

+        return nicIdentifier;

+    }

+

+    /**

+     * identifier for the network interface control card

+     * (Required)

+     * 

+     */

+    @JsonProperty("nicIdentifier")

+    public void setNicIdentifier(String nicIdentifier) {

+        this.nicIdentifier = nicIdentifier;

+    }

+

+    /**

+     * nic temperature in celsius

+     * 

+     */

+    @JsonProperty("nicTemperature")

+    public Double getNicTemperature() {

+        return nicTemperature;

+    }

+

+    /**

+     * nic temperature in celsius

+     * 

+     */

+    @JsonProperty("nicTemperature")

+    public void setNicTemperature(Double nicTemperature) {

+        this.nicTemperature = nicTemperature;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(nicIdentifier).append(nicTemperature).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof IpmiNicArray) == false) {

+            return false;

+        }

+        IpmiNicArray rhs = ((IpmiNicArray) other);

+        return new EqualsBuilder().append(nicIdentifier, rhs.nicIdentifier).append(nicTemperature, rhs.nicTemperature).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiPowerSupplyArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiPowerSupplyArray.java
new file mode 100644
index 0000000..a78ba4a
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiPowerSupplyArray.java
@@ -0,0 +1,170 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface (ipmi) power supply metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "powerSupplyIdentifier",

+    "powerSupplyInputPower",

+    "powerSupplyCurrentOutputPercent",

+    "powerSupplyTemperature"

+})

+public class IpmiPowerSupplyArray {

+

+    /**

+     * identifier for the power supply

+     * (Required)

+     * 

+     */

+    @JsonProperty("powerSupplyIdentifier")

+    @JsonPropertyDescription("identifier for the power supply")

+    private String powerSupplyIdentifier;

+    /**

+     * input power in watts

+     * 

+     */

+    @JsonProperty("powerSupplyInputPower")

+    @JsonPropertyDescription("input power in watts")

+    private Double powerSupplyInputPower;

+    /**

+     * current output voltage as a percentage of the design specified level

+     * 

+     */

+    @JsonProperty("powerSupplyCurrentOutputPercent")

+    @JsonPropertyDescription("current output voltage as a percentage of the design specified level")

+    private Double powerSupplyCurrentOutputPercent;

+    /**

+     * power supply temperature in celsius

+     * 

+     */

+    @JsonProperty("powerSupplyTemperature")

+    @JsonPropertyDescription("power supply temperature in celsius")

+    private Double powerSupplyTemperature;

+

+    /**

+     * identifier for the power supply

+     * (Required)

+     * 

+     */

+    @JsonProperty("powerSupplyIdentifier")

+    public String getPowerSupplyIdentifier() {

+        return powerSupplyIdentifier;

+    }

+

+    /**

+     * identifier for the power supply

+     * (Required)

+     * 

+     */

+    @JsonProperty("powerSupplyIdentifier")

+    public void setPowerSupplyIdentifier(String powerSupplyIdentifier) {

+        this.powerSupplyIdentifier = powerSupplyIdentifier;

+    }

+

+    /**

+     * input power in watts

+     * 

+     */

+    @JsonProperty("powerSupplyInputPower")

+    public Double getPowerSupplyInputPower() {

+        return powerSupplyInputPower;

+    }

+

+    /**

+     * input power in watts

+     * 

+     */

+    @JsonProperty("powerSupplyInputPower")

+    public void setPowerSupplyInputPower(Double powerSupplyInputPower) {

+        this.powerSupplyInputPower = powerSupplyInputPower;

+    }

+

+    /**

+     * current output voltage as a percentage of the design specified level

+     * 

+     */

+    @JsonProperty("powerSupplyCurrentOutputPercent")

+    public Double getPowerSupplyCurrentOutputPercent() {

+        return powerSupplyCurrentOutputPercent;

+    }

+

+    /**

+     * current output voltage as a percentage of the design specified level

+     * 

+     */

+    @JsonProperty("powerSupplyCurrentOutputPercent")

+    public void setPowerSupplyCurrentOutputPercent(Double powerSupplyCurrentOutputPercent) {

+        this.powerSupplyCurrentOutputPercent = powerSupplyCurrentOutputPercent;

+    }

+

+    /**

+     * power supply temperature in celsius

+     * 

+     */

+    @JsonProperty("powerSupplyTemperature")

+    public Double getPowerSupplyTemperature() {

+        return powerSupplyTemperature;

+    }

+

+    /**

+     * power supply temperature in celsius

+     * 

+     */

+    @JsonProperty("powerSupplyTemperature")

+    public void setPowerSupplyTemperature(Double powerSupplyTemperature) {

+        this.powerSupplyTemperature = powerSupplyTemperature;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(powerSupplyIdentifier).append(powerSupplyInputPower).append(powerSupplyCurrentOutputPercent).append(powerSupplyTemperature).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof IpmiPowerSupplyArray) == false) {

+            return false;

+        }

+        IpmiPowerSupplyArray rhs = ((IpmiPowerSupplyArray) other);

+        return new EqualsBuilder().append(powerSupplyIdentifier, rhs.powerSupplyIdentifier).append(powerSupplyInputPower, rhs.powerSupplyInputPower).append(powerSupplyCurrentOutputPercent, rhs.powerSupplyCurrentOutputPercent).append(powerSupplyTemperature, rhs.powerSupplyTemperature).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiProcessorArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiProcessorArray.java
new file mode 100644
index 0000000..e8733fe
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiProcessorArray.java
@@ -0,0 +1,172 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.List;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface processor metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "processorIdentifier",

+    "processorThermalControlPercent",

+    "processorDtsThermalMargin",

+    "processorDimmAggregateThermalMarginArray"

+})

+public class IpmiProcessorArray {

+

+    /**

+     * identifier for an ipmi processor

+     * (Required)

+     * 

+     */

+    @JsonProperty("processorIdentifier")

+    @JsonPropertyDescription("identifier for an ipmi processor")

+    private String processorIdentifier;

+    /**

+     * io module temperature in celsius

+     * 

+     */

+    @JsonProperty("processorThermalControlPercent")

+    @JsonPropertyDescription("io module temperature in celsius")

+    private Double processorThermalControlPercent;

+    /**

+     * front panel temperature in celsius

+     * 

+     */

+    @JsonProperty("processorDtsThermalMargin")

+    @JsonPropertyDescription("front panel temperature in celsius")

+    private Double processorDtsThermalMargin;

+    /**

+     * array of processorDimmAggregateThermalMargin objects

+     * 

+     */

+    @JsonProperty("processorDimmAggregateThermalMarginArray")

+    @JsonPropertyDescription("array of processorDimmAggregateThermalMargin objects")

+    private List<ProcessorDimmAggregateThermalMarginArray> processorDimmAggregateThermalMarginArray = new ArrayList<ProcessorDimmAggregateThermalMarginArray>();

+

+    /**

+     * identifier for an ipmi processor

+     * (Required)

+     * 

+     */

+    @JsonProperty("processorIdentifier")

+    public String getProcessorIdentifier() {

+        return processorIdentifier;

+    }

+

+    /**

+     * identifier for an ipmi processor

+     * (Required)

+     * 

+     */

+    @JsonProperty("processorIdentifier")

+    public void setProcessorIdentifier(String processorIdentifier) {

+        this.processorIdentifier = processorIdentifier;

+    }

+

+    /**

+     * io module temperature in celsius

+     * 

+     */

+    @JsonProperty("processorThermalControlPercent")

+    public Double getProcessorThermalControlPercent() {

+        return processorThermalControlPercent;

+    }

+

+    /**

+     * io module temperature in celsius

+     * 

+     */

+    @JsonProperty("processorThermalControlPercent")

+    public void setProcessorThermalControlPercent(Double processorThermalControlPercent) {

+        this.processorThermalControlPercent = processorThermalControlPercent;

+    }

+

+    /**

+     * front panel temperature in celsius

+     * 

+     */

+    @JsonProperty("processorDtsThermalMargin")

+    public Double getProcessorDtsThermalMargin() {

+        return processorDtsThermalMargin;

+    }

+

+    /**

+     * front panel temperature in celsius

+     * 

+     */

+    @JsonProperty("processorDtsThermalMargin")

+    public void setProcessorDtsThermalMargin(Double processorDtsThermalMargin) {

+        this.processorDtsThermalMargin = processorDtsThermalMargin;

+    }

+

+    /**

+     * array of processorDimmAggregateThermalMargin objects

+     * 

+     */

+    @JsonProperty("processorDimmAggregateThermalMarginArray")

+    public List<ProcessorDimmAggregateThermalMarginArray> getProcessorDimmAggregateThermalMarginArray() {

+        return processorDimmAggregateThermalMarginArray;

+    }

+

+    /**

+     * array of processorDimmAggregateThermalMargin objects

+     * 

+     */

+    @JsonProperty("processorDimmAggregateThermalMarginArray")

+    public void setProcessorDimmAggregateThermalMarginArray(List<ProcessorDimmAggregateThermalMarginArray> processorDimmAggregateThermalMarginArray) {

+        this.processorDimmAggregateThermalMarginArray = processorDimmAggregateThermalMarginArray;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(processorIdentifier).append(processorThermalControlPercent).append(processorDtsThermalMargin).append(processorDimmAggregateThermalMarginArray).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof IpmiProcessorArray) == false) {

+            return false;

+        }

+        IpmiProcessorArray rhs = ((IpmiProcessorArray) other);

+        return new EqualsBuilder().append(processorIdentifier, rhs.processorIdentifier).append(processorThermalControlPercent, rhs.processorThermalControlPercent).append(processorDtsThermalMargin, rhs.processorDtsThermalMargin).append(processorDimmAggregateThermalMarginArray, rhs.processorDimmAggregateThermalMarginArray).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/LatencyDistribution.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/LatencyDistribution.java
index 56d54cf..0ca44cd 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/LatencyDistribution.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/LatencyDistribution.java
@@ -1,113 +1,116 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "countsInTheBucket",
-    "highEndOfLatencyBucket",
-    "lowEndOfLatencyBucket"
-})
-public class LatencyDistribution {
-
-    @JsonProperty("countsInTheBucket")
-    private Double countsInTheBucket;
-    @JsonProperty("highEndOfLatencyBucket")
-    private Double highEndOfLatencyBucket;
-    @JsonProperty("lowEndOfLatencyBucket")
-    private Double lowEndOfLatencyBucket;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("countsInTheBucket")
-    public Double getCountsInTheBucket() {
-        return countsInTheBucket;
-    }
-
-    @JsonProperty("countsInTheBucket")
-    public void setCountsInTheBucket(Double countsInTheBucket) {
-        this.countsInTheBucket = countsInTheBucket;
-    }
-
-    @JsonProperty("highEndOfLatencyBucket")
-    public Double getHighEndOfLatencyBucket() {
-        return highEndOfLatencyBucket;
-    }
-
-    @JsonProperty("highEndOfLatencyBucket")
-    public void setHighEndOfLatencyBucket(Double highEndOfLatencyBucket) {
-        this.highEndOfLatencyBucket = highEndOfLatencyBucket;
-    }
-
-    @JsonProperty("lowEndOfLatencyBucket")
-    public Double getLowEndOfLatencyBucket() {
-        return lowEndOfLatencyBucket;
-    }
-
-    @JsonProperty("lowEndOfLatencyBucket")
-    public void setLowEndOfLatencyBucket(Double lowEndOfLatencyBucket) {
-        this.lowEndOfLatencyBucket = lowEndOfLatencyBucket;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("countsInTheBucket", countsInTheBucket).append("highEndOfLatencyBucket", highEndOfLatencyBucket).append("lowEndOfLatencyBucket", lowEndOfLatencyBucket).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(countsInTheBucket).append(additionalProperties).append(highEndOfLatencyBucket).append(lowEndOfLatencyBucket).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof LatencyDistribution) == false) {
-            return false;
-        }
-        LatencyDistribution rhs = ((LatencyDistribution) other);
-        return new EqualsBuilder().append(countsInTheBucket, rhs.countsInTheBucket).append(additionalProperties, rhs.additionalProperties).append(highEndOfLatencyBucket, rhs.highEndOfLatencyBucket).append(lowEndOfLatencyBucket, rhs.lowEndOfLatencyBucket).isEquals();
-    }
-
-}
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * number of counts falling within a defined latency bucket

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "countsInTheBucket",

+    "highEndOfLatencyBucket",

+    "lowEndOfLatencyBucket"

+})

+public class LatencyDistribution {

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("countsInTheBucket")

+    private Double countsInTheBucket;

+    @JsonProperty("highEndOfLatencyBucket")

+    private Double highEndOfLatencyBucket;

+    @JsonProperty("lowEndOfLatencyBucket")

+    private Double lowEndOfLatencyBucket;

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("countsInTheBucket")

+    public Double getCountsInTheBucket() {

+        return countsInTheBucket;

+    }

+

+    /**

+     * 

+     * (Required)

+     * 

+     */

+    @JsonProperty("countsInTheBucket")

+    public void setCountsInTheBucket(Double countsInTheBucket) {

+        this.countsInTheBucket = countsInTheBucket;

+    }

+

+    @JsonProperty("highEndOfLatencyBucket")

+    public Double getHighEndOfLatencyBucket() {

+        return highEndOfLatencyBucket;

+    }

+

+    @JsonProperty("highEndOfLatencyBucket")

+    public void setHighEndOfLatencyBucket(Double highEndOfLatencyBucket) {

+        this.highEndOfLatencyBucket = highEndOfLatencyBucket;

+    }

+

+    @JsonProperty("lowEndOfLatencyBucket")

+    public Double getLowEndOfLatencyBucket() {

+        return lowEndOfLatencyBucket;

+    }

+

+    @JsonProperty("lowEndOfLatencyBucket")

+    public void setLowEndOfLatencyBucket(Double lowEndOfLatencyBucket) {

+        this.lowEndOfLatencyBucket = lowEndOfLatencyBucket;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(countsInTheBucket).append(highEndOfLatencyBucket).append(lowEndOfLatencyBucket).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof LatencyDistribution) == false) {

+            return false;

+        }

+        LatencyDistribution rhs = ((LatencyDistribution) other);

+        return new EqualsBuilder().append(countsInTheBucket, rhs.countsInTheBucket).append(highEndOfLatencyBucket, rhs.highEndOfLatencyBucket).append(lowEndOfLatencyBucket, rhs.lowEndOfLatencyBucket).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/LoadArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/LoadArray.java
new file mode 100644
index 0000000..00f5394
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/LoadArray.java
@@ -0,0 +1,141 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * /proc/loadavg cpu utilization and io utilization metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "longTerm",

+    "midTerm",

+    "shortTerm"

+})

+public class LoadArray {

+

+    /**

+     * number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 15 minutes using /proc/loadavg

+     * 

+     */

+    @JsonProperty("longTerm")

+    @JsonPropertyDescription("number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 15 minutes using /proc/loadavg")

+    private Double longTerm;

+    /**

+     * number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 5 minutes using /proc/loadavg

+     * 

+     */

+    @JsonProperty("midTerm")

+    @JsonPropertyDescription("number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 5 minutes using /proc/loadavg")

+    private Double midTerm;

+    /**

+     * number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 1 minute using /proc/loadavg

+     * 

+     */

+    @JsonProperty("shortTerm")

+    @JsonPropertyDescription("number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 1 minute using /proc/loadavg")

+    private Double shortTerm;

+

+    /**

+     * number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 15 minutes using /proc/loadavg

+     * 

+     */

+    @JsonProperty("longTerm")

+    public Double getLongTerm() {

+        return longTerm;

+    }

+

+    /**

+     * number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 15 minutes using /proc/loadavg

+     * 

+     */

+    @JsonProperty("longTerm")

+    public void setLongTerm(Double longTerm) {

+        this.longTerm = longTerm;

+    }

+

+    /**

+     * number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 5 minutes using /proc/loadavg

+     * 

+     */

+    @JsonProperty("midTerm")

+    public Double getMidTerm() {

+        return midTerm;

+    }

+

+    /**

+     * number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 5 minutes using /proc/loadavg

+     * 

+     */

+    @JsonProperty("midTerm")

+    public void setMidTerm(Double midTerm) {

+        this.midTerm = midTerm;

+    }

+

+    /**

+     * number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 1 minute using /proc/loadavg

+     * 

+     */

+    @JsonProperty("shortTerm")

+    public Double getShortTerm() {

+        return shortTerm;

+    }

+

+    /**

+     * number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 1 minute using /proc/loadavg

+     * 

+     */

+    @JsonProperty("shortTerm")

+    public void setShortTerm(Double shortTerm) {

+        this.shortTerm = shortTerm;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(longTerm).append(midTerm).append(shortTerm).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof LoadArray) == false) {

+            return false;

+        }

+        LoadArray rhs = ((LoadArray) other);

+        return new EqualsBuilder().append(longTerm, rhs.longTerm).append(midTerm, rhs.midTerm).append(shortTerm, rhs.shortTerm).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MachineCheckExceptionArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MachineCheckExceptionArray.java
new file mode 100644
index 0000000..fb8c075
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MachineCheckExceptionArray.java
@@ -0,0 +1,196 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * metrics on vm machine check exceptions

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "correctedMemoryErrors",

+    "correctedMemoryErrorsIn1Hr",

+    "uncorrectedMemoryErrors",

+    "uncorrectedMemoryErrorsIn1Hr",

+    "vmIdentifier"

+})

+public class MachineCheckExceptionArray {

+

+    /**

+     * total hardware errors that were corrected by the hardware (e.g. data corruption corrected via  ECC) over the measurementInterval

+     * 

+     */

+    @JsonProperty("correctedMemoryErrors")

+    @JsonPropertyDescription("total hardware errors that were corrected by the hardware (e.g. data corruption corrected via  ECC) over the measurementInterval")

+    private Double correctedMemoryErrors;

+    /**

+     * total hardware errors that were corrected by the hardware over the last one hour

+     * 

+     */

+    @JsonProperty("correctedMemoryErrorsIn1Hr")

+    @JsonPropertyDescription("total hardware errors that were corrected by the hardware over the last one hour")

+    private Double correctedMemoryErrorsIn1Hr;

+    /**

+     * total uncorrected hardware errors that were detected by the hardware (e.g., causing data corruption) over the measurementInterval

+     * 

+     */

+    @JsonProperty("uncorrectedMemoryErrors")

+    @JsonPropertyDescription("total uncorrected hardware errors that were detected by the hardware (e.g., causing data corruption) over the measurementInterval")

+    private Double uncorrectedMemoryErrors;

+    /**

+     * total uncorrected hardware errors that were detected by the hardware over the last one hour

+     * 

+     */

+    @JsonProperty("uncorrectedMemoryErrorsIn1Hr")

+    @JsonPropertyDescription("total uncorrected hardware errors that were detected by the hardware over the last one hour")

+    private Double uncorrectedMemoryErrorsIn1Hr;

+    /**

+     * virtual machine identifier associated with the machine check exception

+     * (Required)

+     * 

+     */

+    @JsonProperty("vmIdentifier")

+    @JsonPropertyDescription("virtual machine identifier associated with the machine check exception")

+    private String vmIdentifier;

+

+    /**

+     * total hardware errors that were corrected by the hardware (e.g. data corruption corrected via  ECC) over the measurementInterval

+     * 

+     */

+    @JsonProperty("correctedMemoryErrors")

+    public Double getCorrectedMemoryErrors() {

+        return correctedMemoryErrors;

+    }

+

+    /**

+     * total hardware errors that were corrected by the hardware (e.g. data corruption corrected via  ECC) over the measurementInterval

+     * 

+     */

+    @JsonProperty("correctedMemoryErrors")

+    public void setCorrectedMemoryErrors(Double correctedMemoryErrors) {

+        this.correctedMemoryErrors = correctedMemoryErrors;

+    }

+

+    /**

+     * total hardware errors that were corrected by the hardware over the last one hour

+     * 

+     */

+    @JsonProperty("correctedMemoryErrorsIn1Hr")

+    public Double getCorrectedMemoryErrorsIn1Hr() {

+        return correctedMemoryErrorsIn1Hr;

+    }

+

+    /**

+     * total hardware errors that were corrected by the hardware over the last one hour

+     * 

+     */

+    @JsonProperty("correctedMemoryErrorsIn1Hr")

+    public void setCorrectedMemoryErrorsIn1Hr(Double correctedMemoryErrorsIn1Hr) {

+        this.correctedMemoryErrorsIn1Hr = correctedMemoryErrorsIn1Hr;

+    }

+

+    /**

+     * total uncorrected hardware errors that were detected by the hardware (e.g., causing data corruption) over the measurementInterval

+     * 

+     */

+    @JsonProperty("uncorrectedMemoryErrors")

+    public Double getUncorrectedMemoryErrors() {

+        return uncorrectedMemoryErrors;

+    }

+

+    /**

+     * total uncorrected hardware errors that were detected by the hardware (e.g., causing data corruption) over the measurementInterval

+     * 

+     */

+    @JsonProperty("uncorrectedMemoryErrors")

+    public void setUncorrectedMemoryErrors(Double uncorrectedMemoryErrors) {

+        this.uncorrectedMemoryErrors = uncorrectedMemoryErrors;

+    }

+

+    /**

+     * total uncorrected hardware errors that were detected by the hardware over the last one hour

+     * 

+     */

+    @JsonProperty("uncorrectedMemoryErrorsIn1Hr")

+    public Double getUncorrectedMemoryErrorsIn1Hr() {

+        return uncorrectedMemoryErrorsIn1Hr;

+    }

+

+    /**

+     * total uncorrected hardware errors that were detected by the hardware over the last one hour

+     * 

+     */

+    @JsonProperty("uncorrectedMemoryErrorsIn1Hr")

+    public void setUncorrectedMemoryErrorsIn1Hr(Double uncorrectedMemoryErrorsIn1Hr) {

+        this.uncorrectedMemoryErrorsIn1Hr = uncorrectedMemoryErrorsIn1Hr;

+    }

+

+    /**

+     * virtual machine identifier associated with the machine check exception

+     * (Required)

+     * 

+     */

+    @JsonProperty("vmIdentifier")

+    public String getVmIdentifier() {

+        return vmIdentifier;

+    }

+

+    /**

+     * virtual machine identifier associated with the machine check exception

+     * (Required)

+     * 

+     */

+    @JsonProperty("vmIdentifier")

+    public void setVmIdentifier(String vmIdentifier) {

+        this.vmIdentifier = vmIdentifier;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(correctedMemoryErrors).append(correctedMemoryErrorsIn1Hr).append(uncorrectedMemoryErrors).append(uncorrectedMemoryErrorsIn1Hr).append(vmIdentifier).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof MachineCheckExceptionArray) == false) {

+            return false;

+        }

+        MachineCheckExceptionArray rhs = ((MachineCheckExceptionArray) other);

+        return new EqualsBuilder().append(correctedMemoryErrors, rhs.correctedMemoryErrors).append(correctedMemoryErrorsIn1Hr, rhs.correctedMemoryErrorsIn1Hr).append(uncorrectedMemoryErrors, rhs.uncorrectedMemoryErrors).append(uncorrectedMemoryErrorsIn1Hr, rhs.uncorrectedMemoryErrorsIn1Hr).append(vmIdentifier, rhs.vmIdentifier).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MeasurementFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MeasurementFields.java
new file mode 100644
index 0000000..2c82fed
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MeasurementFields.java
@@ -0,0 +1,737 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * measurement fields

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalFields",

+    "additionalMeasurements",

+    "additionalObjects",

+    "codecUsageArray",

+    "concurrentSessions",

+    "configuredEntities",

+    "cpuUsageArray",

+    "diskUsageArray",

+    "featureUsageArray",

+    "filesystemUsageArray",

+    "hugePagesArray",

+    "ipmi",

+    "latencyDistribution",

+    "loadArray",

+    "machineCheckExceptionArray",

+    "meanRequestLatency",

+    "measurementInterval",

+    "measurementFieldsVersion",

+    "memoryUsageArray",

+    "numberOfMediaPortsInUse",

+    "requestRate",

+    "nfcScalingMetric",

+    "nicPerformanceArray",

+    "processStatsArray"

+})

+public class MeasurementFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalFields;

+    /**

+     * array of named hashMaps

+     * 

+     */

+    @JsonProperty("additionalMeasurements")

+    @JsonPropertyDescription("array of named hashMaps")

+    private List<AdditionalMeasurement> additionalMeasurements = new ArrayList<AdditionalMeasurement>();

+    /**

+     * array of json objects described by name, schema and other meta-information

+     * 

+     */

+    @JsonProperty("additionalObjects")

+    @JsonPropertyDescription("array of json objects described by name, schema and other meta-information")

+    private List<AdditionalObject> additionalObjects = new ArrayList<AdditionalObject>();

+    /**

+     * array of codecs in use

+     * 

+     */

+    @JsonProperty("codecUsageArray")

+    @JsonPropertyDescription("array of codecs in use")

+    private List<CodecUsageArray> codecUsageArray = new ArrayList<CodecUsageArray>();

+    /**

+     * peak concurrent sessions for the VM or xNF over the measurementInterval

+     * 

+     */

+    @JsonProperty("concurrentSessions")

+    @JsonPropertyDescription("peak concurrent sessions for the VM or xNF over the measurementInterval")

+    private Integer concurrentSessions;

+    /**

+     * over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the xNF

+     * 

+     */

+    @JsonProperty("configuredEntities")

+    @JsonPropertyDescription("over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the xNF")

+    private Integer configuredEntities;

+    /**

+     * usage of an array of CPUs

+     * 

+     */

+    @JsonProperty("cpuUsageArray")

+    @JsonPropertyDescription("usage of an array of CPUs")

+    private List<CpuUsageArray> cpuUsageArray = new ArrayList<CpuUsageArray>();

+    /**

+     * usage of an array of disks

+     * 

+     */

+    @JsonProperty("diskUsageArray")

+    @JsonPropertyDescription("usage of an array of disks")

+    private List<DiskUsageArray> diskUsageArray = new ArrayList<DiskUsageArray>();

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("featureUsageArray")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation featureUsageArray;

+    /**

+     * filesystem usage of the VM on which the xNFC reporting the event is running

+     * 

+     */

+    @JsonProperty("filesystemUsageArray")

+    @JsonPropertyDescription("filesystem usage of the VM on which the xNFC reporting the event is running")

+    private List<FilesystemUsageArray> filesystemUsageArray = new ArrayList<FilesystemUsageArray>();

+    /**

+     * array of metrics on hugepPages

+     * 

+     */

+    @JsonProperty("hugePagesArray")

+    @JsonPropertyDescription("array of metrics on hugepPages")

+    private List<HugePagesArray> hugePagesArray = new ArrayList<HugePagesArray>();

+    /**

+     * intelligent platform management interface metrics

+     * 

+     */

+    @JsonProperty("ipmi")

+    @JsonPropertyDescription("intelligent platform management interface metrics")

+    private Ipmi ipmi;

+    /**

+     * array of integers representing counts of requests whose latency in milliseconds falls within per-xNF configured ranges

+     * 

+     */

+    @JsonProperty("latencyDistribution")

+    @JsonPropertyDescription("array of integers representing counts of requests whose latency in milliseconds falls within per-xNF configured ranges")

+    private List<LatencyDistribution> latencyDistribution = new ArrayList<LatencyDistribution>();

+    /**

+     * array of system load metrics

+     * 

+     */

+    @JsonProperty("loadArray")

+    @JsonPropertyDescription("array of system load metrics")

+    private List<LoadArray> loadArray = new ArrayList<LoadArray>();

+    /**

+     * array of machine check exceptions

+     * 

+     */

+    @JsonProperty("machineCheckExceptionArray")

+    @JsonPropertyDescription("array of machine check exceptions")

+    private List<MachineCheckExceptionArray> machineCheckExceptionArray = new ArrayList<MachineCheckExceptionArray>();

+    /**

+     * mean seconds required to respond to each request for the VM on which the xNFC reporting the event is running

+     * 

+     */

+    @JsonProperty("meanRequestLatency")

+    @JsonPropertyDescription("mean seconds required to respond to each request for the VM on which the xNFC reporting the event is running")

+    private Double meanRequestLatency;

+    /**

+     * interval over which measurements are being reported in seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("measurementInterval")

+    @JsonPropertyDescription("interval over which measurements are being reported in seconds")

+    private Double measurementInterval;

+    /**

+     * version of the measurementFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("measurementFieldsVersion")

+    @JsonPropertyDescription("version of the measurementFields block")

+    private MeasurementFields.MeasurementFieldsVersion measurementFieldsVersion;

+    /**

+     * memory usage of an array of VMs

+     * 

+     */

+    @JsonProperty("memoryUsageArray")

+    @JsonPropertyDescription("memory usage of an array of VMs")

+    private List<MemoryUsageArray> memoryUsageArray = new ArrayList<MemoryUsageArray>();

+    /**

+     * number of media ports in use

+     * 

+     */

+    @JsonProperty("numberOfMediaPortsInUse")

+    @JsonPropertyDescription("number of media ports in use")

+    private Integer numberOfMediaPortsInUse;

+    /**

+     * peak rate of service requests per second to the xNF over the measurementInterval

+     * 

+     */

+    @JsonProperty("requestRate")

+    @JsonPropertyDescription("peak rate of service requests per second to the xNF over the measurementInterval")

+    private Double requestRate;

+    /**

+     * represents busy-ness of the network function from 0 to 100 as reported by the xNFC

+     * 

+     */

+    @JsonProperty("nfcScalingMetric")

+    @JsonPropertyDescription("represents busy-ness of the network function from 0 to 100 as reported by the xNFC")

+    private Integer nfcScalingMetric;

+    /**

+     * usage of an array of network interface cards

+     * 

+     */

+    @JsonProperty("nicPerformanceArray")

+    @JsonPropertyDescription("usage of an array of network interface cards")

+    private List<NicPerformanceArray> nicPerformanceArray = new ArrayList<NicPerformanceArray>();

+    /**

+     * array of metrics on system processes

+     * 

+     */

+    @JsonProperty("processStatsArray")

+    @JsonPropertyDescription("array of metrics on system processes")

+    private List<ProcessStatsArray> processStatsArray = new ArrayList<ProcessStatsArray>();

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public AlarmAdditionalInformation getAdditionalFields() {

+        return additionalFields;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public void setAdditionalFields(AlarmAdditionalInformation additionalFields) {

+        this.additionalFields = additionalFields;

+    }

+

+    /**

+     * array of named hashMaps

+     * 

+     */

+    @JsonProperty("additionalMeasurements")

+    public List<AdditionalMeasurement> getAdditionalMeasurements() {

+        return additionalMeasurements;

+    }

+

+    /**

+     * array of named hashMaps

+     * 

+     */

+    @JsonProperty("additionalMeasurements")

+    public void setAdditionalMeasurements(List<AdditionalMeasurement> additionalMeasurements) {

+        this.additionalMeasurements = additionalMeasurements;

+    }

+

+    /**

+     * array of json objects described by name, schema and other meta-information

+     * 

+     */

+    @JsonProperty("additionalObjects")

+    public List<AdditionalObject> getAdditionalObjects() {

+        return additionalObjects;

+    }

+

+    /**

+     * array of json objects described by name, schema and other meta-information

+     * 

+     */

+    @JsonProperty("additionalObjects")

+    public void setAdditionalObjects(List<AdditionalObject> additionalObjects) {

+        this.additionalObjects = additionalObjects;

+    }

+

+    /**

+     * array of codecs in use

+     * 

+     */

+    @JsonProperty("codecUsageArray")

+    public List<CodecUsageArray> getCodecUsageArray() {

+        return codecUsageArray;

+    }

+

+    /**

+     * array of codecs in use

+     * 

+     */

+    @JsonProperty("codecUsageArray")

+    public void setCodecUsageArray(List<CodecUsageArray> codecUsageArray) {

+        this.codecUsageArray = codecUsageArray;

+    }

+

+    /**

+     * peak concurrent sessions for the VM or xNF over the measurementInterval

+     * 

+     */

+    @JsonProperty("concurrentSessions")

+    public Integer getConcurrentSessions() {

+        return concurrentSessions;

+    }

+

+    /**

+     * peak concurrent sessions for the VM or xNF over the measurementInterval

+     * 

+     */

+    @JsonProperty("concurrentSessions")

+    public void setConcurrentSessions(Integer concurrentSessions) {

+        this.concurrentSessions = concurrentSessions;

+    }

+

+    /**

+     * over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the xNF

+     * 

+     */

+    @JsonProperty("configuredEntities")

+    public Integer getConfiguredEntities() {

+        return configuredEntities;

+    }

+

+    /**

+     * over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the xNF

+     * 

+     */

+    @JsonProperty("configuredEntities")

+    public void setConfiguredEntities(Integer configuredEntities) {

+        this.configuredEntities = configuredEntities;

+    }

+

+    /**

+     * usage of an array of CPUs

+     * 

+     */

+    @JsonProperty("cpuUsageArray")

+    public List<CpuUsageArray> getCpuUsageArray() {

+        return cpuUsageArray;

+    }

+

+    /**

+     * usage of an array of CPUs

+     * 

+     */

+    @JsonProperty("cpuUsageArray")

+    public void setCpuUsageArray(List<CpuUsageArray> cpuUsageArray) {

+        this.cpuUsageArray = cpuUsageArray;

+    }

+

+    /**

+     * usage of an array of disks

+     * 

+     */

+    @JsonProperty("diskUsageArray")

+    public List<DiskUsageArray> getDiskUsageArray() {

+        return diskUsageArray;

+    }

+

+    /**

+     * usage of an array of disks

+     * 

+     */

+    @JsonProperty("diskUsageArray")

+    public void setDiskUsageArray(List<DiskUsageArray> diskUsageArray) {

+        this.diskUsageArray = diskUsageArray;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("featureUsageArray")

+    public AlarmAdditionalInformation getFeatureUsageArray() {

+        return featureUsageArray;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("featureUsageArray")

+    public void setFeatureUsageArray(AlarmAdditionalInformation featureUsageArray) {

+        this.featureUsageArray = featureUsageArray;

+    }

+

+    /**

+     * filesystem usage of the VM on which the xNFC reporting the event is running

+     * 

+     */

+    @JsonProperty("filesystemUsageArray")

+    public List<FilesystemUsageArray> getFilesystemUsageArray() {

+        return filesystemUsageArray;

+    }

+

+    /**

+     * filesystem usage of the VM on which the xNFC reporting the event is running

+     * 

+     */

+    @JsonProperty("filesystemUsageArray")

+    public void setFilesystemUsageArray(List<FilesystemUsageArray> filesystemUsageArray) {

+        this.filesystemUsageArray = filesystemUsageArray;

+    }

+

+    /**

+     * array of metrics on hugepPages

+     * 

+     */

+    @JsonProperty("hugePagesArray")

+    public List<HugePagesArray> getHugePagesArray() {

+        return hugePagesArray;

+    }

+

+    /**

+     * array of metrics on hugepPages

+     * 

+     */

+    @JsonProperty("hugePagesArray")

+    public void setHugePagesArray(List<HugePagesArray> hugePagesArray) {

+        this.hugePagesArray = hugePagesArray;

+    }

+

+    /**

+     * intelligent platform management interface metrics

+     * 

+     */

+    @JsonProperty("ipmi")

+    public Ipmi getIpmi() {

+        return ipmi;

+    }

+

+    /**

+     * intelligent platform management interface metrics

+     * 

+     */

+    @JsonProperty("ipmi")

+    public void setIpmi(Ipmi ipmi) {

+        this.ipmi = ipmi;

+    }

+

+    /**

+     * array of integers representing counts of requests whose latency in milliseconds falls within per-xNF configured ranges

+     * 

+     */

+    @JsonProperty("latencyDistribution")

+    public List<LatencyDistribution> getLatencyDistribution() {

+        return latencyDistribution;

+    }

+

+    /**

+     * array of integers representing counts of requests whose latency in milliseconds falls within per-xNF configured ranges

+     * 

+     */

+    @JsonProperty("latencyDistribution")

+    public void setLatencyDistribution(List<LatencyDistribution> latencyDistribution) {

+        this.latencyDistribution = latencyDistribution;

+    }

+

+    /**

+     * array of system load metrics

+     * 

+     */

+    @JsonProperty("loadArray")

+    public List<LoadArray> getLoadArray() {

+        return loadArray;

+    }

+

+    /**

+     * array of system load metrics

+     * 

+     */

+    @JsonProperty("loadArray")

+    public void setLoadArray(List<LoadArray> loadArray) {

+        this.loadArray = loadArray;

+    }

+

+    /**

+     * array of machine check exceptions

+     * 

+     */

+    @JsonProperty("machineCheckExceptionArray")

+    public List<MachineCheckExceptionArray> getMachineCheckExceptionArray() {

+        return machineCheckExceptionArray;

+    }

+

+    /**

+     * array of machine check exceptions

+     * 

+     */

+    @JsonProperty("machineCheckExceptionArray")

+    public void setMachineCheckExceptionArray(List<MachineCheckExceptionArray> machineCheckExceptionArray) {

+        this.machineCheckExceptionArray = machineCheckExceptionArray;

+    }

+

+    /**

+     * mean seconds required to respond to each request for the VM on which the xNFC reporting the event is running

+     * 

+     */

+    @JsonProperty("meanRequestLatency")

+    public Double getMeanRequestLatency() {

+        return meanRequestLatency;

+    }

+

+    /**

+     * mean seconds required to respond to each request for the VM on which the xNFC reporting the event is running

+     * 

+     */

+    @JsonProperty("meanRequestLatency")

+    public void setMeanRequestLatency(Double meanRequestLatency) {

+        this.meanRequestLatency = meanRequestLatency;

+    }

+

+    /**

+     * interval over which measurements are being reported in seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("measurementInterval")

+    public Double getMeasurementInterval() {

+        return measurementInterval;

+    }

+

+    /**

+     * interval over which measurements are being reported in seconds

+     * (Required)

+     * 

+     */

+    @JsonProperty("measurementInterval")

+    public void setMeasurementInterval(Double measurementInterval) {

+        this.measurementInterval = measurementInterval;

+    }

+

+    /**

+     * version of the measurementFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("measurementFieldsVersion")

+    public MeasurementFields.MeasurementFieldsVersion getMeasurementFieldsVersion() {

+        return measurementFieldsVersion;

+    }

+

+    /**

+     * version of the measurementFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("measurementFieldsVersion")

+    public void setMeasurementFieldsVersion(MeasurementFields.MeasurementFieldsVersion measurementFieldsVersion) {

+        this.measurementFieldsVersion = measurementFieldsVersion;

+    }

+

+    /**

+     * memory usage of an array of VMs

+     * 

+     */

+    @JsonProperty("memoryUsageArray")

+    public List<MemoryUsageArray> getMemoryUsageArray() {

+        return memoryUsageArray;

+    }

+

+    /**

+     * memory usage of an array of VMs

+     * 

+     */

+    @JsonProperty("memoryUsageArray")

+    public void setMemoryUsageArray(List<MemoryUsageArray> memoryUsageArray) {

+        this.memoryUsageArray = memoryUsageArray;

+    }

+

+    /**

+     * number of media ports in use

+     * 

+     */

+    @JsonProperty("numberOfMediaPortsInUse")

+    public Integer getNumberOfMediaPortsInUse() {

+        return numberOfMediaPortsInUse;

+    }

+

+    /**

+     * number of media ports in use

+     * 

+     */

+    @JsonProperty("numberOfMediaPortsInUse")

+    public void setNumberOfMediaPortsInUse(Integer numberOfMediaPortsInUse) {

+        this.numberOfMediaPortsInUse = numberOfMediaPortsInUse;

+    }

+

+    /**

+     * peak rate of service requests per second to the xNF over the measurementInterval

+     * 

+     */

+    @JsonProperty("requestRate")

+    public Double getRequestRate() {

+        return requestRate;

+    }

+

+    /**

+     * peak rate of service requests per second to the xNF over the measurementInterval

+     * 

+     */

+    @JsonProperty("requestRate")

+    public void setRequestRate(Double requestRate) {

+        this.requestRate = requestRate;

+    }

+

+    /**

+     * represents busy-ness of the network function from 0 to 100 as reported by the xNFC

+     * 

+     */

+    @JsonProperty("nfcScalingMetric")

+    public Integer getNfcScalingMetric() {

+        return nfcScalingMetric;

+    }

+

+    /**

+     * represents busy-ness of the network function from 0 to 100 as reported by the xNFC

+     * 

+     */

+    @JsonProperty("nfcScalingMetric")

+    public void setNfcScalingMetric(Integer nfcScalingMetric) {

+        this.nfcScalingMetric = nfcScalingMetric;

+    }

+

+    /**

+     * usage of an array of network interface cards

+     * 

+     */

+    @JsonProperty("nicPerformanceArray")

+    public List<NicPerformanceArray> getNicPerformanceArray() {

+        return nicPerformanceArray;

+    }

+

+    /**

+     * usage of an array of network interface cards

+     * 

+     */

+    @JsonProperty("nicPerformanceArray")

+    public void setNicPerformanceArray(List<NicPerformanceArray> nicPerformanceArray) {

+        this.nicPerformanceArray = nicPerformanceArray;

+    }

+

+    /**

+     * array of metrics on system processes

+     * 

+     */

+    @JsonProperty("processStatsArray")

+    public List<ProcessStatsArray> getProcessStatsArray() {

+        return processStatsArray;

+    }

+

+    /**

+     * array of metrics on system processes

+     * 

+     */

+    @JsonProperty("processStatsArray")

+    public void setProcessStatsArray(List<ProcessStatsArray> processStatsArray) {

+        this.processStatsArray = processStatsArray;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalFields).append(additionalMeasurements).append(additionalObjects).append(codecUsageArray).append(concurrentSessions).append(configuredEntities).append(cpuUsageArray).append(diskUsageArray).append(featureUsageArray).append(filesystemUsageArray).append(hugePagesArray).append(ipmi).append(latencyDistribution).append(loadArray).append(machineCheckExceptionArray).append(meanRequestLatency).append(measurementInterval).append(measurementFieldsVersion).append(memoryUsageArray).append(numberOfMediaPortsInUse).append(requestRate).append(nfcScalingMetric).append(nicPerformanceArray).append(processStatsArray).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof MeasurementFields) == false) {

+            return false;

+        }

+        MeasurementFields rhs = ((MeasurementFields) other);

+        return new EqualsBuilder().append(additionalFields, rhs.additionalFields).append(additionalMeasurements, rhs.additionalMeasurements).append(additionalObjects, rhs.additionalObjects).append(codecUsageArray, rhs.codecUsageArray).append(concurrentSessions, rhs.concurrentSessions).append(configuredEntities, rhs.configuredEntities).append(cpuUsageArray, rhs.cpuUsageArray).append(diskUsageArray, rhs.diskUsageArray).append(featureUsageArray, rhs.featureUsageArray).append(filesystemUsageArray, rhs.filesystemUsageArray).append(hugePagesArray, rhs.hugePagesArray).append(ipmi, rhs.ipmi).append(latencyDistribution, rhs.latencyDistribution).append(loadArray, rhs.loadArray).append(machineCheckExceptionArray, rhs.machineCheckExceptionArray).append(meanRequestLatency, rhs.meanRequestLatency).append(measurementInterval, rhs.measurementInterval).append(measurementFieldsVersion, rhs.measurementFieldsVersion).append(memoryUsageArray, rhs.memoryUsageArray).append(numberOfMediaPortsInUse, rhs.numberOfMediaPortsInUse).append(requestRate, rhs.requestRate).append(nfcScalingMetric, rhs.nfcScalingMetric).append(nicPerformanceArray, rhs.nicPerformanceArray).append(processStatsArray, rhs.processStatsArray).isEquals();

+    }

+

+    public enum MeasurementFieldsVersion {

+

+        _4_0("4.0");

+        private final String value;

+        private final static Map<String, MeasurementFields.MeasurementFieldsVersion> CONSTANTS = new HashMap<String, MeasurementFields.MeasurementFieldsVersion>();

+

+        static {

+            for (MeasurementFields.MeasurementFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private MeasurementFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static MeasurementFields.MeasurementFieldsVersion fromValue(String value) {

+            MeasurementFields.MeasurementFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MemoryUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MemoryUsageArray.java
new file mode 100644
index 0000000..39f9ea9
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MemoryUsageArray.java
@@ -0,0 +1,514 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * memory usage of an identified virtual machine

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "memoryBuffered",

+    "memoryCached",

+    "memoryConfigured",

+    "memoryDemand",

+    "memoryFree",

+    "memoryLatencyAvg",

+    "memorySharedAvg",

+    "memorySlabRecl",

+    "memorySlabUnrecl",

+    "memorySwapInAvg",

+    "memorySwapInRateAvg",

+    "memorySwapOutAvg",

+    "memorySwapOutRateAvg",

+    "memorySwapUsedAvg",

+    "memoryUsed",

+    "percentMemoryUsage",

+    "vmIdentifier"

+})

+public class MemoryUsageArray {

+

+    /**

+     * kibibytes of temporary storage for raw disk blocks

+     * 

+     */

+    @JsonProperty("memoryBuffered")

+    @JsonPropertyDescription("kibibytes of temporary storage for raw disk blocks")

+    private Double memoryBuffered;

+    /**

+     * kibibytes of memory used for cache

+     * 

+     */

+    @JsonProperty("memoryCached")

+    @JsonPropertyDescription("kibibytes of memory used for cache")

+    private Double memoryCached;

+    /**

+     * kibibytes of memory configured in the virtual machine on which the xNFC reporting the event is running

+     * 

+     */

+    @JsonProperty("memoryConfigured")

+    @JsonPropertyDescription("kibibytes of memory configured in the virtual machine on which the xNFC reporting the event is running")

+    private Double memoryConfigured;

+    /**

+     * host demand in kibibytes

+     * 

+     */

+    @JsonProperty("memoryDemand")

+    @JsonPropertyDescription("host demand in kibibytes")

+    private Double memoryDemand;

+    /**

+     * kibibytes of physical RAM left unused by the system

+     * (Required)

+     * 

+     */

+    @JsonProperty("memoryFree")

+    @JsonPropertyDescription("kibibytes of physical RAM left unused by the system")

+    private Double memoryFree;

+    /**

+     * Percentage of time the VM is waiting to access swapped or compressed memory

+     * 

+     */

+    @JsonProperty("memoryLatencyAvg")

+    @JsonPropertyDescription("Percentage of time the VM is waiting to access swapped or compressed memory")

+    private Double memoryLatencyAvg;

+    /**

+     * shared memory in kilobytes

+     * 

+     */

+    @JsonProperty("memorySharedAvg")

+    @JsonPropertyDescription("shared memory in kilobytes")

+    private Double memorySharedAvg;

+    /**

+     * the part of the slab that can be reclaimed such as caches measured in kibibytes

+     * 

+     */

+    @JsonProperty("memorySlabRecl")

+    @JsonPropertyDescription("the part of the slab that can be reclaimed such as caches measured in kibibytes")

+    private Double memorySlabRecl;

+    /**

+     * the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes

+     * 

+     */

+    @JsonProperty("memorySlabUnrecl")

+    @JsonPropertyDescription("the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes")

+    private Double memorySlabUnrecl;

+    /**

+     * Amount of memory swapped-in from host cache in kibibytes

+     * 

+     */

+    @JsonProperty("memorySwapInAvg")

+    @JsonPropertyDescription("Amount of memory swapped-in from host cache in kibibytes")

+    private Double memorySwapInAvg;

+    /**

+     * rate at which memory is swapped from disk into active memory during the interval in kilobytes per second

+     * 

+     */

+    @JsonProperty("memorySwapInRateAvg")

+    @JsonPropertyDescription("rate at which memory is swapped from disk into active memory during the interval in kilobytes per second")

+    private Double memorySwapInRateAvg;

+    /**

+     * Amount of memory swapped-out to host cache in kibibytes

+     * 

+     */

+    @JsonProperty("memorySwapOutAvg")

+    @JsonPropertyDescription("Amount of memory swapped-out to host cache in kibibytes")

+    private Double memorySwapOutAvg;

+    /**

+     * rate at which memory is being swapped from active memory to disk during the current interval in kilobytes per second

+     * 

+     */

+    @JsonProperty("memorySwapOutRateAvg")

+    @JsonPropertyDescription("rate at which memory is being swapped from active memory to disk during the current interval in kilobytes per second")

+    private Double memorySwapOutRateAvg;

+    /**

+     * space used for caching swapped pages in the host cache in kibibytes

+     * 

+     */

+    @JsonProperty("memorySwapUsedAvg")

+    @JsonPropertyDescription("space used for caching swapped pages in the host cache in kibibytes")

+    private Double memorySwapUsedAvg;

+    /**

+     * total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes

+     * (Required)

+     * 

+     */

+    @JsonProperty("memoryUsed")

+    @JsonPropertyDescription("total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes")

+    private Double memoryUsed;

+    /**

+     * Percentage of memory usage; value = (memoryUsed / (memoryUsed + memoryFree) x 100 if denomintor is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("percentMemoryUsage")

+    @JsonPropertyDescription("Percentage of memory usage; value = (memoryUsed / (memoryUsed + memoryFree) x 100 if denomintor is nonzero, or 0, if otherwise")

+    private Double percentMemoryUsage;

+    /**

+     * virtual machine identifier associated with the memory metrics

+     * (Required)

+     * 

+     */

+    @JsonProperty("vmIdentifier")

+    @JsonPropertyDescription("virtual machine identifier associated with the memory metrics")

+    private String vmIdentifier;

+

+    /**

+     * kibibytes of temporary storage for raw disk blocks

+     * 

+     */

+    @JsonProperty("memoryBuffered")

+    public Double getMemoryBuffered() {

+        return memoryBuffered;

+    }

+

+    /**

+     * kibibytes of temporary storage for raw disk blocks

+     * 

+     */

+    @JsonProperty("memoryBuffered")

+    public void setMemoryBuffered(Double memoryBuffered) {

+        this.memoryBuffered = memoryBuffered;

+    }

+

+    /**

+     * kibibytes of memory used for cache

+     * 

+     */

+    @JsonProperty("memoryCached")

+    public Double getMemoryCached() {

+        return memoryCached;

+    }

+

+    /**

+     * kibibytes of memory used for cache

+     * 

+     */

+    @JsonProperty("memoryCached")

+    public void setMemoryCached(Double memoryCached) {

+        this.memoryCached = memoryCached;

+    }

+

+    /**

+     * kibibytes of memory configured in the virtual machine on which the xNFC reporting the event is running

+     * 

+     */

+    @JsonProperty("memoryConfigured")

+    public Double getMemoryConfigured() {

+        return memoryConfigured;

+    }

+

+    /**

+     * kibibytes of memory configured in the virtual machine on which the xNFC reporting the event is running

+     * 

+     */

+    @JsonProperty("memoryConfigured")

+    public void setMemoryConfigured(Double memoryConfigured) {

+        this.memoryConfigured = memoryConfigured;

+    }

+

+    /**

+     * host demand in kibibytes

+     * 

+     */

+    @JsonProperty("memoryDemand")

+    public Double getMemoryDemand() {

+        return memoryDemand;

+    }

+

+    /**

+     * host demand in kibibytes

+     * 

+     */

+    @JsonProperty("memoryDemand")

+    public void setMemoryDemand(Double memoryDemand) {

+        this.memoryDemand = memoryDemand;

+    }

+

+    /**

+     * kibibytes of physical RAM left unused by the system

+     * (Required)

+     * 

+     */

+    @JsonProperty("memoryFree")

+    public Double getMemoryFree() {

+        return memoryFree;

+    }

+

+    /**

+     * kibibytes of physical RAM left unused by the system

+     * (Required)

+     * 

+     */

+    @JsonProperty("memoryFree")

+    public void setMemoryFree(Double memoryFree) {

+        this.memoryFree = memoryFree;

+    }

+

+    /**

+     * Percentage of time the VM is waiting to access swapped or compressed memory

+     * 

+     */

+    @JsonProperty("memoryLatencyAvg")

+    public Double getMemoryLatencyAvg() {

+        return memoryLatencyAvg;

+    }

+

+    /**

+     * Percentage of time the VM is waiting to access swapped or compressed memory

+     * 

+     */

+    @JsonProperty("memoryLatencyAvg")

+    public void setMemoryLatencyAvg(Double memoryLatencyAvg) {

+        this.memoryLatencyAvg = memoryLatencyAvg;

+    }

+

+    /**

+     * shared memory in kilobytes

+     * 

+     */

+    @JsonProperty("memorySharedAvg")

+    public Double getMemorySharedAvg() {

+        return memorySharedAvg;

+    }

+

+    /**

+     * shared memory in kilobytes

+     * 

+     */

+    @JsonProperty("memorySharedAvg")

+    public void setMemorySharedAvg(Double memorySharedAvg) {

+        this.memorySharedAvg = memorySharedAvg;

+    }

+

+    /**

+     * the part of the slab that can be reclaimed such as caches measured in kibibytes

+     * 

+     */

+    @JsonProperty("memorySlabRecl")

+    public Double getMemorySlabRecl() {

+        return memorySlabRecl;

+    }

+

+    /**

+     * the part of the slab that can be reclaimed such as caches measured in kibibytes

+     * 

+     */

+    @JsonProperty("memorySlabRecl")

+    public void setMemorySlabRecl(Double memorySlabRecl) {

+        this.memorySlabRecl = memorySlabRecl;

+    }

+

+    /**

+     * the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes

+     * 

+     */

+    @JsonProperty("memorySlabUnrecl")

+    public Double getMemorySlabUnrecl() {

+        return memorySlabUnrecl;

+    }

+

+    /**

+     * the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes

+     * 

+     */

+    @JsonProperty("memorySlabUnrecl")

+    public void setMemorySlabUnrecl(Double memorySlabUnrecl) {

+        this.memorySlabUnrecl = memorySlabUnrecl;

+    }

+

+    /**

+     * Amount of memory swapped-in from host cache in kibibytes

+     * 

+     */

+    @JsonProperty("memorySwapInAvg")

+    public Double getMemorySwapInAvg() {

+        return memorySwapInAvg;

+    }

+

+    /**

+     * Amount of memory swapped-in from host cache in kibibytes

+     * 

+     */

+    @JsonProperty("memorySwapInAvg")

+    public void setMemorySwapInAvg(Double memorySwapInAvg) {

+        this.memorySwapInAvg = memorySwapInAvg;

+    }

+

+    /**

+     * rate at which memory is swapped from disk into active memory during the interval in kilobytes per second

+     * 

+     */

+    @JsonProperty("memorySwapInRateAvg")

+    public Double getMemorySwapInRateAvg() {

+        return memorySwapInRateAvg;

+    }

+

+    /**

+     * rate at which memory is swapped from disk into active memory during the interval in kilobytes per second

+     * 

+     */

+    @JsonProperty("memorySwapInRateAvg")

+    public void setMemorySwapInRateAvg(Double memorySwapInRateAvg) {

+        this.memorySwapInRateAvg = memorySwapInRateAvg;

+    }

+

+    /**

+     * Amount of memory swapped-out to host cache in kibibytes

+     * 

+     */

+    @JsonProperty("memorySwapOutAvg")

+    public Double getMemorySwapOutAvg() {

+        return memorySwapOutAvg;

+    }

+

+    /**

+     * Amount of memory swapped-out to host cache in kibibytes

+     * 

+     */

+    @JsonProperty("memorySwapOutAvg")

+    public void setMemorySwapOutAvg(Double memorySwapOutAvg) {

+        this.memorySwapOutAvg = memorySwapOutAvg;

+    }

+

+    /**

+     * rate at which memory is being swapped from active memory to disk during the current interval in kilobytes per second

+     * 

+     */

+    @JsonProperty("memorySwapOutRateAvg")

+    public Double getMemorySwapOutRateAvg() {

+        return memorySwapOutRateAvg;

+    }

+

+    /**

+     * rate at which memory is being swapped from active memory to disk during the current interval in kilobytes per second

+     * 

+     */

+    @JsonProperty("memorySwapOutRateAvg")

+    public void setMemorySwapOutRateAvg(Double memorySwapOutRateAvg) {

+        this.memorySwapOutRateAvg = memorySwapOutRateAvg;

+    }

+

+    /**

+     * space used for caching swapped pages in the host cache in kibibytes

+     * 

+     */

+    @JsonProperty("memorySwapUsedAvg")

+    public Double getMemorySwapUsedAvg() {

+        return memorySwapUsedAvg;

+    }

+

+    /**

+     * space used for caching swapped pages in the host cache in kibibytes

+     * 

+     */

+    @JsonProperty("memorySwapUsedAvg")

+    public void setMemorySwapUsedAvg(Double memorySwapUsedAvg) {

+        this.memorySwapUsedAvg = memorySwapUsedAvg;

+    }

+

+    /**

+     * total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes

+     * (Required)

+     * 

+     */

+    @JsonProperty("memoryUsed")

+    public Double getMemoryUsed() {

+        return memoryUsed;

+    }

+

+    /**

+     * total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes

+     * (Required)

+     * 

+     */

+    @JsonProperty("memoryUsed")

+    public void setMemoryUsed(Double memoryUsed) {

+        this.memoryUsed = memoryUsed;

+    }

+

+    /**

+     * Percentage of memory usage; value = (memoryUsed / (memoryUsed + memoryFree) x 100 if denomintor is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("percentMemoryUsage")

+    public Double getPercentMemoryUsage() {

+        return percentMemoryUsage;

+    }

+

+    /**

+     * Percentage of memory usage; value = (memoryUsed / (memoryUsed + memoryFree) x 100 if denomintor is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("percentMemoryUsage")

+    public void setPercentMemoryUsage(Double percentMemoryUsage) {

+        this.percentMemoryUsage = percentMemoryUsage;

+    }

+

+    /**

+     * virtual machine identifier associated with the memory metrics

+     * (Required)

+     * 

+     */

+    @JsonProperty("vmIdentifier")

+    public String getVmIdentifier() {

+        return vmIdentifier;

+    }

+

+    /**

+     * virtual machine identifier associated with the memory metrics

+     * (Required)

+     * 

+     */

+    @JsonProperty("vmIdentifier")

+    public void setVmIdentifier(String vmIdentifier) {

+        this.vmIdentifier = vmIdentifier;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(memoryBuffered).append(memoryCached).append(memoryConfigured).append(memoryDemand).append(memoryFree).append(memoryLatencyAvg).append(memorySharedAvg).append(memorySlabRecl).append(memorySlabUnrecl).append(memorySwapInAvg).append(memorySwapInRateAvg).append(memorySwapOutAvg).append(memorySwapOutRateAvg).append(memorySwapUsedAvg).append(memoryUsed).append(percentMemoryUsage).append(vmIdentifier).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof MemoryUsageArray) == false) {

+            return false;

+        }

+        MemoryUsageArray rhs = ((MemoryUsageArray) other);

+        return new EqualsBuilder().append(memoryBuffered, rhs.memoryBuffered).append(memoryCached, rhs.memoryCached).append(memoryConfigured, rhs.memoryConfigured).append(memoryDemand, rhs.memoryDemand).append(memoryFree, rhs.memoryFree).append(memoryLatencyAvg, rhs.memoryLatencyAvg).append(memorySharedAvg, rhs.memorySharedAvg).append(memorySlabRecl, rhs.memorySlabRecl).append(memorySlabUnrecl, rhs.memorySlabUnrecl).append(memorySwapInAvg, rhs.memorySwapInAvg).append(memorySwapInRateAvg, rhs.memorySwapInRateAvg).append(memorySwapOutAvg, rhs.memorySwapOutAvg).append(memorySwapOutRateAvg, rhs.memorySwapOutRateAvg).append(memorySwapUsedAvg, rhs.memorySwapUsedAvg).append(memoryUsed, rhs.memoryUsed).append(percentMemoryUsage, rhs.percentMemoryUsage).append(vmIdentifier, rhs.vmIdentifier).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MobileFlowFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MobileFlowFields.java
new file mode 100644
index 0000000..a29b092
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MobileFlowFields.java
@@ -0,0 +1,990 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * mobileFlow fields

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalFields",

+    "applicationType",

+    "appProtocolType",

+    "appProtocolVersion",

+    "cid",

+    "connectionType",

+    "ecgi",

+    "flowDirection",

+    "gtpPerFlowMetrics",

+    "gtpProtocolType",

+    "gtpVersion",

+    "httpHeader",

+    "imei",

+    "imsi",

+    "ipProtocolType",

+    "ipVersion",

+    "lac",

+    "mcc",

+    "mnc",

+    "mobileFlowFieldsVersion",

+    "msisdn",

+    "otherEndpointIpAddress",

+    "otherEndpointPort",

+    "otherFunctionalRole",

+    "rac",

+    "radioAccessTechnology",

+    "reportingEndpointIpAddr",

+    "reportingEndpointPort",

+    "sac",

+    "samplingAlgorithm",

+    "tac",

+    "tunnelId",

+    "vlanId"

+})

+public class MobileFlowFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalFields;

+    /**

+     * Application type inferred

+     * 

+     */

+    @JsonProperty("applicationType")

+    @JsonPropertyDescription("Application type inferred")

+    private String applicationType;

+    /**

+     * application protocol

+     * 

+     */

+    @JsonProperty("appProtocolType")

+    @JsonPropertyDescription("application protocol")

+    private String appProtocolType;

+    /**

+     * application protocol version

+     * 

+     */

+    @JsonProperty("appProtocolVersion")

+    @JsonPropertyDescription("application protocol version")

+    private String appProtocolVersion;

+    /**

+     * cell id

+     * 

+     */

+    @JsonProperty("cid")

+    @JsonPropertyDescription("cell id")

+    private String cid;

+    /**

+     * Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc

+     * 

+     */

+    @JsonProperty("connectionType")

+    @JsonPropertyDescription("Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc")

+    private String connectionType;

+    /**

+     * Evolved Cell Global Id

+     * 

+     */

+    @JsonProperty("ecgi")

+    @JsonPropertyDescription("Evolved Cell Global Id")

+    private String ecgi;

+    /**

+     * Flow direction, indicating if the reporting node is the source of the flow or destination for the flow

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDirection")

+    @JsonPropertyDescription("Flow direction, indicating if the reporting node is the source of the flow or destination for the flow")

+    private String flowDirection;

+    /**

+     * Mobility GTP Protocol per flow metrics

+     * (Required)

+     * 

+     */

+    @JsonProperty("gtpPerFlowMetrics")

+    @JsonPropertyDescription("Mobility GTP Protocol per flow metrics")

+    private GtpPerFlowMetrics gtpPerFlowMetrics;

+    /**

+     * GTP protocol

+     * 

+     */

+    @JsonProperty("gtpProtocolType")

+    @JsonPropertyDescription("GTP protocol")

+    private String gtpProtocolType;

+    /**

+     * GTP protocol version

+     * 

+     */

+    @JsonProperty("gtpVersion")

+    @JsonPropertyDescription("GTP protocol version")

+    private String gtpVersion;

+    /**

+     * HTTP request header, if the flow connects to a node referenced by HTTP

+     * 

+     */

+    @JsonProperty("httpHeader")

+    @JsonPropertyDescription("HTTP request header, if the flow connects to a node referenced by HTTP")

+    private String httpHeader;

+    /**

+     * IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device

+     * 

+     */

+    @JsonProperty("imei")

+    @JsonPropertyDescription("IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device")

+    private String imei;

+    /**

+     * IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device

+     * 

+     */

+    @JsonProperty("imsi")

+    @JsonPropertyDescription("IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device")

+    private String imsi;

+    /**

+     * IP protocol type e.g., TCP, UDP, RTP...

+     * (Required)

+     * 

+     */

+    @JsonProperty("ipProtocolType")

+    @JsonPropertyDescription("IP protocol type e.g., TCP, UDP, RTP...")

+    private String ipProtocolType;

+    /**

+     * IP protocol version e.g., IPv4, IPv6

+     * (Required)

+     * 

+     */

+    @JsonProperty("ipVersion")

+    @JsonPropertyDescription("IP protocol version e.g., IPv4, IPv6")

+    private String ipVersion;

+    /**

+     * location area code

+     * 

+     */

+    @JsonProperty("lac")

+    @JsonPropertyDescription("location area code")

+    private String lac;

+    /**

+     * mobile country code

+     * 

+     */

+    @JsonProperty("mcc")

+    @JsonPropertyDescription("mobile country code")

+    private String mcc;

+    /**

+     * mobile network code

+     * 

+     */

+    @JsonProperty("mnc")

+    @JsonPropertyDescription("mobile network code")

+    private String mnc;

+    /**

+     * version of the mobileFlowFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("mobileFlowFieldsVersion")

+    @JsonPropertyDescription("version of the mobileFlowFields block")

+    private MobileFlowFields.MobileFlowFieldsVersion mobileFlowFieldsVersion;

+    /**

+     * MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device

+     * 

+     */

+    @JsonProperty("msisdn")

+    @JsonPropertyDescription("MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device")

+    private String msisdn;

+    /**

+     * IP address for the other endpoint, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("otherEndpointIpAddress")

+    @JsonPropertyDescription("IP address for the other endpoint, as used for the flow being reported on")

+    private String otherEndpointIpAddress;

+    /**

+     * IP Port for the reporting entity, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("otherEndpointPort")

+    @JsonPropertyDescription("IP Port for the reporting entity, as used for the flow being reported on")

+    private Integer otherEndpointPort;

+    /**

+     * Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...

+     * 

+     */

+    @JsonProperty("otherFunctionalRole")

+    @JsonPropertyDescription("Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...")

+    private String otherFunctionalRole;

+    /**

+     * routing area code

+     * 

+     */

+    @JsonProperty("rac")

+    @JsonPropertyDescription("routing area code")

+    private String rac;

+    /**

+     * Radio Access Technology e.g., 2G, 3G, LTE

+     * 

+     */

+    @JsonProperty("radioAccessTechnology")

+    @JsonPropertyDescription("Radio Access Technology e.g., 2G, 3G, LTE")

+    private String radioAccessTechnology;

+    /**

+     * IP address for the reporting entity, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("reportingEndpointIpAddr")

+    @JsonPropertyDescription("IP address for the reporting entity, as used for the flow being reported on")

+    private String reportingEndpointIpAddr;

+    /**

+     * IP port for the reporting entity, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("reportingEndpointPort")

+    @JsonPropertyDescription("IP port for the reporting entity, as used for the flow being reported on")

+    private Integer reportingEndpointPort;

+    /**

+     * service area code

+     * 

+     */

+    @JsonProperty("sac")

+    @JsonPropertyDescription("service area code")

+    private String sac;

+    /**

+     * Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied

+     * 

+     */

+    @JsonProperty("samplingAlgorithm")

+    @JsonPropertyDescription("Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied")

+    private Integer samplingAlgorithm;

+    /**

+     * transport area code

+     * 

+     */

+    @JsonProperty("tac")

+    @JsonPropertyDescription("transport area code")

+    private String tac;

+    /**

+     * tunnel identifier

+     * 

+     */

+    @JsonProperty("tunnelId")

+    @JsonPropertyDescription("tunnel identifier")

+    private String tunnelId;

+    /**

+     * VLAN identifier used by this flow

+     * 

+     */

+    @JsonProperty("vlanId")

+    @JsonPropertyDescription("VLAN identifier used by this flow")

+    private String vlanId;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public AlarmAdditionalInformation getAdditionalFields() {

+        return additionalFields;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public void setAdditionalFields(AlarmAdditionalInformation additionalFields) {

+        this.additionalFields = additionalFields;

+    }

+

+    /**

+     * Application type inferred

+     * 

+     */

+    @JsonProperty("applicationType")

+    public String getApplicationType() {

+        return applicationType;

+    }

+

+    /**

+     * Application type inferred

+     * 

+     */

+    @JsonProperty("applicationType")

+    public void setApplicationType(String applicationType) {

+        this.applicationType = applicationType;

+    }

+

+    /**

+     * application protocol

+     * 

+     */

+    @JsonProperty("appProtocolType")

+    public String getAppProtocolType() {

+        return appProtocolType;

+    }

+

+    /**

+     * application protocol

+     * 

+     */

+    @JsonProperty("appProtocolType")

+    public void setAppProtocolType(String appProtocolType) {

+        this.appProtocolType = appProtocolType;

+    }

+

+    /**

+     * application protocol version

+     * 

+     */

+    @JsonProperty("appProtocolVersion")

+    public String getAppProtocolVersion() {

+        return appProtocolVersion;

+    }

+

+    /**

+     * application protocol version

+     * 

+     */

+    @JsonProperty("appProtocolVersion")

+    public void setAppProtocolVersion(String appProtocolVersion) {

+        this.appProtocolVersion = appProtocolVersion;

+    }

+

+    /**

+     * cell id

+     * 

+     */

+    @JsonProperty("cid")

+    public String getCid() {

+        return cid;

+    }

+

+    /**

+     * cell id

+     * 

+     */

+    @JsonProperty("cid")

+    public void setCid(String cid) {

+        this.cid = cid;

+    }

+

+    /**

+     * Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc

+     * 

+     */

+    @JsonProperty("connectionType")

+    public String getConnectionType() {

+        return connectionType;

+    }

+

+    /**

+     * Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc

+     * 

+     */

+    @JsonProperty("connectionType")

+    public void setConnectionType(String connectionType) {

+        this.connectionType = connectionType;

+    }

+

+    /**

+     * Evolved Cell Global Id

+     * 

+     */

+    @JsonProperty("ecgi")

+    public String getEcgi() {

+        return ecgi;

+    }

+

+    /**

+     * Evolved Cell Global Id

+     * 

+     */

+    @JsonProperty("ecgi")

+    public void setEcgi(String ecgi) {

+        this.ecgi = ecgi;

+    }

+

+    /**

+     * Flow direction, indicating if the reporting node is the source of the flow or destination for the flow

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDirection")

+    public String getFlowDirection() {

+        return flowDirection;

+    }

+

+    /**

+     * Flow direction, indicating if the reporting node is the source of the flow or destination for the flow

+     * (Required)

+     * 

+     */

+    @JsonProperty("flowDirection")

+    public void setFlowDirection(String flowDirection) {

+        this.flowDirection = flowDirection;

+    }

+

+    /**

+     * Mobility GTP Protocol per flow metrics

+     * (Required)

+     * 

+     */

+    @JsonProperty("gtpPerFlowMetrics")

+    public GtpPerFlowMetrics getGtpPerFlowMetrics() {

+        return gtpPerFlowMetrics;

+    }

+

+    /**

+     * Mobility GTP Protocol per flow metrics

+     * (Required)

+     * 

+     */

+    @JsonProperty("gtpPerFlowMetrics")

+    public void setGtpPerFlowMetrics(GtpPerFlowMetrics gtpPerFlowMetrics) {

+        this.gtpPerFlowMetrics = gtpPerFlowMetrics;

+    }

+

+    /**

+     * GTP protocol

+     * 

+     */

+    @JsonProperty("gtpProtocolType")

+    public String getGtpProtocolType() {

+        return gtpProtocolType;

+    }

+

+    /**

+     * GTP protocol

+     * 

+     */

+    @JsonProperty("gtpProtocolType")

+    public void setGtpProtocolType(String gtpProtocolType) {

+        this.gtpProtocolType = gtpProtocolType;

+    }

+

+    /**

+     * GTP protocol version

+     * 

+     */

+    @JsonProperty("gtpVersion")

+    public String getGtpVersion() {

+        return gtpVersion;

+    }

+

+    /**

+     * GTP protocol version

+     * 

+     */

+    @JsonProperty("gtpVersion")

+    public void setGtpVersion(String gtpVersion) {

+        this.gtpVersion = gtpVersion;

+    }

+

+    /**

+     * HTTP request header, if the flow connects to a node referenced by HTTP

+     * 

+     */

+    @JsonProperty("httpHeader")

+    public String getHttpHeader() {

+        return httpHeader;

+    }

+

+    /**

+     * HTTP request header, if the flow connects to a node referenced by HTTP

+     * 

+     */

+    @JsonProperty("httpHeader")

+    public void setHttpHeader(String httpHeader) {

+        this.httpHeader = httpHeader;

+    }

+

+    /**

+     * IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device

+     * 

+     */

+    @JsonProperty("imei")

+    public String getImei() {

+        return imei;

+    }

+

+    /**

+     * IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device

+     * 

+     */

+    @JsonProperty("imei")

+    public void setImei(String imei) {

+        this.imei = imei;

+    }

+

+    /**

+     * IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device

+     * 

+     */

+    @JsonProperty("imsi")

+    public String getImsi() {

+        return imsi;

+    }

+

+    /**

+     * IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device

+     * 

+     */

+    @JsonProperty("imsi")

+    public void setImsi(String imsi) {

+        this.imsi = imsi;

+    }

+

+    /**

+     * IP protocol type e.g., TCP, UDP, RTP...

+     * (Required)

+     * 

+     */

+    @JsonProperty("ipProtocolType")

+    public String getIpProtocolType() {

+        return ipProtocolType;

+    }

+

+    /**

+     * IP protocol type e.g., TCP, UDP, RTP...

+     * (Required)

+     * 

+     */

+    @JsonProperty("ipProtocolType")

+    public void setIpProtocolType(String ipProtocolType) {

+        this.ipProtocolType = ipProtocolType;

+    }

+

+    /**

+     * IP protocol version e.g., IPv4, IPv6

+     * (Required)

+     * 

+     */

+    @JsonProperty("ipVersion")

+    public String getIpVersion() {

+        return ipVersion;

+    }

+

+    /**

+     * IP protocol version e.g., IPv4, IPv6

+     * (Required)

+     * 

+     */

+    @JsonProperty("ipVersion")

+    public void setIpVersion(String ipVersion) {

+        this.ipVersion = ipVersion;

+    }

+

+    /**

+     * location area code

+     * 

+     */

+    @JsonProperty("lac")

+    public String getLac() {

+        return lac;

+    }

+

+    /**

+     * location area code

+     * 

+     */

+    @JsonProperty("lac")

+    public void setLac(String lac) {

+        this.lac = lac;

+    }

+

+    /**

+     * mobile country code

+     * 

+     */

+    @JsonProperty("mcc")

+    public String getMcc() {

+        return mcc;

+    }

+

+    /**

+     * mobile country code

+     * 

+     */

+    @JsonProperty("mcc")

+    public void setMcc(String mcc) {

+        this.mcc = mcc;

+    }

+

+    /**

+     * mobile network code

+     * 

+     */

+    @JsonProperty("mnc")

+    public String getMnc() {

+        return mnc;

+    }

+

+    /**

+     * mobile network code

+     * 

+     */

+    @JsonProperty("mnc")

+    public void setMnc(String mnc) {

+        this.mnc = mnc;

+    }

+

+    /**

+     * version of the mobileFlowFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("mobileFlowFieldsVersion")

+    public MobileFlowFields.MobileFlowFieldsVersion getMobileFlowFieldsVersion() {

+        return mobileFlowFieldsVersion;

+    }

+

+    /**

+     * version of the mobileFlowFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("mobileFlowFieldsVersion")

+    public void setMobileFlowFieldsVersion(MobileFlowFields.MobileFlowFieldsVersion mobileFlowFieldsVersion) {

+        this.mobileFlowFieldsVersion = mobileFlowFieldsVersion;

+    }

+

+    /**

+     * MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device

+     * 

+     */

+    @JsonProperty("msisdn")

+    public String getMsisdn() {

+        return msisdn;

+    }

+

+    /**

+     * MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device

+     * 

+     */

+    @JsonProperty("msisdn")

+    public void setMsisdn(String msisdn) {

+        this.msisdn = msisdn;

+    }

+

+    /**

+     * IP address for the other endpoint, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("otherEndpointIpAddress")

+    public String getOtherEndpointIpAddress() {

+        return otherEndpointIpAddress;

+    }

+

+    /**

+     * IP address for the other endpoint, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("otherEndpointIpAddress")

+    public void setOtherEndpointIpAddress(String otherEndpointIpAddress) {

+        this.otherEndpointIpAddress = otherEndpointIpAddress;

+    }

+

+    /**

+     * IP Port for the reporting entity, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("otherEndpointPort")

+    public Integer getOtherEndpointPort() {

+        return otherEndpointPort;

+    }

+

+    /**

+     * IP Port for the reporting entity, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("otherEndpointPort")

+    public void setOtherEndpointPort(Integer otherEndpointPort) {

+        this.otherEndpointPort = otherEndpointPort;

+    }

+

+    /**

+     * Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...

+     * 

+     */

+    @JsonProperty("otherFunctionalRole")

+    public String getOtherFunctionalRole() {

+        return otherFunctionalRole;

+    }

+

+    /**

+     * Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...

+     * 

+     */

+    @JsonProperty("otherFunctionalRole")

+    public void setOtherFunctionalRole(String otherFunctionalRole) {

+        this.otherFunctionalRole = otherFunctionalRole;

+    }

+

+    /**

+     * routing area code

+     * 

+     */

+    @JsonProperty("rac")

+    public String getRac() {

+        return rac;

+    }

+

+    /**

+     * routing area code

+     * 

+     */

+    @JsonProperty("rac")

+    public void setRac(String rac) {

+        this.rac = rac;

+    }

+

+    /**

+     * Radio Access Technology e.g., 2G, 3G, LTE

+     * 

+     */

+    @JsonProperty("radioAccessTechnology")

+    public String getRadioAccessTechnology() {

+        return radioAccessTechnology;

+    }

+

+    /**

+     * Radio Access Technology e.g., 2G, 3G, LTE

+     * 

+     */

+    @JsonProperty("radioAccessTechnology")

+    public void setRadioAccessTechnology(String radioAccessTechnology) {

+        this.radioAccessTechnology = radioAccessTechnology;

+    }

+

+    /**

+     * IP address for the reporting entity, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("reportingEndpointIpAddr")

+    public String getReportingEndpointIpAddr() {

+        return reportingEndpointIpAddr;

+    }

+

+    /**

+     * IP address for the reporting entity, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("reportingEndpointIpAddr")

+    public void setReportingEndpointIpAddr(String reportingEndpointIpAddr) {

+        this.reportingEndpointIpAddr = reportingEndpointIpAddr;

+    }

+

+    /**

+     * IP port for the reporting entity, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("reportingEndpointPort")

+    public Integer getReportingEndpointPort() {

+        return reportingEndpointPort;

+    }

+

+    /**

+     * IP port for the reporting entity, as used for the flow being reported on

+     * (Required)

+     * 

+     */

+    @JsonProperty("reportingEndpointPort")

+    public void setReportingEndpointPort(Integer reportingEndpointPort) {

+        this.reportingEndpointPort = reportingEndpointPort;

+    }

+

+    /**

+     * service area code

+     * 

+     */

+    @JsonProperty("sac")

+    public String getSac() {

+        return sac;

+    }

+

+    /**

+     * service area code

+     * 

+     */

+    @JsonProperty("sac")

+    public void setSac(String sac) {

+        this.sac = sac;

+    }

+

+    /**

+     * Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied

+     * 

+     */

+    @JsonProperty("samplingAlgorithm")

+    public Integer getSamplingAlgorithm() {

+        return samplingAlgorithm;

+    }

+

+    /**

+     * Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied

+     * 

+     */

+    @JsonProperty("samplingAlgorithm")

+    public void setSamplingAlgorithm(Integer samplingAlgorithm) {

+        this.samplingAlgorithm = samplingAlgorithm;

+    }

+

+    /**

+     * transport area code

+     * 

+     */

+    @JsonProperty("tac")

+    public String getTac() {

+        return tac;

+    }

+

+    /**

+     * transport area code

+     * 

+     */

+    @JsonProperty("tac")

+    public void setTac(String tac) {

+        this.tac = tac;

+    }

+

+    /**

+     * tunnel identifier

+     * 

+     */

+    @JsonProperty("tunnelId")

+    public String getTunnelId() {

+        return tunnelId;

+    }

+

+    /**

+     * tunnel identifier

+     * 

+     */

+    @JsonProperty("tunnelId")

+    public void setTunnelId(String tunnelId) {

+        this.tunnelId = tunnelId;

+    }

+

+    /**

+     * VLAN identifier used by this flow

+     * 

+     */

+    @JsonProperty("vlanId")

+    public String getVlanId() {

+        return vlanId;

+    }

+

+    /**

+     * VLAN identifier used by this flow

+     * 

+     */

+    @JsonProperty("vlanId")

+    public void setVlanId(String vlanId) {

+        this.vlanId = vlanId;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalFields).append(applicationType).append(appProtocolType).append(appProtocolVersion).append(cid).append(connectionType).append(ecgi).append(flowDirection).append(gtpPerFlowMetrics).append(gtpProtocolType).append(gtpVersion).append(httpHeader).append(imei).append(imsi).append(ipProtocolType).append(ipVersion).append(lac).append(mcc).append(mnc).append(mobileFlowFieldsVersion).append(msisdn).append(otherEndpointIpAddress).append(otherEndpointPort).append(otherFunctionalRole).append(rac).append(radioAccessTechnology).append(reportingEndpointIpAddr).append(reportingEndpointPort).append(sac).append(samplingAlgorithm).append(tac).append(tunnelId).append(vlanId).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof MobileFlowFields) == false) {

+            return false;

+        }

+        MobileFlowFields rhs = ((MobileFlowFields) other);

+        return new EqualsBuilder().append(additionalFields, rhs.additionalFields).append(applicationType, rhs.applicationType).append(appProtocolType, rhs.appProtocolType).append(appProtocolVersion, rhs.appProtocolVersion).append(cid, rhs.cid).append(connectionType, rhs.connectionType).append(ecgi, rhs.ecgi).append(flowDirection, rhs.flowDirection).append(gtpPerFlowMetrics, rhs.gtpPerFlowMetrics).append(gtpProtocolType, rhs.gtpProtocolType).append(gtpVersion, rhs.gtpVersion).append(httpHeader, rhs.httpHeader).append(imei, rhs.imei).append(imsi, rhs.imsi).append(ipProtocolType, rhs.ipProtocolType).append(ipVersion, rhs.ipVersion).append(lac, rhs.lac).append(mcc, rhs.mcc).append(mnc, rhs.mnc).append(mobileFlowFieldsVersion, rhs.mobileFlowFieldsVersion).append(msisdn, rhs.msisdn).append(otherEndpointIpAddress, rhs.otherEndpointIpAddress).append(otherEndpointPort, rhs.otherEndpointPort).append(otherFunctionalRole, rhs.otherFunctionalRole).append(rac, rhs.rac).append(radioAccessTechnology, rhs.radioAccessTechnology).append(reportingEndpointIpAddr, rhs.reportingEndpointIpAddr).append(reportingEndpointPort, rhs.reportingEndpointPort).append(sac, rhs.sac).append(samplingAlgorithm, rhs.samplingAlgorithm).append(tac, rhs.tac).append(tunnelId, rhs.tunnelId).append(vlanId, rhs.vlanId).isEquals();

+    }

+

+    public enum MobileFlowFieldsVersion {

+

+        _4_0("4.0");

+        private final String value;

+        private final static Map<String, MobileFlowFields.MobileFlowFieldsVersion> CONSTANTS = new HashMap<String, MobileFlowFields.MobileFlowFieldsVersion>();

+

+        static {

+            for (MobileFlowFields.MobileFlowFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private MobileFlowFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static MobileFlowFields.MobileFlowFieldsVersion fromValue(String value) {

+            MobileFlowFields.MobileFlowFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NicPerformanceArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NicPerformanceArray.java
new file mode 100644
index 0000000..bf5dac6
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NicPerformanceArray.java
@@ -0,0 +1,1204 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * describes the performance and errors of an identified network interface card

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "administrativeState",

+    "nicIdentifier",

+    "operationalState",

+    "receivedBroadcastPacketsAccumulated",

+    "receivedBroadcastPacketsDelta",

+    "receivedDiscardedPacketsAccumulated",

+    "receivedDiscardedPacketsDelta",

+    "receivedErrorPacketsAccumulated",

+    "receivedErrorPacketsDelta",

+    "receivedMulticastPacketsAccumulated",

+    "receivedMulticastPacketsDelta",

+    "receivedOctetsAccumulated",

+    "receivedOctetsDelta",

+    "receivedTotalPacketsAccumulated",

+    "receivedPercentDiscard",

+    "receivedPercentError",

+    "receivedTotalPacketsDelta",

+    "receivedUnicastPacketsAccumulated",

+    "receivedUnicastPacketsDelta",

+    "receivedUtilization",

+    "speed",

+    "transmittedBroadcastPacketsAccumulated",

+    "transmittedBroadcastPacketsDelta",

+    "transmittedDiscardedPacketsAccumulated",

+    "transmittedDiscardedPacketsDelta",

+    "transmittedErrorPacketsAccumulated",

+    "transmittedErrorPacketsDelta",

+    "transmittedMulticastPacketsAccumulated",

+    "transmittedMulticastPacketsDelta",

+    "transmittedOctetsAccumulated",

+    "transmittedOctetsDelta",

+    "transmittedTotalPacketsAccumulated",

+    "transmittedTotalPacketsDelta",

+    "transmittedUnicastPacketsAccumulated",

+    "transmittedUnicastPacketsDelta",

+    "transmittedPercentDiscard",

+    "transmittedPercentError",

+    "transmittedUtilization",

+    "valuesAreSuspect"

+})

+public class NicPerformanceArray {

+

+    /**

+     * administrative state

+     * 

+     */

+    @JsonProperty("administrativeState")

+    @JsonPropertyDescription("administrative state")

+    private NicPerformanceArray.AdministrativeState administrativeState;

+    /**

+     * nic identification

+     * (Required)

+     * 

+     */

+    @JsonProperty("nicIdentifier")

+    @JsonPropertyDescription("nic identification")

+    private String nicIdentifier;

+    /**

+     * operational state

+     * 

+     */

+    @JsonProperty("operationalState")

+    @JsonPropertyDescription("operational state")

+    private NicPerformanceArray.OperationalState operationalState;

+    /**

+     * Cumulative count of broadcast packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedBroadcastPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of broadcast packets received as read at the end of the measurement interval")

+    private Double receivedBroadcastPacketsAccumulated;

+    /**

+     * Count of broadcast packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedBroadcastPacketsDelta")

+    @JsonPropertyDescription("Count of broadcast packets received within the measurement interval")

+    private Double receivedBroadcastPacketsDelta;

+    /**

+     * Cumulative count of discarded packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedDiscardedPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of discarded packets received as read at the end of the measurement interval")

+    private Double receivedDiscardedPacketsAccumulated;

+    /**

+     * Count of discarded packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedDiscardedPacketsDelta")

+    @JsonPropertyDescription("Count of discarded packets received within the measurement interval")

+    private Double receivedDiscardedPacketsDelta;

+    /**

+     * Cumulative count of error packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedErrorPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of error packets received as read at the end of the measurement interval")

+    private Double receivedErrorPacketsAccumulated;

+    /**

+     * Count of error packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedErrorPacketsDelta")

+    @JsonPropertyDescription("Count of error packets received within the measurement interval")

+    private Double receivedErrorPacketsDelta;

+    /**

+     * Cumulative count of multicast packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedMulticastPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of multicast packets received as read at the end of the measurement interval")

+    private Double receivedMulticastPacketsAccumulated;

+    /**

+     * Count of multicast packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedMulticastPacketsDelta")

+    @JsonPropertyDescription("Count of multicast packets received within the measurement interval")

+    private Double receivedMulticastPacketsDelta;

+    /**

+     * Cumulative count of octets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedOctetsAccumulated")

+    @JsonPropertyDescription("Cumulative count of octets received as read at the end of the measurement interval")

+    private Double receivedOctetsAccumulated;

+    /**

+     * Count of octets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedOctetsDelta")

+    @JsonPropertyDescription("Count of octets received within the measurement interval")

+    private Double receivedOctetsDelta;

+    /**

+     * Cumulative count of all packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedTotalPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of all packets received as read at the end of the measurement interval")

+    private Double receivedTotalPacketsAccumulated;

+    /**

+     * Percentage of discarded packets received; value = (receivedDiscardedPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("receivedPercentDiscard")

+    @JsonPropertyDescription("Percentage of discarded packets received; value = (receivedDiscardedPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise")

+    private Double receivedPercentDiscard;

+    /**

+     * Percentage of error packets received; value = (receivedErrorPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise.

+     * 

+     */

+    @JsonProperty("receivedPercentError")

+    @JsonPropertyDescription("Percentage of error packets received; value = (receivedErrorPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise.")

+    private Double receivedPercentError;

+    /**

+     * Count of all packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedTotalPacketsDelta")

+    @JsonPropertyDescription("Count of all packets received within the measurement interval")

+    private Double receivedTotalPacketsDelta;

+    /**

+     * Cumulative count of unicast packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedUnicastPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of unicast packets received as read at the end of the measurement interval")

+    private Double receivedUnicastPacketsAccumulated;

+    /**

+     * Count of unicast packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedUnicastPacketsDelta")

+    @JsonPropertyDescription("Count of unicast packets received within the measurement interval")

+    private Double receivedUnicastPacketsDelta;

+    /**

+     * Percentage of utilization received; value = (receivedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("receivedUtilization")

+    @JsonPropertyDescription("Percentage of utilization received; value = (receivedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise")

+    private Double receivedUtilization;

+    /**

+     * Speed configured in mbps

+     * 

+     */

+    @JsonProperty("speed")

+    @JsonPropertyDescription("Speed configured in mbps")

+    private Double speed;

+    /**

+     * Cumulative count of broadcast packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedBroadcastPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of broadcast packets transmitted as read at the end of the measurement interval")

+    private Double transmittedBroadcastPacketsAccumulated;

+    /**

+     * Count of broadcast packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedBroadcastPacketsDelta")

+    @JsonPropertyDescription("Count of broadcast packets transmitted within the measurement interval")

+    private Double transmittedBroadcastPacketsDelta;

+    /**

+     * Cumulative count of discarded packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedDiscardedPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of discarded packets transmitted as read at the end of the measurement interval")

+    private Double transmittedDiscardedPacketsAccumulated;

+    /**

+     * Count of discarded packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedDiscardedPacketsDelta")

+    @JsonPropertyDescription("Count of discarded packets transmitted within the measurement interval")

+    private Double transmittedDiscardedPacketsDelta;

+    /**

+     * Cumulative count of error packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedErrorPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of error packets transmitted as read at the end of the measurement interval")

+    private Double transmittedErrorPacketsAccumulated;

+    /**

+     * Count of error packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedErrorPacketsDelta")

+    @JsonPropertyDescription("Count of error packets transmitted within the measurement interval")

+    private Double transmittedErrorPacketsDelta;

+    /**

+     * Cumulative count of multicast packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedMulticastPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of multicast packets transmitted as read at the end of the measurement interval")

+    private Double transmittedMulticastPacketsAccumulated;

+    /**

+     * Count of multicast packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedMulticastPacketsDelta")

+    @JsonPropertyDescription("Count of multicast packets transmitted within the measurement interval")

+    private Double transmittedMulticastPacketsDelta;

+    /**

+     * Cumulative count of octets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedOctetsAccumulated")

+    @JsonPropertyDescription("Cumulative count of octets transmitted as read at the end of the measurement interval")

+    private Double transmittedOctetsAccumulated;

+    /**

+     * Count of octets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedOctetsDelta")

+    @JsonPropertyDescription("Count of octets transmitted within the measurement interval")

+    private Double transmittedOctetsDelta;

+    /**

+     * Cumulative count of all packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedTotalPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of all packets transmitted as read at the end of the measurement interval")

+    private Double transmittedTotalPacketsAccumulated;

+    /**

+     * Count of all packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedTotalPacketsDelta")

+    @JsonPropertyDescription("Count of all packets transmitted within the measurement interval")

+    private Double transmittedTotalPacketsDelta;

+    /**

+     * Cumulative count of unicast packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedUnicastPacketsAccumulated")

+    @JsonPropertyDescription("Cumulative count of unicast packets transmitted as read at the end of the measurement interval")

+    private Double transmittedUnicastPacketsAccumulated;

+    /**

+     * Count of unicast packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedUnicastPacketsDelta")

+    @JsonPropertyDescription("Count of unicast packets transmitted within the measurement interval")

+    private Double transmittedUnicastPacketsDelta;

+    /**

+     * Percentage of discarded packets transmitted; value = (transmittedDiscardedPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("transmittedPercentDiscard")

+    @JsonPropertyDescription("Percentage of discarded packets transmitted; value = (transmittedDiscardedPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise")

+    private Double transmittedPercentDiscard;

+    /**

+     * Percentage of error packets received; value = (transmittedErrorPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("transmittedPercentError")

+    @JsonPropertyDescription("Percentage of error packets received; value = (transmittedErrorPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise")

+    private Double transmittedPercentError;

+    /**

+     * Percentage of utilization transmitted; value = (transmittedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise.

+     * 

+     */

+    @JsonProperty("transmittedUtilization")

+    @JsonPropertyDescription("Percentage of utilization transmitted; value = (transmittedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise.")

+    private Double transmittedUtilization;

+    /**

+     * Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions

+     * (Required)

+     * 

+     */

+    @JsonProperty("valuesAreSuspect")

+    @JsonPropertyDescription("Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions")

+    private NicPerformanceArray.ValuesAreSuspect valuesAreSuspect;

+

+    /**

+     * administrative state

+     * 

+     */

+    @JsonProperty("administrativeState")

+    public NicPerformanceArray.AdministrativeState getAdministrativeState() {

+        return administrativeState;

+    }

+

+    /**

+     * administrative state

+     * 

+     */

+    @JsonProperty("administrativeState")

+    public void setAdministrativeState(NicPerformanceArray.AdministrativeState administrativeState) {

+        this.administrativeState = administrativeState;

+    }

+

+    /**

+     * nic identification

+     * (Required)

+     * 

+     */

+    @JsonProperty("nicIdentifier")

+    public String getNicIdentifier() {

+        return nicIdentifier;

+    }

+

+    /**

+     * nic identification

+     * (Required)

+     * 

+     */

+    @JsonProperty("nicIdentifier")

+    public void setNicIdentifier(String nicIdentifier) {

+        this.nicIdentifier = nicIdentifier;

+    }

+

+    /**

+     * operational state

+     * 

+     */

+    @JsonProperty("operationalState")

+    public NicPerformanceArray.OperationalState getOperationalState() {

+        return operationalState;

+    }

+

+    /**

+     * operational state

+     * 

+     */

+    @JsonProperty("operationalState")

+    public void setOperationalState(NicPerformanceArray.OperationalState operationalState) {

+        this.operationalState = operationalState;

+    }

+

+    /**

+     * Cumulative count of broadcast packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedBroadcastPacketsAccumulated")

+    public Double getReceivedBroadcastPacketsAccumulated() {

+        return receivedBroadcastPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of broadcast packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedBroadcastPacketsAccumulated")

+    public void setReceivedBroadcastPacketsAccumulated(Double receivedBroadcastPacketsAccumulated) {

+        this.receivedBroadcastPacketsAccumulated = receivedBroadcastPacketsAccumulated;

+    }

+

+    /**

+     * Count of broadcast packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedBroadcastPacketsDelta")

+    public Double getReceivedBroadcastPacketsDelta() {

+        return receivedBroadcastPacketsDelta;

+    }

+

+    /**

+     * Count of broadcast packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedBroadcastPacketsDelta")

+    public void setReceivedBroadcastPacketsDelta(Double receivedBroadcastPacketsDelta) {

+        this.receivedBroadcastPacketsDelta = receivedBroadcastPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of discarded packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedDiscardedPacketsAccumulated")

+    public Double getReceivedDiscardedPacketsAccumulated() {

+        return receivedDiscardedPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of discarded packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedDiscardedPacketsAccumulated")

+    public void setReceivedDiscardedPacketsAccumulated(Double receivedDiscardedPacketsAccumulated) {

+        this.receivedDiscardedPacketsAccumulated = receivedDiscardedPacketsAccumulated;

+    }

+

+    /**

+     * Count of discarded packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedDiscardedPacketsDelta")

+    public Double getReceivedDiscardedPacketsDelta() {

+        return receivedDiscardedPacketsDelta;

+    }

+

+    /**

+     * Count of discarded packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedDiscardedPacketsDelta")

+    public void setReceivedDiscardedPacketsDelta(Double receivedDiscardedPacketsDelta) {

+        this.receivedDiscardedPacketsDelta = receivedDiscardedPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of error packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedErrorPacketsAccumulated")

+    public Double getReceivedErrorPacketsAccumulated() {

+        return receivedErrorPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of error packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedErrorPacketsAccumulated")

+    public void setReceivedErrorPacketsAccumulated(Double receivedErrorPacketsAccumulated) {

+        this.receivedErrorPacketsAccumulated = receivedErrorPacketsAccumulated;

+    }

+

+    /**

+     * Count of error packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedErrorPacketsDelta")

+    public Double getReceivedErrorPacketsDelta() {

+        return receivedErrorPacketsDelta;

+    }

+

+    /**

+     * Count of error packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedErrorPacketsDelta")

+    public void setReceivedErrorPacketsDelta(Double receivedErrorPacketsDelta) {

+        this.receivedErrorPacketsDelta = receivedErrorPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of multicast packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedMulticastPacketsAccumulated")

+    public Double getReceivedMulticastPacketsAccumulated() {

+        return receivedMulticastPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of multicast packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedMulticastPacketsAccumulated")

+    public void setReceivedMulticastPacketsAccumulated(Double receivedMulticastPacketsAccumulated) {

+        this.receivedMulticastPacketsAccumulated = receivedMulticastPacketsAccumulated;

+    }

+

+    /**

+     * Count of multicast packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedMulticastPacketsDelta")

+    public Double getReceivedMulticastPacketsDelta() {

+        return receivedMulticastPacketsDelta;

+    }

+

+    /**

+     * Count of multicast packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedMulticastPacketsDelta")

+    public void setReceivedMulticastPacketsDelta(Double receivedMulticastPacketsDelta) {

+        this.receivedMulticastPacketsDelta = receivedMulticastPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of octets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedOctetsAccumulated")

+    public Double getReceivedOctetsAccumulated() {

+        return receivedOctetsAccumulated;

+    }

+

+    /**

+     * Cumulative count of octets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedOctetsAccumulated")

+    public void setReceivedOctetsAccumulated(Double receivedOctetsAccumulated) {

+        this.receivedOctetsAccumulated = receivedOctetsAccumulated;

+    }

+

+    /**

+     * Count of octets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedOctetsDelta")

+    public Double getReceivedOctetsDelta() {

+        return receivedOctetsDelta;

+    }

+

+    /**

+     * Count of octets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedOctetsDelta")

+    public void setReceivedOctetsDelta(Double receivedOctetsDelta) {

+        this.receivedOctetsDelta = receivedOctetsDelta;

+    }

+

+    /**

+     * Cumulative count of all packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedTotalPacketsAccumulated")

+    public Double getReceivedTotalPacketsAccumulated() {

+        return receivedTotalPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of all packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedTotalPacketsAccumulated")

+    public void setReceivedTotalPacketsAccumulated(Double receivedTotalPacketsAccumulated) {

+        this.receivedTotalPacketsAccumulated = receivedTotalPacketsAccumulated;

+    }

+

+    /**

+     * Percentage of discarded packets received; value = (receivedDiscardedPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("receivedPercentDiscard")

+    public Double getReceivedPercentDiscard() {

+        return receivedPercentDiscard;

+    }

+

+    /**

+     * Percentage of discarded packets received; value = (receivedDiscardedPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("receivedPercentDiscard")

+    public void setReceivedPercentDiscard(Double receivedPercentDiscard) {

+        this.receivedPercentDiscard = receivedPercentDiscard;

+    }

+

+    /**

+     * Percentage of error packets received; value = (receivedErrorPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise.

+     * 

+     */

+    @JsonProperty("receivedPercentError")

+    public Double getReceivedPercentError() {

+        return receivedPercentError;

+    }

+

+    /**

+     * Percentage of error packets received; value = (receivedErrorPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise.

+     * 

+     */

+    @JsonProperty("receivedPercentError")

+    public void setReceivedPercentError(Double receivedPercentError) {

+        this.receivedPercentError = receivedPercentError;

+    }

+

+    /**

+     * Count of all packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedTotalPacketsDelta")

+    public Double getReceivedTotalPacketsDelta() {

+        return receivedTotalPacketsDelta;

+    }

+

+    /**

+     * Count of all packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedTotalPacketsDelta")

+    public void setReceivedTotalPacketsDelta(Double receivedTotalPacketsDelta) {

+        this.receivedTotalPacketsDelta = receivedTotalPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of unicast packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedUnicastPacketsAccumulated")

+    public Double getReceivedUnicastPacketsAccumulated() {

+        return receivedUnicastPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of unicast packets received as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("receivedUnicastPacketsAccumulated")

+    public void setReceivedUnicastPacketsAccumulated(Double receivedUnicastPacketsAccumulated) {

+        this.receivedUnicastPacketsAccumulated = receivedUnicastPacketsAccumulated;

+    }

+

+    /**

+     * Count of unicast packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedUnicastPacketsDelta")

+    public Double getReceivedUnicastPacketsDelta() {

+        return receivedUnicastPacketsDelta;

+    }

+

+    /**

+     * Count of unicast packets received within the measurement interval

+     * 

+     */

+    @JsonProperty("receivedUnicastPacketsDelta")

+    public void setReceivedUnicastPacketsDelta(Double receivedUnicastPacketsDelta) {

+        this.receivedUnicastPacketsDelta = receivedUnicastPacketsDelta;

+    }

+

+    /**

+     * Percentage of utilization received; value = (receivedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("receivedUtilization")

+    public Double getReceivedUtilization() {

+        return receivedUtilization;

+    }

+

+    /**

+     * Percentage of utilization received; value = (receivedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("receivedUtilization")

+    public void setReceivedUtilization(Double receivedUtilization) {

+        this.receivedUtilization = receivedUtilization;

+    }

+

+    /**

+     * Speed configured in mbps

+     * 

+     */

+    @JsonProperty("speed")

+    public Double getSpeed() {

+        return speed;

+    }

+

+    /**

+     * Speed configured in mbps

+     * 

+     */

+    @JsonProperty("speed")

+    public void setSpeed(Double speed) {

+        this.speed = speed;

+    }

+

+    /**

+     * Cumulative count of broadcast packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedBroadcastPacketsAccumulated")

+    public Double getTransmittedBroadcastPacketsAccumulated() {

+        return transmittedBroadcastPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of broadcast packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedBroadcastPacketsAccumulated")

+    public void setTransmittedBroadcastPacketsAccumulated(Double transmittedBroadcastPacketsAccumulated) {

+        this.transmittedBroadcastPacketsAccumulated = transmittedBroadcastPacketsAccumulated;

+    }

+

+    /**

+     * Count of broadcast packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedBroadcastPacketsDelta")

+    public Double getTransmittedBroadcastPacketsDelta() {

+        return transmittedBroadcastPacketsDelta;

+    }

+

+    /**

+     * Count of broadcast packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedBroadcastPacketsDelta")

+    public void setTransmittedBroadcastPacketsDelta(Double transmittedBroadcastPacketsDelta) {

+        this.transmittedBroadcastPacketsDelta = transmittedBroadcastPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of discarded packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedDiscardedPacketsAccumulated")

+    public Double getTransmittedDiscardedPacketsAccumulated() {

+        return transmittedDiscardedPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of discarded packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedDiscardedPacketsAccumulated")

+    public void setTransmittedDiscardedPacketsAccumulated(Double transmittedDiscardedPacketsAccumulated) {

+        this.transmittedDiscardedPacketsAccumulated = transmittedDiscardedPacketsAccumulated;

+    }

+

+    /**

+     * Count of discarded packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedDiscardedPacketsDelta")

+    public Double getTransmittedDiscardedPacketsDelta() {

+        return transmittedDiscardedPacketsDelta;

+    }

+

+    /**

+     * Count of discarded packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedDiscardedPacketsDelta")

+    public void setTransmittedDiscardedPacketsDelta(Double transmittedDiscardedPacketsDelta) {

+        this.transmittedDiscardedPacketsDelta = transmittedDiscardedPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of error packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedErrorPacketsAccumulated")

+    public Double getTransmittedErrorPacketsAccumulated() {

+        return transmittedErrorPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of error packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedErrorPacketsAccumulated")

+    public void setTransmittedErrorPacketsAccumulated(Double transmittedErrorPacketsAccumulated) {

+        this.transmittedErrorPacketsAccumulated = transmittedErrorPacketsAccumulated;

+    }

+

+    /**

+     * Count of error packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedErrorPacketsDelta")

+    public Double getTransmittedErrorPacketsDelta() {

+        return transmittedErrorPacketsDelta;

+    }

+

+    /**

+     * Count of error packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedErrorPacketsDelta")

+    public void setTransmittedErrorPacketsDelta(Double transmittedErrorPacketsDelta) {

+        this.transmittedErrorPacketsDelta = transmittedErrorPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of multicast packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedMulticastPacketsAccumulated")

+    public Double getTransmittedMulticastPacketsAccumulated() {

+        return transmittedMulticastPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of multicast packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedMulticastPacketsAccumulated")

+    public void setTransmittedMulticastPacketsAccumulated(Double transmittedMulticastPacketsAccumulated) {

+        this.transmittedMulticastPacketsAccumulated = transmittedMulticastPacketsAccumulated;

+    }

+

+    /**

+     * Count of multicast packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedMulticastPacketsDelta")

+    public Double getTransmittedMulticastPacketsDelta() {

+        return transmittedMulticastPacketsDelta;

+    }

+

+    /**

+     * Count of multicast packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedMulticastPacketsDelta")

+    public void setTransmittedMulticastPacketsDelta(Double transmittedMulticastPacketsDelta) {

+        this.transmittedMulticastPacketsDelta = transmittedMulticastPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of octets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedOctetsAccumulated")

+    public Double getTransmittedOctetsAccumulated() {

+        return transmittedOctetsAccumulated;

+    }

+

+    /**

+     * Cumulative count of octets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedOctetsAccumulated")

+    public void setTransmittedOctetsAccumulated(Double transmittedOctetsAccumulated) {

+        this.transmittedOctetsAccumulated = transmittedOctetsAccumulated;

+    }

+

+    /**

+     * Count of octets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedOctetsDelta")

+    public Double getTransmittedOctetsDelta() {

+        return transmittedOctetsDelta;

+    }

+

+    /**

+     * Count of octets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedOctetsDelta")

+    public void setTransmittedOctetsDelta(Double transmittedOctetsDelta) {

+        this.transmittedOctetsDelta = transmittedOctetsDelta;

+    }

+

+    /**

+     * Cumulative count of all packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedTotalPacketsAccumulated")

+    public Double getTransmittedTotalPacketsAccumulated() {

+        return transmittedTotalPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of all packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedTotalPacketsAccumulated")

+    public void setTransmittedTotalPacketsAccumulated(Double transmittedTotalPacketsAccumulated) {

+        this.transmittedTotalPacketsAccumulated = transmittedTotalPacketsAccumulated;

+    }

+

+    /**

+     * Count of all packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedTotalPacketsDelta")

+    public Double getTransmittedTotalPacketsDelta() {

+        return transmittedTotalPacketsDelta;

+    }

+

+    /**

+     * Count of all packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedTotalPacketsDelta")

+    public void setTransmittedTotalPacketsDelta(Double transmittedTotalPacketsDelta) {

+        this.transmittedTotalPacketsDelta = transmittedTotalPacketsDelta;

+    }

+

+    /**

+     * Cumulative count of unicast packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedUnicastPacketsAccumulated")

+    public Double getTransmittedUnicastPacketsAccumulated() {

+        return transmittedUnicastPacketsAccumulated;

+    }

+

+    /**

+     * Cumulative count of unicast packets transmitted as read at the end of the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedUnicastPacketsAccumulated")

+    public void setTransmittedUnicastPacketsAccumulated(Double transmittedUnicastPacketsAccumulated) {

+        this.transmittedUnicastPacketsAccumulated = transmittedUnicastPacketsAccumulated;

+    }

+

+    /**

+     * Count of unicast packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedUnicastPacketsDelta")

+    public Double getTransmittedUnicastPacketsDelta() {

+        return transmittedUnicastPacketsDelta;

+    }

+

+    /**

+     * Count of unicast packets transmitted within the measurement interval

+     * 

+     */

+    @JsonProperty("transmittedUnicastPacketsDelta")

+    public void setTransmittedUnicastPacketsDelta(Double transmittedUnicastPacketsDelta) {

+        this.transmittedUnicastPacketsDelta = transmittedUnicastPacketsDelta;

+    }

+

+    /**

+     * Percentage of discarded packets transmitted; value = (transmittedDiscardedPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("transmittedPercentDiscard")

+    public Double getTransmittedPercentDiscard() {

+        return transmittedPercentDiscard;

+    }

+

+    /**

+     * Percentage of discarded packets transmitted; value = (transmittedDiscardedPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("transmittedPercentDiscard")

+    public void setTransmittedPercentDiscard(Double transmittedPercentDiscard) {

+        this.transmittedPercentDiscard = transmittedPercentDiscard;

+    }

+

+    /**

+     * Percentage of error packets received; value = (transmittedErrorPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("transmittedPercentError")

+    public Double getTransmittedPercentError() {

+        return transmittedPercentError;

+    }

+

+    /**

+     * Percentage of error packets received; value = (transmittedErrorPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise

+     * 

+     */

+    @JsonProperty("transmittedPercentError")

+    public void setTransmittedPercentError(Double transmittedPercentError) {

+        this.transmittedPercentError = transmittedPercentError;

+    }

+

+    /**

+     * Percentage of utilization transmitted; value = (transmittedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise.

+     * 

+     */

+    @JsonProperty("transmittedUtilization")

+    public Double getTransmittedUtilization() {

+        return transmittedUtilization;

+    }

+

+    /**

+     * Percentage of utilization transmitted; value = (transmittedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise.

+     * 

+     */

+    @JsonProperty("transmittedUtilization")

+    public void setTransmittedUtilization(Double transmittedUtilization) {

+        this.transmittedUtilization = transmittedUtilization;

+    }

+

+    /**

+     * Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions

+     * (Required)

+     * 

+     */

+    @JsonProperty("valuesAreSuspect")

+    public NicPerformanceArray.ValuesAreSuspect getValuesAreSuspect() {

+        return valuesAreSuspect;

+    }

+

+    /**

+     * Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions

+     * (Required)

+     * 

+     */

+    @JsonProperty("valuesAreSuspect")

+    public void setValuesAreSuspect(NicPerformanceArray.ValuesAreSuspect valuesAreSuspect) {

+        this.valuesAreSuspect = valuesAreSuspect;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(administrativeState).append(nicIdentifier).append(operationalState).append(receivedBroadcastPacketsAccumulated).append(receivedBroadcastPacketsDelta).append(receivedDiscardedPacketsAccumulated).append(receivedDiscardedPacketsDelta).append(receivedErrorPacketsAccumulated).append(receivedErrorPacketsDelta).append(receivedMulticastPacketsAccumulated).append(receivedMulticastPacketsDelta).append(receivedOctetsAccumulated).append(receivedOctetsDelta).append(receivedTotalPacketsAccumulated).append(receivedPercentDiscard).append(receivedPercentError).append(receivedTotalPacketsDelta).append(receivedUnicastPacketsAccumulated).append(receivedUnicastPacketsDelta).append(receivedUtilization).append(speed).append(transmittedBroadcastPacketsAccumulated).append(transmittedBroadcastPacketsDelta).append(transmittedDiscardedPacketsAccumulated).append(transmittedDiscardedPacketsDelta).append(transmittedErrorPacketsAccumulated).append(transmittedErrorPacketsDelta).append(transmittedMulticastPacketsAccumulated).append(transmittedMulticastPacketsDelta).append(transmittedOctetsAccumulated).append(transmittedOctetsDelta).append(transmittedTotalPacketsAccumulated).append(transmittedTotalPacketsDelta).append(transmittedUnicastPacketsAccumulated).append(transmittedUnicastPacketsDelta).append(transmittedPercentDiscard).append(transmittedPercentError).append(transmittedUtilization).append(valuesAreSuspect).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof NicPerformanceArray) == false) {

+            return false;

+        }

+        NicPerformanceArray rhs = ((NicPerformanceArray) other);

+        return new EqualsBuilder().append(administrativeState, rhs.administrativeState).append(nicIdentifier, rhs.nicIdentifier).append(operationalState, rhs.operationalState).append(receivedBroadcastPacketsAccumulated, rhs.receivedBroadcastPacketsAccumulated).append(receivedBroadcastPacketsDelta, rhs.receivedBroadcastPacketsDelta).append(receivedDiscardedPacketsAccumulated, rhs.receivedDiscardedPacketsAccumulated).append(receivedDiscardedPacketsDelta, rhs.receivedDiscardedPacketsDelta).append(receivedErrorPacketsAccumulated, rhs.receivedErrorPacketsAccumulated).append(receivedErrorPacketsDelta, rhs.receivedErrorPacketsDelta).append(receivedMulticastPacketsAccumulated, rhs.receivedMulticastPacketsAccumulated).append(receivedMulticastPacketsDelta, rhs.receivedMulticastPacketsDelta).append(receivedOctetsAccumulated, rhs.receivedOctetsAccumulated).append(receivedOctetsDelta, rhs.receivedOctetsDelta).append(receivedTotalPacketsAccumulated, rhs.receivedTotalPacketsAccumulated).append(receivedPercentDiscard, rhs.receivedPercentDiscard).append(receivedPercentError, rhs.receivedPercentError).append(receivedTotalPacketsDelta, rhs.receivedTotalPacketsDelta).append(receivedUnicastPacketsAccumulated, rhs.receivedUnicastPacketsAccumulated).append(receivedUnicastPacketsDelta, rhs.receivedUnicastPacketsDelta).append(receivedUtilization, rhs.receivedUtilization).append(speed, rhs.speed).append(transmittedBroadcastPacketsAccumulated, rhs.transmittedBroadcastPacketsAccumulated).append(transmittedBroadcastPacketsDelta, rhs.transmittedBroadcastPacketsDelta).append(transmittedDiscardedPacketsAccumulated, rhs.transmittedDiscardedPacketsAccumulated).append(transmittedDiscardedPacketsDelta, rhs.transmittedDiscardedPacketsDelta).append(transmittedErrorPacketsAccumulated, rhs.transmittedErrorPacketsAccumulated).append(transmittedErrorPacketsDelta, rhs.transmittedErrorPacketsDelta).append(transmittedMulticastPacketsAccumulated, rhs.transmittedMulticastPacketsAccumulated).append(transmittedMulticastPacketsDelta, rhs.transmittedMulticastPacketsDelta).append(transmittedOctetsAccumulated, rhs.transmittedOctetsAccumulated).append(transmittedOctetsDelta, rhs.transmittedOctetsDelta).append(transmittedTotalPacketsAccumulated, rhs.transmittedTotalPacketsAccumulated).append(transmittedTotalPacketsDelta, rhs.transmittedTotalPacketsDelta).append(transmittedUnicastPacketsAccumulated, rhs.transmittedUnicastPacketsAccumulated).append(transmittedUnicastPacketsDelta, rhs.transmittedUnicastPacketsDelta).append(transmittedPercentDiscard, rhs.transmittedPercentDiscard).append(transmittedPercentError, rhs.transmittedPercentError).append(transmittedUtilization, rhs.transmittedUtilization).append(valuesAreSuspect, rhs.valuesAreSuspect).isEquals();

+    }

+

+    public enum AdministrativeState {

+

+        IN_SERVICE("inService"),

+        OUT_OF_SERVICE("outOfService");

+        private final String value;

+        private final static Map<String, NicPerformanceArray.AdministrativeState> CONSTANTS = new HashMap<String, NicPerformanceArray.AdministrativeState>();

+

+        static {

+            for (NicPerformanceArray.AdministrativeState c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private AdministrativeState(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static NicPerformanceArray.AdministrativeState fromValue(String value) {

+            NicPerformanceArray.AdministrativeState constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum OperationalState {

+

+        IN_SERVICE("inService"),

+        OUT_OF_SERVICE("outOfService");

+        private final String value;

+        private final static Map<String, NicPerformanceArray.OperationalState> CONSTANTS = new HashMap<String, NicPerformanceArray.OperationalState>();

+

+        static {

+            for (NicPerformanceArray.OperationalState c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private OperationalState(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static NicPerformanceArray.OperationalState fromValue(String value) {

+            NicPerformanceArray.OperationalState constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum ValuesAreSuspect {

+

+        TRUE("true"),

+        FALSE("false");

+        private final String value;

+        private final static Map<String, NicPerformanceArray.ValuesAreSuspect> CONSTANTS = new HashMap<String, NicPerformanceArray.ValuesAreSuspect>();

+

+        static {

+            for (NicPerformanceArray.ValuesAreSuspect c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private ValuesAreSuspect(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static NicPerformanceArray.ValuesAreSuspect fromValue(String value) {

+            NicPerformanceArray.ValuesAreSuspect constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NotificationFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NotificationFields.java
new file mode 100644
index 0000000..973606c
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NotificationFields.java
@@ -0,0 +1,350 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * notification fields

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalFields",

+    "arrayOfNamedHashMap",

+    "changeContact",

+    "changeIdentifier",

+    "changeType",

+    "newState",

+    "oldState",

+    "notificationFieldsVersion",

+    "stateInterface"

+})

+public class NotificationFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalFields;

+    /**

+     * array of named hashMaps

+     * 

+     */

+    @JsonProperty("arrayOfNamedHashMap")

+    @JsonPropertyDescription("array of named hashMaps")

+    private List<AdditionalMeasurement> arrayOfNamedHashMap = new ArrayList<AdditionalMeasurement>();

+    /**

+     * identifier for a contact related to the change

+     * 

+     */

+    @JsonProperty("changeContact")

+    @JsonPropertyDescription("identifier for a contact related to the change")

+    private String changeContact;

+    /**

+     * system or session identifier associated with the change

+     * (Required)

+     * 

+     */

+    @JsonProperty("changeIdentifier")

+    @JsonPropertyDescription("system or session identifier associated with the change")

+    private String changeIdentifier;

+    /**

+     * describes what has changed for the entity

+     * (Required)

+     * 

+     */

+    @JsonProperty("changeType")

+    @JsonPropertyDescription("describes what has changed for the entity")

+    private String changeType;

+    /**

+     * new state of the entity

+     * 

+     */

+    @JsonProperty("newState")

+    @JsonPropertyDescription("new state of the entity")

+    private String newState;

+    /**

+     * previous state of the entity

+     * 

+     */

+    @JsonProperty("oldState")

+    @JsonPropertyDescription("previous state of the entity")

+    private String oldState;

+    /**

+     * version of the notificationFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("notificationFieldsVersion")

+    @JsonPropertyDescription("version of the notificationFields block")

+    private NotificationFields.NotificationFieldsVersion notificationFieldsVersion;

+    /**

+     * card or port name of the entity that changed state

+     * 

+     */

+    @JsonProperty("stateInterface")

+    @JsonPropertyDescription("card or port name of the entity that changed state")

+    private String stateInterface;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public AlarmAdditionalInformation getAdditionalFields() {

+        return additionalFields;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public void setAdditionalFields(AlarmAdditionalInformation additionalFields) {

+        this.additionalFields = additionalFields;

+    }

+

+    /**

+     * array of named hashMaps

+     * 

+     */

+    @JsonProperty("arrayOfNamedHashMap")

+    public List<AdditionalMeasurement> getArrayOfNamedHashMap() {

+        return arrayOfNamedHashMap;

+    }

+

+    /**

+     * array of named hashMaps

+     * 

+     */

+    @JsonProperty("arrayOfNamedHashMap")

+    public void setArrayOfNamedHashMap(List<AdditionalMeasurement> arrayOfNamedHashMap) {

+        this.arrayOfNamedHashMap = arrayOfNamedHashMap;

+    }

+

+    /**

+     * identifier for a contact related to the change

+     * 

+     */

+    @JsonProperty("changeContact")

+    public String getChangeContact() {

+        return changeContact;

+    }

+

+    /**

+     * identifier for a contact related to the change

+     * 

+     */

+    @JsonProperty("changeContact")

+    public void setChangeContact(String changeContact) {

+        this.changeContact = changeContact;

+    }

+

+    /**

+     * system or session identifier associated with the change

+     * (Required)

+     * 

+     */

+    @JsonProperty("changeIdentifier")

+    public String getChangeIdentifier() {

+        return changeIdentifier;

+    }

+

+    /**

+     * system or session identifier associated with the change

+     * (Required)

+     * 

+     */

+    @JsonProperty("changeIdentifier")

+    public void setChangeIdentifier(String changeIdentifier) {

+        this.changeIdentifier = changeIdentifier;

+    }

+

+    /**

+     * describes what has changed for the entity

+     * (Required)

+     * 

+     */

+    @JsonProperty("changeType")

+    public String getChangeType() {

+        return changeType;

+    }

+

+    /**

+     * describes what has changed for the entity

+     * (Required)

+     * 

+     */

+    @JsonProperty("changeType")

+    public void setChangeType(String changeType) {

+        this.changeType = changeType;

+    }

+

+    /**

+     * new state of the entity

+     * 

+     */

+    @JsonProperty("newState")

+    public String getNewState() {

+        return newState;

+    }

+

+    /**

+     * new state of the entity

+     * 

+     */

+    @JsonProperty("newState")

+    public void setNewState(String newState) {

+        this.newState = newState;

+    }

+

+    /**

+     * previous state of the entity

+     * 

+     */

+    @JsonProperty("oldState")

+    public String getOldState() {

+        return oldState;

+    }

+

+    /**

+     * previous state of the entity

+     * 

+     */

+    @JsonProperty("oldState")

+    public void setOldState(String oldState) {

+        this.oldState = oldState;

+    }

+

+    /**

+     * version of the notificationFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("notificationFieldsVersion")

+    public NotificationFields.NotificationFieldsVersion getNotificationFieldsVersion() {

+        return notificationFieldsVersion;

+    }

+

+    /**

+     * version of the notificationFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("notificationFieldsVersion")

+    public void setNotificationFieldsVersion(NotificationFields.NotificationFieldsVersion notificationFieldsVersion) {

+        this.notificationFieldsVersion = notificationFieldsVersion;

+    }

+

+    /**

+     * card or port name of the entity that changed state

+     * 

+     */

+    @JsonProperty("stateInterface")

+    public String getStateInterface() {

+        return stateInterface;

+    }

+

+    /**

+     * card or port name of the entity that changed state

+     * 

+     */

+    @JsonProperty("stateInterface")

+    public void setStateInterface(String stateInterface) {

+        this.stateInterface = stateInterface;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalFields).append(arrayOfNamedHashMap).append(changeContact).append(changeIdentifier).append(changeType).append(newState).append(oldState).append(notificationFieldsVersion).append(stateInterface).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof NotificationFields) == false) {

+            return false;

+        }

+        NotificationFields rhs = ((NotificationFields) other);

+        return new EqualsBuilder().append(additionalFields, rhs.additionalFields).append(arrayOfNamedHashMap, rhs.arrayOfNamedHashMap).append(changeContact, rhs.changeContact).append(changeIdentifier, rhs.changeIdentifier).append(changeType, rhs.changeType).append(newState, rhs.newState).append(oldState, rhs.oldState).append(notificationFieldsVersion, rhs.notificationFieldsVersion).append(stateInterface, rhs.stateInterface).isEquals();

+    }

+

+    public enum NotificationFieldsVersion {

+

+        _2_0("2.0");

+        private final String value;

+        private final static Map<String, NotificationFields.NotificationFieldsVersion> CONSTANTS = new HashMap<String, NotificationFields.NotificationFieldsVersion>();

+

+        static {

+            for (NotificationFields.NotificationFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private NotificationFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static NotificationFields.NotificationFieldsVersion fromValue(String value) {

+            NotificationFields.NotificationFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ObjectInstance.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ObjectInstance.java
new file mode 100644
index 0000000..6999537
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ObjectInstance.java
@@ -0,0 +1,169 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.List;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * meta-information about an instance of a jsonObject along with the actual object instance

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "jsonObject",

+    "objectInstance",

+    "objectInstanceEpochMicrosec",

+    "objectKeys"

+})

+public class ObjectInstance {

+

+    /**

+     * json object schema, name and other meta-information along with one or more object instances

+     * 

+     */

+    @JsonProperty("jsonObject")

+    @JsonPropertyDescription("json object schema, name and other meta-information along with one or more object instances")

+    private AdditionalObject jsonObject;

+    /**

+     * an instance conforming to the jsonObject objectSchema

+     * 

+     */

+    @JsonProperty("objectInstance")

+    @JsonPropertyDescription("an instance conforming to the jsonObject objectSchema")

+    private ObjectInstance objectInstance;

+    /**

+     * the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds

+     * 

+     */

+    @JsonProperty("objectInstanceEpochMicrosec")

+    @JsonPropertyDescription("the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds")

+    private Double objectInstanceEpochMicrosec;

+    /**

+     * an ordered set of keys that identifies this particular instance of jsonObject

+     * 

+     */

+    @JsonProperty("objectKeys")

+    @JsonPropertyDescription("an ordered set of keys that identifies this particular instance of jsonObject")

+    private List<ObjectKey> objectKeys = new ArrayList<ObjectKey>();

+

+    /**

+     * json object schema, name and other meta-information along with one or more object instances

+     * 

+     */

+    @JsonProperty("jsonObject")

+    public AdditionalObject getJsonObject() {

+        return jsonObject;

+    }

+

+    /**

+     * json object schema, name and other meta-information along with one or more object instances

+     * 

+     */

+    @JsonProperty("jsonObject")

+    public void setJsonObject(AdditionalObject jsonObject) {

+        this.jsonObject = jsonObject;

+    }

+

+    /**

+     * an instance conforming to the jsonObject objectSchema

+     * 

+     */

+    @JsonProperty("objectInstance")

+    public ObjectInstance getObjectInstance() {

+        return objectInstance;

+    }

+

+    /**

+     * an instance conforming to the jsonObject objectSchema

+     * 

+     */

+    @JsonProperty("objectInstance")

+    public void setObjectInstance(ObjectInstance objectInstance) {

+        this.objectInstance = objectInstance;

+    }

+

+    /**

+     * the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds

+     * 

+     */

+    @JsonProperty("objectInstanceEpochMicrosec")

+    public Double getObjectInstanceEpochMicrosec() {

+        return objectInstanceEpochMicrosec;

+    }

+

+    /**

+     * the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds

+     * 

+     */

+    @JsonProperty("objectInstanceEpochMicrosec")

+    public void setObjectInstanceEpochMicrosec(Double objectInstanceEpochMicrosec) {

+        this.objectInstanceEpochMicrosec = objectInstanceEpochMicrosec;

+    }

+

+    /**

+     * an ordered set of keys that identifies this particular instance of jsonObject

+     * 

+     */

+    @JsonProperty("objectKeys")

+    public List<ObjectKey> getObjectKeys() {

+        return objectKeys;

+    }

+

+    /**

+     * an ordered set of keys that identifies this particular instance of jsonObject

+     * 

+     */

+    @JsonProperty("objectKeys")

+    public void setObjectKeys(List<ObjectKey> objectKeys) {

+        this.objectKeys = objectKeys;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(jsonObject).append(objectInstance).append(objectInstanceEpochMicrosec).append(objectKeys).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof ObjectInstance) == false) {

+            return false;

+        }

+        ObjectInstance rhs = ((ObjectInstance) other);

+        return new EqualsBuilder().append(jsonObject, rhs.jsonObject).append(objectInstance, rhs.objectInstance).append(objectInstanceEpochMicrosec, rhs.objectInstanceEpochMicrosec).append(objectKeys, rhs.objectKeys).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ObjectKey.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ObjectKey.java
index bc2ed40..e641dc5 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ObjectKey.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ObjectKey.java
@@ -1,113 +1,144 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "keyName",
-    "keyOrder",
-    "keyValue"
-})
-public class ObjectKey {
-
-    @JsonProperty("keyName")
-    private String keyName;
-    @JsonProperty("keyOrder")
-    private Long keyOrder;
-    @JsonProperty("keyValue")
-    private String keyValue;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("keyName")
-    public String getKeyName() {
-        return keyName;
-    }
-
-    @JsonProperty("keyName")
-    public void setKeyName(String keyName) {
-        this.keyName = keyName;
-    }
-
-    @JsonProperty("keyOrder")
-    public Long getKeyOrder() {
-        return keyOrder;
-    }
-
-    @JsonProperty("keyOrder")
-    public void setKeyOrder(Long keyOrder) {
-        this.keyOrder = keyOrder;
-    }
-
-    @JsonProperty("keyValue")
-    public String getKeyValue() {
-        return keyValue;
-    }
-
-    @JsonProperty("keyValue")
-    public void setKeyValue(String keyValue) {
-        this.keyValue = keyValue;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("keyName", keyName).append("keyOrder", keyOrder).append("keyValue", keyValue).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(keyName).append(additionalProperties).append(keyOrder).append(keyValue).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof ObjectKey) == false) {
-            return false;
-        }
-        ObjectKey rhs = ((ObjectKey) other);
-        return new EqualsBuilder().append(keyName, rhs.keyName).append(additionalProperties, rhs.additionalProperties).append(keyOrder, rhs.keyOrder).append(keyValue, rhs.keyValue).isEquals();
-    }
-
-}
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * tuple which provides the name of a key along with its value and relative order

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "keyName",

+    "keyOrder",

+    "keyValue"

+})

+public class ObjectKey {

+

+    /**

+     * name of the key

+     * (Required)

+     * 

+     */

+    @JsonProperty("keyName")

+    @JsonPropertyDescription("name of the key")

+    private String keyName;

+    /**

+     * relative sequence or order of the key with respect to other keys

+     * 

+     */

+    @JsonProperty("keyOrder")

+    @JsonPropertyDescription("relative sequence or order of the key with respect to other keys")

+    private Integer keyOrder;

+    /**

+     * value of the key

+     * 

+     */

+    @JsonProperty("keyValue")

+    @JsonPropertyDescription("value of the key")

+    private String keyValue;

+

+    /**

+     * name of the key

+     * (Required)

+     * 

+     */

+    @JsonProperty("keyName")

+    public String getKeyName() {

+        return keyName;

+    }

+

+    /**

+     * name of the key

+     * (Required)

+     * 

+     */

+    @JsonProperty("keyName")

+    public void setKeyName(String keyName) {

+        this.keyName = keyName;

+    }

+

+    /**

+     * relative sequence or order of the key with respect to other keys

+     * 

+     */

+    @JsonProperty("keyOrder")

+    public Integer getKeyOrder() {

+        return keyOrder;

+    }

+

+    /**

+     * relative sequence or order of the key with respect to other keys

+     * 

+     */

+    @JsonProperty("keyOrder")

+    public void setKeyOrder(Integer keyOrder) {

+        this.keyOrder = keyOrder;

+    }

+

+    /**

+     * value of the key

+     * 

+     */

+    @JsonProperty("keyValue")

+    public String getKeyValue() {

+        return keyValue;

+    }

+

+    /**

+     * value of the key

+     * 

+     */

+    @JsonProperty("keyValue")

+    public void setKeyValue(String keyValue) {

+        this.keyValue = keyValue;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(keyName).append(keyOrder).append(keyValue).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof ObjectKey) == false) {

+            return false;

+        }

+        ObjectKey rhs = ((ObjectKey) other);

+        return new EqualsBuilder().append(keyName, rhs.keyName).append(keyOrder, rhs.keyOrder).append(keyValue, rhs.keyValue).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/OtherFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/OtherFields.java
new file mode 100644
index 0000000..b38707a
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/OtherFields.java
@@ -0,0 +1,214 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "arrayOfNamedHashMap",

+    "hashMap",

+    "jsonObjects",

+    "otherFieldsVersion"

+})

+public class OtherFields {

+

+    /**

+     * array of named hashMaps

+     * 

+     */

+    @JsonProperty("arrayOfNamedHashMap")

+    @JsonPropertyDescription("array of named hashMaps")

+    private List<AdditionalMeasurement> arrayOfNamedHashMap = new ArrayList<AdditionalMeasurement>();

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("hashMap")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation hashMap;

+    /**

+     * array of json objects described by name, schema and other meta-information

+     * 

+     */

+    @JsonProperty("jsonObjects")

+    @JsonPropertyDescription("array of json objects described by name, schema and other meta-information")

+    private List<AdditionalObject> jsonObjects = new ArrayList<AdditionalObject>();

+    /**

+     * version of the otherFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("otherFieldsVersion")

+    @JsonPropertyDescription("version of the otherFields block")

+    private OtherFields.OtherFieldsVersion otherFieldsVersion;

+

+    /**

+     * array of named hashMaps

+     * 

+     */

+    @JsonProperty("arrayOfNamedHashMap")

+    public List<AdditionalMeasurement> getArrayOfNamedHashMap() {

+        return arrayOfNamedHashMap;

+    }

+

+    /**

+     * array of named hashMaps

+     * 

+     */

+    @JsonProperty("arrayOfNamedHashMap")

+    public void setArrayOfNamedHashMap(List<AdditionalMeasurement> arrayOfNamedHashMap) {

+        this.arrayOfNamedHashMap = arrayOfNamedHashMap;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("hashMap")

+    public AlarmAdditionalInformation getHashMap() {

+        return hashMap;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("hashMap")

+    public void setHashMap(AlarmAdditionalInformation hashMap) {

+        this.hashMap = hashMap;

+    }

+

+    /**

+     * array of json objects described by name, schema and other meta-information

+     * 

+     */

+    @JsonProperty("jsonObjects")

+    public List<AdditionalObject> getJsonObjects() {

+        return jsonObjects;

+    }

+

+    /**

+     * array of json objects described by name, schema and other meta-information

+     * 

+     */

+    @JsonProperty("jsonObjects")

+    public void setJsonObjects(List<AdditionalObject> jsonObjects) {

+        this.jsonObjects = jsonObjects;

+    }

+

+    /**

+     * version of the otherFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("otherFieldsVersion")

+    public OtherFields.OtherFieldsVersion getOtherFieldsVersion() {

+        return otherFieldsVersion;

+    }

+

+    /**

+     * version of the otherFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("otherFieldsVersion")

+    public void setOtherFieldsVersion(OtherFields.OtherFieldsVersion otherFieldsVersion) {

+        this.otherFieldsVersion = otherFieldsVersion;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(arrayOfNamedHashMap).append(hashMap).append(jsonObjects).append(otherFieldsVersion).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof OtherFields) == false) {

+            return false;

+        }

+        OtherFields rhs = ((OtherFields) other);

+        return new EqualsBuilder().append(arrayOfNamedHashMap, rhs.arrayOfNamedHashMap).append(hashMap, rhs.hashMap).append(jsonObjects, rhs.jsonObjects).append(otherFieldsVersion, rhs.otherFieldsVersion).isEquals();

+    }

+

+    public enum OtherFieldsVersion {

+

+        _3_0("3.0");

+        private final String value;

+        private final static Map<String, OtherFields.OtherFieldsVersion> CONSTANTS = new HashMap<String, OtherFields.OtherFieldsVersion>();

+

+        static {

+            for (OtherFields.OtherFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private OtherFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static OtherFields.OtherFieldsVersion fromValue(String value) {

+            OtherFields.OtherFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/PnfRegistrationFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/PnfRegistrationFields.java
new file mode 100644
index 0000000..3fe8b00
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/PnfRegistrationFields.java
@@ -0,0 +1,446 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * hardware device registration fields

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalFields",

+    "lastServiceDate",

+    "macAddress",

+    "manufactureDate",

+    "modelNumber",

+    "oamV4IpAddress",

+    "oamV6IpAddress",

+    "pnfRegistrationFieldsVersion",

+    "serialNumber",

+    "softwareVersion",

+    "unitFamily",

+    "unitType",

+    "vendorName"

+})

+public class PnfRegistrationFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalFields;

+    /**

+     * TS 32.692 dateOfLastService = date of last service; e.g. 15022017

+     * 

+     */

+    @JsonProperty("lastServiceDate")

+    @JsonPropertyDescription("TS 32.692 dateOfLastService = date of last service; e.g. 15022017")

+    private String lastServiceDate;

+    /**

+     * MAC address of OAM interface of the unit

+     * 

+     */

+    @JsonProperty("macAddress")

+    @JsonPropertyDescription("MAC address of OAM interface of the unit")

+    private String macAddress;

+    /**

+     * TS 32.692 dateOfManufacture = manufacture date of the unit; 24032016

+     * 

+     */

+    @JsonProperty("manufactureDate")

+    @JsonPropertyDescription("TS 32.692 dateOfManufacture = manufacture date of the unit; 24032016")

+    private String manufactureDate;

+    /**

+     * TS 32.692 versionNumber = version of the unit from vendor; e.g. AJ02.  Maps to AAI equip-model

+     * 

+     */

+    @JsonProperty("modelNumber")

+    @JsonPropertyDescription("TS 32.692 versionNumber = version of the unit from vendor; e.g. AJ02.  Maps to AAI equip-model")

+    private String modelNumber;

+    /**

+     * IPv4 m-plane IP address to be used by the manager to contact the PNF

+     * 

+     */

+    @JsonProperty("oamV4IpAddress")

+    @JsonPropertyDescription("IPv4 m-plane IP address to be used by the manager to contact the PNF")

+    private String oamV4IpAddress;

+    /**

+     * IPv6 m-plane IP address to be used by the manager to contact the PNF

+     * 

+     */

+    @JsonProperty("oamV6IpAddress")

+    @JsonPropertyDescription("IPv6 m-plane IP address to be used by the manager to contact the PNF")

+    private String oamV6IpAddress;

+    /**

+     * version of the pnfRegistrationFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("pnfRegistrationFieldsVersion")

+    @JsonPropertyDescription("version of the pnfRegistrationFields block")

+    private PnfRegistrationFields.PnfRegistrationFieldsVersion pnfRegistrationFieldsVersion;

+    /**

+     * TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3

+     * 

+     */

+    @JsonProperty("serialNumber")

+    @JsonPropertyDescription("TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3")

+    private String serialNumber;

+    /**

+     * TS 32.692 swName = active SW running on the unit; e.g. 5gDUv18.05.201

+     * 

+     */

+    @JsonProperty("softwareVersion")

+    @JsonPropertyDescription("TS 32.692 swName = active SW running on the unit; e.g. 5gDUv18.05.201")

+    private String softwareVersion;

+    /**

+     * TS 32.692 vendorUnitFamilyType = general type of HW unit; e.g. BBU

+     * 

+     */

+    @JsonProperty("unitFamily")

+    @JsonPropertyDescription("TS 32.692 vendorUnitFamilyType = general type of HW unit; e.g. BBU")

+    private String unitFamily;

+    /**

+     * TS 32.692 vendorUnitTypeNumber = vendor name for the unit; e.g. Airscale

+     * 

+     */

+    @JsonProperty("unitType")

+    @JsonPropertyDescription("TS 32.692 vendorUnitTypeNumber = vendor name for the unit; e.g. Airscale")

+    private String unitType;

+    /**

+     * TS 32.692 vendorName = name of manufacturer; e.g. Nokia. Maps to AAI equip-vendor

+     * 

+     */

+    @JsonProperty("vendorName")

+    @JsonPropertyDescription("TS 32.692 vendorName = name of manufacturer; e.g. Nokia. Maps to AAI equip-vendor")

+    private String vendorName;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public AlarmAdditionalInformation getAdditionalFields() {

+        return additionalFields;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public void setAdditionalFields(AlarmAdditionalInformation additionalFields) {

+        this.additionalFields = additionalFields;

+    }

+

+    /**

+     * TS 32.692 dateOfLastService = date of last service; e.g. 15022017

+     * 

+     */

+    @JsonProperty("lastServiceDate")

+    public String getLastServiceDate() {

+        return lastServiceDate;

+    }

+

+    /**

+     * TS 32.692 dateOfLastService = date of last service; e.g. 15022017

+     * 

+     */

+    @JsonProperty("lastServiceDate")

+    public void setLastServiceDate(String lastServiceDate) {

+        this.lastServiceDate = lastServiceDate;

+    }

+

+    /**

+     * MAC address of OAM interface of the unit

+     * 

+     */

+    @JsonProperty("macAddress")

+    public String getMacAddress() {

+        return macAddress;

+    }

+

+    /**

+     * MAC address of OAM interface of the unit

+     * 

+     */

+    @JsonProperty("macAddress")

+    public void setMacAddress(String macAddress) {

+        this.macAddress = macAddress;

+    }

+

+    /**

+     * TS 32.692 dateOfManufacture = manufacture date of the unit; 24032016

+     * 

+     */

+    @JsonProperty("manufactureDate")

+    public String getManufactureDate() {

+        return manufactureDate;

+    }

+

+    /**

+     * TS 32.692 dateOfManufacture = manufacture date of the unit; 24032016

+     * 

+     */

+    @JsonProperty("manufactureDate")

+    public void setManufactureDate(String manufactureDate) {

+        this.manufactureDate = manufactureDate;

+    }

+

+    /**

+     * TS 32.692 versionNumber = version of the unit from vendor; e.g. AJ02.  Maps to AAI equip-model

+     * 

+     */

+    @JsonProperty("modelNumber")

+    public String getModelNumber() {

+        return modelNumber;

+    }

+

+    /**

+     * TS 32.692 versionNumber = version of the unit from vendor; e.g. AJ02.  Maps to AAI equip-model

+     * 

+     */

+    @JsonProperty("modelNumber")

+    public void setModelNumber(String modelNumber) {

+        this.modelNumber = modelNumber;

+    }

+

+    /**

+     * IPv4 m-plane IP address to be used by the manager to contact the PNF

+     * 

+     */

+    @JsonProperty("oamV4IpAddress")

+    public String getOamV4IpAddress() {

+        return oamV4IpAddress;

+    }

+

+    /**

+     * IPv4 m-plane IP address to be used by the manager to contact the PNF

+     * 

+     */

+    @JsonProperty("oamV4IpAddress")

+    public void setOamV4IpAddress(String oamV4IpAddress) {

+        this.oamV4IpAddress = oamV4IpAddress;

+    }

+

+    /**

+     * IPv6 m-plane IP address to be used by the manager to contact the PNF

+     * 

+     */

+    @JsonProperty("oamV6IpAddress")

+    public String getOamV6IpAddress() {

+        return oamV6IpAddress;

+    }

+

+    /**

+     * IPv6 m-plane IP address to be used by the manager to contact the PNF

+     * 

+     */

+    @JsonProperty("oamV6IpAddress")

+    public void setOamV6IpAddress(String oamV6IpAddress) {

+        this.oamV6IpAddress = oamV6IpAddress;

+    }

+

+    /**

+     * version of the pnfRegistrationFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("pnfRegistrationFieldsVersion")

+    public PnfRegistrationFields.PnfRegistrationFieldsVersion getPnfRegistrationFieldsVersion() {

+        return pnfRegistrationFieldsVersion;

+    }

+

+    /**

+     * version of the pnfRegistrationFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("pnfRegistrationFieldsVersion")

+    public void setPnfRegistrationFieldsVersion(PnfRegistrationFields.PnfRegistrationFieldsVersion pnfRegistrationFieldsVersion) {

+        this.pnfRegistrationFieldsVersion = pnfRegistrationFieldsVersion;

+    }

+

+    /**

+     * TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3

+     * 

+     */

+    @JsonProperty("serialNumber")

+    public String getSerialNumber() {

+        return serialNumber;

+    }

+

+    /**

+     * TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3

+     * 

+     */

+    @JsonProperty("serialNumber")

+    public void setSerialNumber(String serialNumber) {

+        this.serialNumber = serialNumber;

+    }

+

+    /**

+     * TS 32.692 swName = active SW running on the unit; e.g. 5gDUv18.05.201

+     * 

+     */

+    @JsonProperty("softwareVersion")

+    public String getSoftwareVersion() {

+        return softwareVersion;

+    }

+

+    /**

+     * TS 32.692 swName = active SW running on the unit; e.g. 5gDUv18.05.201

+     * 

+     */

+    @JsonProperty("softwareVersion")

+    public void setSoftwareVersion(String softwareVersion) {

+        this.softwareVersion = softwareVersion;

+    }

+

+    /**

+     * TS 32.692 vendorUnitFamilyType = general type of HW unit; e.g. BBU

+     * 

+     */

+    @JsonProperty("unitFamily")

+    public String getUnitFamily() {

+        return unitFamily;

+    }

+

+    /**

+     * TS 32.692 vendorUnitFamilyType = general type of HW unit; e.g. BBU

+     * 

+     */

+    @JsonProperty("unitFamily")

+    public void setUnitFamily(String unitFamily) {

+        this.unitFamily = unitFamily;

+    }

+

+    /**

+     * TS 32.692 vendorUnitTypeNumber = vendor name for the unit; e.g. Airscale

+     * 

+     */

+    @JsonProperty("unitType")

+    public String getUnitType() {

+        return unitType;

+    }

+

+    /**

+     * TS 32.692 vendorUnitTypeNumber = vendor name for the unit; e.g. Airscale

+     * 

+     */

+    @JsonProperty("unitType")

+    public void setUnitType(String unitType) {

+        this.unitType = unitType;

+    }

+

+    /**

+     * TS 32.692 vendorName = name of manufacturer; e.g. Nokia. Maps to AAI equip-vendor

+     * 

+     */

+    @JsonProperty("vendorName")

+    public String getVendorName() {

+        return vendorName;

+    }

+

+    /**

+     * TS 32.692 vendorName = name of manufacturer; e.g. Nokia. Maps to AAI equip-vendor

+     * 

+     */

+    @JsonProperty("vendorName")

+    public void setVendorName(String vendorName) {

+        this.vendorName = vendorName;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalFields).append(lastServiceDate).append(macAddress).append(manufactureDate).append(modelNumber).append(oamV4IpAddress).append(oamV6IpAddress).append(pnfRegistrationFieldsVersion).append(serialNumber).append(softwareVersion).append(unitFamily).append(unitType).append(vendorName).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof PnfRegistrationFields) == false) {

+            return false;

+        }

+        PnfRegistrationFields rhs = ((PnfRegistrationFields) other);

+        return new EqualsBuilder().append(additionalFields, rhs.additionalFields).append(lastServiceDate, rhs.lastServiceDate).append(macAddress, rhs.macAddress).append(manufactureDate, rhs.manufactureDate).append(modelNumber, rhs.modelNumber).append(oamV4IpAddress, rhs.oamV4IpAddress).append(oamV6IpAddress, rhs.oamV6IpAddress).append(pnfRegistrationFieldsVersion, rhs.pnfRegistrationFieldsVersion).append(serialNumber, rhs.serialNumber).append(softwareVersion, rhs.softwareVersion).append(unitFamily, rhs.unitFamily).append(unitType, rhs.unitType).append(vendorName, rhs.vendorName).isEquals();

+    }

+

+    public enum PnfRegistrationFieldsVersion {

+

+        _2_0("2.0");

+        private final String value;

+        private final static Map<String, PnfRegistrationFields.PnfRegistrationFieldsVersion> CONSTANTS = new HashMap<String, PnfRegistrationFields.PnfRegistrationFieldsVersion>();

+

+        static {

+            for (PnfRegistrationFields.PnfRegistrationFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private PnfRegistrationFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static PnfRegistrationFields.PnfRegistrationFieldsVersion fromValue(String value) {

+            PnfRegistrationFields.PnfRegistrationFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessStatsArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessStatsArray.java
new file mode 100644
index 0000000..5e7fe19
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessStatsArray.java
@@ -0,0 +1,274 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * metrics on system processes

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "forkRate",

+    "processIdentifier",

+    "psStateBlocked",

+    "psStatePaging",

+    "psStateRunning",

+    "psStateSleeping",

+    "psStateStopped",

+    "psStateZombie"

+})

+public class ProcessStatsArray {

+

+    /**

+     * the number of threads created since the last reboot

+     * 

+     */

+    @JsonProperty("forkRate")

+    @JsonPropertyDescription("the number of threads created since the last reboot")

+    private Double forkRate;

+    /**

+     * processIdentifier

+     * (Required)

+     * 

+     */

+    @JsonProperty("processIdentifier")

+    @JsonPropertyDescription("processIdentifier")

+    private String processIdentifier;

+    /**

+     * the number of processes in a blocked state

+     * 

+     */

+    @JsonProperty("psStateBlocked")

+    @JsonPropertyDescription("the number of processes in a blocked state")

+    private Double psStateBlocked;

+    /**

+     * the number of processes in a paging state

+     * 

+     */

+    @JsonProperty("psStatePaging")

+    @JsonPropertyDescription("the number of processes in a paging state")

+    private Double psStatePaging;

+    /**

+     * the number of processes in a running state

+     * 

+     */

+    @JsonProperty("psStateRunning")

+    @JsonPropertyDescription("the number of processes in a running state")

+    private Double psStateRunning;

+    /**

+     * the number of processes in a sleeping state

+     * 

+     */

+    @JsonProperty("psStateSleeping")

+    @JsonPropertyDescription("the number of processes in a sleeping state")

+    private Double psStateSleeping;

+    /**

+     * the number of processes in a stopped state

+     * 

+     */

+    @JsonProperty("psStateStopped")

+    @JsonPropertyDescription("the number of processes in a stopped state")

+    private Double psStateStopped;

+    /**

+     * the number of processes in a zombie state

+     * 

+     */

+    @JsonProperty("psStateZombie")

+    @JsonPropertyDescription("the number of processes in a zombie state")

+    private Double psStateZombie;

+

+    /**

+     * the number of threads created since the last reboot

+     * 

+     */

+    @JsonProperty("forkRate")

+    public Double getForkRate() {

+        return forkRate;

+    }

+

+    /**

+     * the number of threads created since the last reboot

+     * 

+     */

+    @JsonProperty("forkRate")

+    public void setForkRate(Double forkRate) {

+        this.forkRate = forkRate;

+    }

+

+    /**

+     * processIdentifier

+     * (Required)

+     * 

+     */

+    @JsonProperty("processIdentifier")

+    public String getProcessIdentifier() {

+        return processIdentifier;

+    }

+

+    /**

+     * processIdentifier

+     * (Required)

+     * 

+     */

+    @JsonProperty("processIdentifier")

+    public void setProcessIdentifier(String processIdentifier) {

+        this.processIdentifier = processIdentifier;

+    }

+

+    /**

+     * the number of processes in a blocked state

+     * 

+     */

+    @JsonProperty("psStateBlocked")

+    public Double getPsStateBlocked() {

+        return psStateBlocked;

+    }

+

+    /**

+     * the number of processes in a blocked state

+     * 

+     */

+    @JsonProperty("psStateBlocked")

+    public void setPsStateBlocked(Double psStateBlocked) {

+        this.psStateBlocked = psStateBlocked;

+    }

+

+    /**

+     * the number of processes in a paging state

+     * 

+     */

+    @JsonProperty("psStatePaging")

+    public Double getPsStatePaging() {

+        return psStatePaging;

+    }

+

+    /**

+     * the number of processes in a paging state

+     * 

+     */

+    @JsonProperty("psStatePaging")

+    public void setPsStatePaging(Double psStatePaging) {

+        this.psStatePaging = psStatePaging;

+    }

+

+    /**

+     * the number of processes in a running state

+     * 

+     */

+    @JsonProperty("psStateRunning")

+    public Double getPsStateRunning() {

+        return psStateRunning;

+    }

+

+    /**

+     * the number of processes in a running state

+     * 

+     */

+    @JsonProperty("psStateRunning")

+    public void setPsStateRunning(Double psStateRunning) {

+        this.psStateRunning = psStateRunning;

+    }

+

+    /**

+     * the number of processes in a sleeping state

+     * 

+     */

+    @JsonProperty("psStateSleeping")

+    public Double getPsStateSleeping() {

+        return psStateSleeping;

+    }

+

+    /**

+     * the number of processes in a sleeping state

+     * 

+     */

+    @JsonProperty("psStateSleeping")

+    public void setPsStateSleeping(Double psStateSleeping) {

+        this.psStateSleeping = psStateSleeping;

+    }

+

+    /**

+     * the number of processes in a stopped state

+     * 

+     */

+    @JsonProperty("psStateStopped")

+    public Double getPsStateStopped() {

+        return psStateStopped;

+    }

+

+    /**

+     * the number of processes in a stopped state

+     * 

+     */

+    @JsonProperty("psStateStopped")

+    public void setPsStateStopped(Double psStateStopped) {

+        this.psStateStopped = psStateStopped;

+    }

+

+    /**

+     * the number of processes in a zombie state

+     * 

+     */

+    @JsonProperty("psStateZombie")

+    public Double getPsStateZombie() {

+        return psStateZombie;

+    }

+

+    /**

+     * the number of processes in a zombie state

+     * 

+     */

+    @JsonProperty("psStateZombie")

+    public void setPsStateZombie(Double psStateZombie) {

+        this.psStateZombie = psStateZombie;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(forkRate).append(processIdentifier).append(psStateBlocked).append(psStatePaging).append(psStateRunning).append(psStateSleeping).append(psStateStopped).append(psStateZombie).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof ProcessStatsArray) == false) {

+            return false;

+        }

+        ProcessStatsArray rhs = ((ProcessStatsArray) other);

+        return new EqualsBuilder().append(forkRate, rhs.forkRate).append(processIdentifier, rhs.processIdentifier).append(psStateBlocked, rhs.psStateBlocked).append(psStatePaging, rhs.psStatePaging).append(psStateRunning, rhs.psStateRunning).append(psStateSleeping, rhs.psStateSleeping).append(psStateStopped, rhs.psStateStopped).append(psStateZombie, rhs.psStateZombie).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessorDimmAggregateThermalMarginArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessorDimmAggregateThermalMarginArray.java
new file mode 100644
index 0000000..00d8c1b
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessorDimmAggregateThermalMarginArray.java
@@ -0,0 +1,121 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * intelligent platform management interface (ipmi) processor dual inline memory module aggregate thermal margin metrics

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "processorDimmAggregateThermalMarginIdentifier",

+    "thermalMargin"

+})

+public class ProcessorDimmAggregateThermalMarginArray {

+

+    /**

+     * identifier for the aggregate thermal margin metrics from the processor dual inline memory module

+     * (Required)

+     * 

+     */

+    @JsonProperty("processorDimmAggregateThermalMarginIdentifier")

+    @JsonPropertyDescription("identifier for the aggregate thermal margin metrics from the processor dual inline memory module")

+    private String processorDimmAggregateThermalMarginIdentifier;

+    /**

+     * the difference between the DIMM's current temperature, in celsius, and the DIMM's throttling thermal trip point

+     * (Required)

+     * 

+     */

+    @JsonProperty("thermalMargin")

+    @JsonPropertyDescription("the difference between the DIMM's current temperature, in celsius, and the DIMM's throttling thermal trip point")

+    private Double thermalMargin;

+

+    /**

+     * identifier for the aggregate thermal margin metrics from the processor dual inline memory module

+     * (Required)

+     * 

+     */

+    @JsonProperty("processorDimmAggregateThermalMarginIdentifier")

+    public String getProcessorDimmAggregateThermalMarginIdentifier() {

+        return processorDimmAggregateThermalMarginIdentifier;

+    }

+

+    /**

+     * identifier for the aggregate thermal margin metrics from the processor dual inline memory module

+     * (Required)

+     * 

+     */

+    @JsonProperty("processorDimmAggregateThermalMarginIdentifier")

+    public void setProcessorDimmAggregateThermalMarginIdentifier(String processorDimmAggregateThermalMarginIdentifier) {

+        this.processorDimmAggregateThermalMarginIdentifier = processorDimmAggregateThermalMarginIdentifier;

+    }

+

+    /**

+     * the difference between the DIMM's current temperature, in celsius, and the DIMM's throttling thermal trip point

+     * (Required)

+     * 

+     */

+    @JsonProperty("thermalMargin")

+    public Double getThermalMargin() {

+        return thermalMargin;

+    }

+

+    /**

+     * the difference between the DIMM's current temperature, in celsius, and the DIMM's throttling thermal trip point

+     * (Required)

+     * 

+     */

+    @JsonProperty("thermalMargin")

+    public void setThermalMargin(Double thermalMargin) {

+        this.thermalMargin = thermalMargin;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(processorDimmAggregateThermalMarginIdentifier).append(thermalMargin).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof ProcessorDimmAggregateThermalMarginArray) == false) {

+            return false;

+        }

+        ProcessorDimmAggregateThermalMarginArray rhs = ((ProcessorDimmAggregateThermalMarginArray) other);

+        return new EqualsBuilder().append(processorDimmAggregateThermalMarginIdentifier, rhs.processorDimmAggregateThermalMarginIdentifier).append(thermalMargin, rhs.thermalMargin).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SipSignalingFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SipSignalingFields.java
new file mode 100644
index 0000000..34d4558
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SipSignalingFields.java
@@ -0,0 +1,386 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * sip signaling fields

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalInformation",

+    "compressedSip",

+    "correlator",

+    "localIpAddress",

+    "localPort",

+    "remoteIpAddress",

+    "remotePort",

+    "sipSignalingFieldsVersion",

+    "summarySip",

+    "vendorNfNameFields"

+})

+public class SipSignalingFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalInformation")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalInformation;

+    /**

+     * the full SIP request/response including headers and bodies

+     * 

+     */

+    @JsonProperty("compressedSip")

+    @JsonPropertyDescription("the full SIP request/response including headers and bodies")

+    private String compressedSip;

+    /**

+     * this is the same for all events on this call

+     * (Required)

+     * 

+     */

+    @JsonProperty("correlator")

+    @JsonPropertyDescription("this is the same for all events on this call")

+    private String correlator;

+    /**

+     * IP address on xNF

+     * (Required)

+     * 

+     */

+    @JsonProperty("localIpAddress")

+    @JsonPropertyDescription("IP address on xNF")

+    private String localIpAddress;

+    /**

+     * port on xNF

+     * (Required)

+     * 

+     */

+    @JsonProperty("localPort")

+    @JsonPropertyDescription("port on xNF")

+    private String localPort;

+    /**

+     * IP address of peer endpoint

+     * (Required)

+     * 

+     */

+    @JsonProperty("remoteIpAddress")

+    @JsonPropertyDescription("IP address of peer endpoint")

+    private String remoteIpAddress;

+    /**

+     * port of peer endpoint

+     * (Required)

+     * 

+     */

+    @JsonProperty("remotePort")

+    @JsonPropertyDescription("port of peer endpoint")

+    private String remotePort;

+    /**

+     * version of the sipSignalingFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("sipSignalingFieldsVersion")

+    @JsonPropertyDescription("version of the sipSignalingFields block")

+    private SipSignalingFields.SipSignalingFieldsVersion sipSignalingFieldsVersion;

+    /**

+     * the SIP Method or Response ('INVITE', '200 OK', 'BYE', etc)

+     * 

+     */

+    @JsonProperty("summarySip")

+    @JsonPropertyDescription("the SIP Method or Response ('INVITE', '200 OK', 'BYE', etc)")

+    private String summarySip;

+    /**

+     * provides vendor, nf and nfModule identifying information

+     * (Required)

+     * 

+     */

+    @JsonProperty("vendorNfNameFields")

+    @JsonPropertyDescription("provides vendor, nf and nfModule identifying information")

+    private VendorNfNameFields vendorNfNameFields;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalInformation")

+    public AlarmAdditionalInformation getAdditionalInformation() {

+        return additionalInformation;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalInformation")

+    public void setAdditionalInformation(AlarmAdditionalInformation additionalInformation) {

+        this.additionalInformation = additionalInformation;

+    }

+

+    /**

+     * the full SIP request/response including headers and bodies

+     * 

+     */

+    @JsonProperty("compressedSip")

+    public String getCompressedSip() {

+        return compressedSip;

+    }

+

+    /**

+     * the full SIP request/response including headers and bodies

+     * 

+     */

+    @JsonProperty("compressedSip")

+    public void setCompressedSip(String compressedSip) {

+        this.compressedSip = compressedSip;

+    }

+

+    /**

+     * this is the same for all events on this call

+     * (Required)

+     * 

+     */

+    @JsonProperty("correlator")

+    public String getCorrelator() {

+        return correlator;

+    }

+

+    /**

+     * this is the same for all events on this call

+     * (Required)

+     * 

+     */

+    @JsonProperty("correlator")

+    public void setCorrelator(String correlator) {

+        this.correlator = correlator;

+    }

+

+    /**

+     * IP address on xNF

+     * (Required)

+     * 

+     */

+    @JsonProperty("localIpAddress")

+    public String getLocalIpAddress() {

+        return localIpAddress;

+    }

+

+    /**

+     * IP address on xNF

+     * (Required)

+     * 

+     */

+    @JsonProperty("localIpAddress")

+    public void setLocalIpAddress(String localIpAddress) {

+        this.localIpAddress = localIpAddress;

+    }

+

+    /**

+     * port on xNF

+     * (Required)

+     * 

+     */

+    @JsonProperty("localPort")

+    public String getLocalPort() {

+        return localPort;

+    }

+

+    /**

+     * port on xNF

+     * (Required)

+     * 

+     */

+    @JsonProperty("localPort")

+    public void setLocalPort(String localPort) {

+        this.localPort = localPort;

+    }

+

+    /**

+     * IP address of peer endpoint

+     * (Required)

+     * 

+     */

+    @JsonProperty("remoteIpAddress")

+    public String getRemoteIpAddress() {

+        return remoteIpAddress;

+    }

+

+    /**

+     * IP address of peer endpoint

+     * (Required)

+     * 

+     */

+    @JsonProperty("remoteIpAddress")

+    public void setRemoteIpAddress(String remoteIpAddress) {

+        this.remoteIpAddress = remoteIpAddress;

+    }

+

+    /**

+     * port of peer endpoint

+     * (Required)

+     * 

+     */

+    @JsonProperty("remotePort")

+    public String getRemotePort() {

+        return remotePort;

+    }

+

+    /**

+     * port of peer endpoint

+     * (Required)

+     * 

+     */

+    @JsonProperty("remotePort")

+    public void setRemotePort(String remotePort) {

+        this.remotePort = remotePort;

+    }

+

+    /**

+     * version of the sipSignalingFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("sipSignalingFieldsVersion")

+    public SipSignalingFields.SipSignalingFieldsVersion getSipSignalingFieldsVersion() {

+        return sipSignalingFieldsVersion;

+    }

+

+    /**

+     * version of the sipSignalingFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("sipSignalingFieldsVersion")

+    public void setSipSignalingFieldsVersion(SipSignalingFields.SipSignalingFieldsVersion sipSignalingFieldsVersion) {

+        this.sipSignalingFieldsVersion = sipSignalingFieldsVersion;

+    }

+

+    /**

+     * the SIP Method or Response ('INVITE', '200 OK', 'BYE', etc)

+     * 

+     */

+    @JsonProperty("summarySip")

+    public String getSummarySip() {

+        return summarySip;

+    }

+

+    /**

+     * the SIP Method or Response ('INVITE', '200 OK', 'BYE', etc)

+     * 

+     */

+    @JsonProperty("summarySip")

+    public void setSummarySip(String summarySip) {

+        this.summarySip = summarySip;

+    }

+

+    /**

+     * provides vendor, nf and nfModule identifying information

+     * (Required)

+     * 

+     */

+    @JsonProperty("vendorNfNameFields")

+    public VendorNfNameFields getVendorNfNameFields() {

+        return vendorNfNameFields;

+    }

+

+    /**

+     * provides vendor, nf and nfModule identifying information

+     * (Required)

+     * 

+     */

+    @JsonProperty("vendorNfNameFields")

+    public void setVendorNfNameFields(VendorNfNameFields vendorNfNameFields) {

+        this.vendorNfNameFields = vendorNfNameFields;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalInformation).append(compressedSip).append(correlator).append(localIpAddress).append(localPort).append(remoteIpAddress).append(remotePort).append(sipSignalingFieldsVersion).append(summarySip).append(vendorNfNameFields).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof SipSignalingFields) == false) {

+            return false;

+        }

+        SipSignalingFields rhs = ((SipSignalingFields) other);

+        return new EqualsBuilder().append(additionalInformation, rhs.additionalInformation).append(compressedSip, rhs.compressedSip).append(correlator, rhs.correlator).append(localIpAddress, rhs.localIpAddress).append(localPort, rhs.localPort).append(remoteIpAddress, rhs.remoteIpAddress).append(remotePort, rhs.remotePort).append(sipSignalingFieldsVersion, rhs.sipSignalingFieldsVersion).append(summarySip, rhs.summarySip).append(vendorNfNameFields, rhs.vendorNfNameFields).isEquals();

+    }

+

+    public enum SipSignalingFieldsVersion {

+

+        _3_0("3.0");

+        private final String value;

+        private final static Map<String, SipSignalingFields.SipSignalingFieldsVersion> CONSTANTS = new HashMap<String, SipSignalingFields.SipSignalingFieldsVersion>();

+

+        static {

+            for (SipSignalingFields.SipSignalingFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private SipSignalingFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static SipSignalingFields.SipSignalingFieldsVersion fromValue(String value) {

+            SipSignalingFields.SipSignalingFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/StateChangeFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/StateChangeFields.java
new file mode 100644
index 0000000..cf9708f
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/StateChangeFields.java
@@ -0,0 +1,327 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * stateChange fields

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalFields",

+    "newState",

+    "oldState",

+    "stateChangeFieldsVersion",

+    "stateInterface"

+})

+public class StateChangeFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalFields;

+    /**

+     * new state of the entity

+     * (Required)

+     * 

+     */

+    @JsonProperty("newState")

+    @JsonPropertyDescription("new state of the entity")

+    private StateChangeFields.NewState newState;

+    /**

+     * previous state of the entity

+     * (Required)

+     * 

+     */

+    @JsonProperty("oldState")

+    @JsonPropertyDescription("previous state of the entity")

+    private StateChangeFields.OldState oldState;

+    /**

+     * version of the stateChangeFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("stateChangeFieldsVersion")

+    @JsonPropertyDescription("version of the stateChangeFields block")

+    private StateChangeFields.StateChangeFieldsVersion stateChangeFieldsVersion;

+    /**

+     * card or port name of the entity that changed state

+     * (Required)

+     * 

+     */

+    @JsonProperty("stateInterface")

+    @JsonPropertyDescription("card or port name of the entity that changed state")

+    private String stateInterface;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public AlarmAdditionalInformation getAdditionalFields() {

+        return additionalFields;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public void setAdditionalFields(AlarmAdditionalInformation additionalFields) {

+        this.additionalFields = additionalFields;

+    }

+

+    /**

+     * new state of the entity

+     * (Required)

+     * 

+     */

+    @JsonProperty("newState")

+    public StateChangeFields.NewState getNewState() {

+        return newState;

+    }

+

+    /**

+     * new state of the entity

+     * (Required)

+     * 

+     */

+    @JsonProperty("newState")

+    public void setNewState(StateChangeFields.NewState newState) {

+        this.newState = newState;

+    }

+

+    /**

+     * previous state of the entity

+     * (Required)

+     * 

+     */

+    @JsonProperty("oldState")

+    public StateChangeFields.OldState getOldState() {

+        return oldState;

+    }

+

+    /**

+     * previous state of the entity

+     * (Required)

+     * 

+     */

+    @JsonProperty("oldState")

+    public void setOldState(StateChangeFields.OldState oldState) {

+        this.oldState = oldState;

+    }

+

+    /**

+     * version of the stateChangeFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("stateChangeFieldsVersion")

+    public StateChangeFields.StateChangeFieldsVersion getStateChangeFieldsVersion() {

+        return stateChangeFieldsVersion;

+    }

+

+    /**

+     * version of the stateChangeFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("stateChangeFieldsVersion")

+    public void setStateChangeFieldsVersion(StateChangeFields.StateChangeFieldsVersion stateChangeFieldsVersion) {

+        this.stateChangeFieldsVersion = stateChangeFieldsVersion;

+    }

+

+    /**

+     * card or port name of the entity that changed state

+     * (Required)

+     * 

+     */

+    @JsonProperty("stateInterface")

+    public String getStateInterface() {

+        return stateInterface;

+    }

+

+    /**

+     * card or port name of the entity that changed state

+     * (Required)

+     * 

+     */

+    @JsonProperty("stateInterface")

+    public void setStateInterface(String stateInterface) {

+        this.stateInterface = stateInterface;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalFields).append(newState).append(oldState).append(stateChangeFieldsVersion).append(stateInterface).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof StateChangeFields) == false) {

+            return false;

+        }

+        StateChangeFields rhs = ((StateChangeFields) other);

+        return new EqualsBuilder().append(additionalFields, rhs.additionalFields).append(newState, rhs.newState).append(oldState, rhs.oldState).append(stateChangeFieldsVersion, rhs.stateChangeFieldsVersion).append(stateInterface, rhs.stateInterface).isEquals();

+    }

+

+    public enum NewState {

+

+        IN_SERVICE("inService"),

+        MAINTENANCE("maintenance"),

+        OUT_OF_SERVICE("outOfService");

+        private final String value;

+        private final static Map<String, StateChangeFields.NewState> CONSTANTS = new HashMap<String, StateChangeFields.NewState>();

+

+        static {

+            for (StateChangeFields.NewState c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private NewState(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static StateChangeFields.NewState fromValue(String value) {

+            StateChangeFields.NewState constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum OldState {

+

+        IN_SERVICE("inService"),

+        MAINTENANCE("maintenance"),

+        OUT_OF_SERVICE("outOfService");

+        private final String value;

+        private final static Map<String, StateChangeFields.OldState> CONSTANTS = new HashMap<String, StateChangeFields.OldState>();

+

+        static {

+            for (StateChangeFields.OldState c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private OldState(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static StateChangeFields.OldState fromValue(String value) {

+            StateChangeFields.OldState constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum StateChangeFieldsVersion {

+

+        _4_0("4.0");

+        private final String value;

+        private final static Map<String, StateChangeFields.StateChangeFieldsVersion> CONSTANTS = new HashMap<String, StateChangeFields.StateChangeFieldsVersion>();

+

+        static {

+            for (StateChangeFields.StateChangeFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private StateChangeFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static StateChangeFields.StateChangeFieldsVersion fromValue(String value) {

+            StateChangeFields.StateChangeFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SyslogFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SyslogFields.java
new file mode 100644
index 0000000..c8439e6
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SyslogFields.java
@@ -0,0 +1,578 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * sysLog fields

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalFields",

+    "eventSourceHost",

+    "eventSourceType",

+    "syslogFacility",

+    "syslogFieldsVersion",

+    "syslogMsg",

+    "syslogMsgHost",

+    "syslogPri",

+    "syslogProc",

+    "syslogProcId",

+    "syslogSData",

+    "syslogSdId",

+    "syslogSev",

+    "syslogTag",

+    "syslogTs",

+    "syslogVer"

+})

+public class SyslogFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalFields;

+    /**

+     * hostname of the device

+     * 

+     */

+    @JsonProperty("eventSourceHost")

+    @JsonPropertyDescription("hostname of the device")

+    private String eventSourceHost;

+    /**

+     * type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSourceType")

+    @JsonPropertyDescription("type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction")

+    private String eventSourceType;

+    /**

+     * numeric code from 0 to 23 for facility--see table in documentation

+     * 

+     */

+    @JsonProperty("syslogFacility")

+    @JsonPropertyDescription("numeric code from 0 to 23 for facility--see table in documentation")

+    private Integer syslogFacility;

+    /**

+     * version of the syslogFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("syslogFieldsVersion")

+    @JsonPropertyDescription("version of the syslogFields block")

+    private SyslogFields.SyslogFieldsVersion syslogFieldsVersion;

+    /**

+     * syslog message

+     * (Required)

+     * 

+     */

+    @JsonProperty("syslogMsg")

+    @JsonPropertyDescription("syslog message")

+    private String syslogMsg;

+    /**

+     * hostname parsed from non-VES syslog message

+     * 

+     */

+    @JsonProperty("syslogMsgHost")

+    @JsonPropertyDescription("hostname parsed from non-VES syslog message")

+    private String syslogMsgHost;

+    /**

+     *  0-192 combined severity and facility

+     * 

+     */

+    @JsonProperty("syslogPri")

+    @JsonPropertyDescription("0-192 combined severity and facility")

+    private Integer syslogPri;

+    /**

+     * identifies the application that originated the message

+     * 

+     */

+    @JsonProperty("syslogProc")

+    @JsonPropertyDescription("identifies the application that originated the message")

+    private String syslogProc;

+    /**

+     * a change in the value of this field indicates a discontinuity in syslog reporting

+     * 

+     */

+    @JsonProperty("syslogProcId")

+    @JsonPropertyDescription("a change in the value of this field indicates a discontinuity in syslog reporting")

+    private Double syslogProcId;

+    /**

+     * syslog structured data consisting of a structured data Id followed by a set of key value pairs

+     * 

+     */

+    @JsonProperty("syslogSData")

+    @JsonPropertyDescription("syslog structured data consisting of a structured data Id followed by a set of key value pairs")

+    private String syslogSData;

+    /**

+     *  0-32 char in format name@number for example ourSDID@32473

+     * 

+     */

+    @JsonProperty("syslogSdId")

+    @JsonPropertyDescription("0-32 char in format name@number for example ourSDID@32473")

+    private String syslogSdId;

+    /**

+     * numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8

+     * 

+     */

+    @JsonProperty("syslogSev")

+    @JsonPropertyDescription("numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8")

+    private SyslogFields.SyslogSev syslogSev;

+    /**

+     * msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided

+     * (Required)

+     * 

+     */

+    @JsonProperty("syslogTag")

+    @JsonPropertyDescription("msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided")

+    private String syslogTag;

+    /**

+     * timestamp parsed from non-VES syslog message

+     * 

+     */

+    @JsonProperty("syslogTs")

+    @JsonPropertyDescription("timestamp parsed from non-VES syslog message")

+    private String syslogTs;

+    /**

+     * IANA assigned version of the syslog protocol specification - typically 1

+     * 

+     */

+    @JsonProperty("syslogVer")

+    @JsonPropertyDescription("IANA assigned version of the syslog protocol specification - typically 1")

+    private Double syslogVer;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public AlarmAdditionalInformation getAdditionalFields() {

+        return additionalFields;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public void setAdditionalFields(AlarmAdditionalInformation additionalFields) {

+        this.additionalFields = additionalFields;

+    }

+

+    /**

+     * hostname of the device

+     * 

+     */

+    @JsonProperty("eventSourceHost")

+    public String getEventSourceHost() {

+        return eventSourceHost;

+    }

+

+    /**

+     * hostname of the device

+     * 

+     */

+    @JsonProperty("eventSourceHost")

+    public void setEventSourceHost(String eventSourceHost) {

+        this.eventSourceHost = eventSourceHost;

+    }

+

+    /**

+     * type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSourceType")

+    public String getEventSourceType() {

+        return eventSourceType;

+    }

+

+    /**

+     * type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSourceType")

+    public void setEventSourceType(String eventSourceType) {

+        this.eventSourceType = eventSourceType;

+    }

+

+    /**

+     * numeric code from 0 to 23 for facility--see table in documentation

+     * 

+     */

+    @JsonProperty("syslogFacility")

+    public Integer getSyslogFacility() {

+        return syslogFacility;

+    }

+

+    /**

+     * numeric code from 0 to 23 for facility--see table in documentation

+     * 

+     */

+    @JsonProperty("syslogFacility")

+    public void setSyslogFacility(Integer syslogFacility) {

+        this.syslogFacility = syslogFacility;

+    }

+

+    /**

+     * version of the syslogFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("syslogFieldsVersion")

+    public SyslogFields.SyslogFieldsVersion getSyslogFieldsVersion() {

+        return syslogFieldsVersion;

+    }

+

+    /**

+     * version of the syslogFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("syslogFieldsVersion")

+    public void setSyslogFieldsVersion(SyslogFields.SyslogFieldsVersion syslogFieldsVersion) {

+        this.syslogFieldsVersion = syslogFieldsVersion;

+    }

+

+    /**

+     * syslog message

+     * (Required)

+     * 

+     */

+    @JsonProperty("syslogMsg")

+    public String getSyslogMsg() {

+        return syslogMsg;

+    }

+

+    /**

+     * syslog message

+     * (Required)

+     * 

+     */

+    @JsonProperty("syslogMsg")

+    public void setSyslogMsg(String syslogMsg) {

+        this.syslogMsg = syslogMsg;

+    }

+

+    /**

+     * hostname parsed from non-VES syslog message

+     * 

+     */

+    @JsonProperty("syslogMsgHost")

+    public String getSyslogMsgHost() {

+        return syslogMsgHost;

+    }

+

+    /**

+     * hostname parsed from non-VES syslog message

+     * 

+     */

+    @JsonProperty("syslogMsgHost")

+    public void setSyslogMsgHost(String syslogMsgHost) {

+        this.syslogMsgHost = syslogMsgHost;

+    }

+

+    /**

+     *  0-192 combined severity and facility

+     * 

+     */

+    @JsonProperty("syslogPri")

+    public Integer getSyslogPri() {

+        return syslogPri;

+    }

+

+    /**

+     *  0-192 combined severity and facility

+     * 

+     */

+    @JsonProperty("syslogPri")

+    public void setSyslogPri(Integer syslogPri) {

+        this.syslogPri = syslogPri;

+    }

+

+    /**

+     * identifies the application that originated the message

+     * 

+     */

+    @JsonProperty("syslogProc")

+    public String getSyslogProc() {

+        return syslogProc;

+    }

+

+    /**

+     * identifies the application that originated the message

+     * 

+     */

+    @JsonProperty("syslogProc")

+    public void setSyslogProc(String syslogProc) {

+        this.syslogProc = syslogProc;

+    }

+

+    /**

+     * a change in the value of this field indicates a discontinuity in syslog reporting

+     * 

+     */

+    @JsonProperty("syslogProcId")

+    public Double getSyslogProcId() {

+        return syslogProcId;

+    }

+

+    /**

+     * a change in the value of this field indicates a discontinuity in syslog reporting

+     * 

+     */

+    @JsonProperty("syslogProcId")

+    public void setSyslogProcId(Double syslogProcId) {

+        this.syslogProcId = syslogProcId;

+    }

+

+    /**

+     * syslog structured data consisting of a structured data Id followed by a set of key value pairs

+     * 

+     */

+    @JsonProperty("syslogSData")

+    public String getSyslogSData() {

+        return syslogSData;

+    }

+

+    /**

+     * syslog structured data consisting of a structured data Id followed by a set of key value pairs

+     * 

+     */

+    @JsonProperty("syslogSData")

+    public void setSyslogSData(String syslogSData) {

+        this.syslogSData = syslogSData;

+    }

+

+    /**

+     *  0-32 char in format name@number for example ourSDID@32473

+     * 

+     */

+    @JsonProperty("syslogSdId")

+    public String getSyslogSdId() {

+        return syslogSdId;

+    }

+

+    /**

+     *  0-32 char in format name@number for example ourSDID@32473

+     * 

+     */

+    @JsonProperty("syslogSdId")

+    public void setSyslogSdId(String syslogSdId) {

+        this.syslogSdId = syslogSdId;

+    }

+

+    /**

+     * numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8

+     * 

+     */

+    @JsonProperty("syslogSev")

+    public SyslogFields.SyslogSev getSyslogSev() {

+        return syslogSev;

+    }

+

+    /**

+     * numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8

+     * 

+     */

+    @JsonProperty("syslogSev")

+    public void setSyslogSev(SyslogFields.SyslogSev syslogSev) {

+        this.syslogSev = syslogSev;

+    }

+

+    /**

+     * msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided

+     * (Required)

+     * 

+     */

+    @JsonProperty("syslogTag")

+    public String getSyslogTag() {

+        return syslogTag;

+    }

+

+    /**

+     * msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided

+     * (Required)

+     * 

+     */

+    @JsonProperty("syslogTag")

+    public void setSyslogTag(String syslogTag) {

+        this.syslogTag = syslogTag;

+    }

+

+    /**

+     * timestamp parsed from non-VES syslog message

+     * 

+     */

+    @JsonProperty("syslogTs")

+    public String getSyslogTs() {

+        return syslogTs;

+    }

+

+    /**

+     * timestamp parsed from non-VES syslog message

+     * 

+     */

+    @JsonProperty("syslogTs")

+    public void setSyslogTs(String syslogTs) {

+        this.syslogTs = syslogTs;

+    }

+

+    /**

+     * IANA assigned version of the syslog protocol specification - typically 1

+     * 

+     */

+    @JsonProperty("syslogVer")

+    public Double getSyslogVer() {

+        return syslogVer;

+    }

+

+    /**

+     * IANA assigned version of the syslog protocol specification - typically 1

+     * 

+     */

+    @JsonProperty("syslogVer")

+    public void setSyslogVer(Double syslogVer) {

+        this.syslogVer = syslogVer;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalFields).append(eventSourceHost).append(eventSourceType).append(syslogFacility).append(syslogFieldsVersion).append(syslogMsg).append(syslogMsgHost).append(syslogPri).append(syslogProc).append(syslogProcId).append(syslogSData).append(syslogSdId).append(syslogSev).append(syslogTag).append(syslogTs).append(syslogVer).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof SyslogFields) == false) {

+            return false;

+        }

+        SyslogFields rhs = ((SyslogFields) other);

+        return new EqualsBuilder().append(additionalFields, rhs.additionalFields).append(eventSourceHost, rhs.eventSourceHost).append(eventSourceType, rhs.eventSourceType).append(syslogFacility, rhs.syslogFacility).append(syslogFieldsVersion, rhs.syslogFieldsVersion).append(syslogMsg, rhs.syslogMsg).append(syslogMsgHost, rhs.syslogMsgHost).append(syslogPri, rhs.syslogPri).append(syslogProc, rhs.syslogProc).append(syslogProcId, rhs.syslogProcId).append(syslogSData, rhs.syslogSData).append(syslogSdId, rhs.syslogSdId).append(syslogSev, rhs.syslogSev).append(syslogTag, rhs.syslogTag).append(syslogTs, rhs.syslogTs).append(syslogVer, rhs.syslogVer).isEquals();

+    }

+

+    public enum SyslogFieldsVersion {

+

+        _4_0("4.0");

+        private final String value;

+        private final static Map<String, SyslogFields.SyslogFieldsVersion> CONSTANTS = new HashMap<String, SyslogFields.SyslogFieldsVersion>();

+

+        static {

+            for (SyslogFields.SyslogFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private SyslogFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static SyslogFields.SyslogFieldsVersion fromValue(String value) {

+            SyslogFields.SyslogFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum SyslogSev {

+

+        ALERT("Alert"),

+        CRITICAL("Critical"),

+        DEBUG("Debug"),

+        EMERGENCY("Emergency"),

+        ERROR("Error"),

+        INFO("Info"),

+        NOTICE("Notice"),

+        WARNING("Warning");

+        private final String value;

+        private final static Map<String, SyslogFields.SyslogSev> CONSTANTS = new HashMap<String, SyslogFields.SyslogSev>();

+

+        static {

+            for (SyslogFields.SyslogSev c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private SyslogSev(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static SyslogFields.SyslogSev fromValue(String value) {

+            SyslogFields.SyslogSev constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ThresholdCrossingAlertFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ThresholdCrossingAlertFields.java
new file mode 100644
index 0000000..daa9855
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ThresholdCrossingAlertFields.java
@@ -0,0 +1,670 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * fields specific to threshold crossing alert events

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalFields",

+    "additionalParameters",

+    "alertAction",

+    "alertDescription",

+    "alertType",

+    "alertValue",

+    "associatedAlertIdList",

+    "collectionTimestamp",

+    "dataCollector",

+    "elementType",

+    "eventSeverity",

+    "eventStartTimestamp",

+    "interfaceName",

+    "networkService",

+    "possibleRootCause",

+    "thresholdCrossingFieldsVersion"

+})

+public class ThresholdCrossingAlertFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalFields;

+    /**

+     * performance counters

+     * (Required)

+     * 

+     */

+    @JsonProperty("additionalParameters")

+    @JsonPropertyDescription("performance counters")

+    private List<AdditionalParameter> additionalParameters = new ArrayList<AdditionalParameter>();

+    /**

+     * Event action

+     * (Required)

+     * 

+     */

+    @JsonProperty("alertAction")

+    @JsonPropertyDescription("Event action")

+    private ThresholdCrossingAlertFields.AlertAction alertAction;

+    /**

+     * Unique short alert description such as IF-SHUB-ERRDROP

+     * (Required)

+     * 

+     */

+    @JsonProperty("alertDescription")

+    @JsonPropertyDescription("Unique short alert description such as IF-SHUB-ERRDROP")

+    private String alertDescription;

+    /**

+     * Event type

+     * (Required)

+     * 

+     */

+    @JsonProperty("alertType")

+    @JsonPropertyDescription("Event type")

+    private ThresholdCrossingAlertFields.AlertType alertType;

+    /**

+     * Calculated API value (if applicable)

+     * 

+     */

+    @JsonProperty("alertValue")

+    @JsonPropertyDescription("Calculated API value (if applicable)")

+    private String alertValue;

+    /**

+     * List of eventIds associated with the event being reported

+     * 

+     */

+    @JsonProperty("associatedAlertIdList")

+    @JsonPropertyDescription("List of eventIds associated with the event being reported")

+    private List<String> associatedAlertIdList = new ArrayList<String>();

+    /**

+     * Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * (Required)

+     * 

+     */

+    @JsonProperty("collectionTimestamp")

+    @JsonPropertyDescription("Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800")

+    private String collectionTimestamp;

+    /**

+     * Specific performance collector instance used

+     * 

+     */

+    @JsonProperty("dataCollector")

+    @JsonPropertyDescription("Specific performance collector instance used")

+    private String dataCollector;

+    /**

+     * type of network element - internal ATT field

+     * 

+     */

+    @JsonProperty("elementType")

+    @JsonPropertyDescription("type of network element - internal ATT field")

+    private String elementType;

+    /**

+     * event severity or priority

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSeverity")

+    @JsonPropertyDescription("event severity or priority")

+    private ThresholdCrossingAlertFields.EventSeverity eventSeverity;

+    /**

+     * Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventStartTimestamp")

+    @JsonPropertyDescription("Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800")

+    private String eventStartTimestamp;

+    /**

+     * Physical or logical port or card (if applicable)

+     * 

+     */

+    @JsonProperty("interfaceName")

+    @JsonPropertyDescription("Physical or logical port or card (if applicable)")

+    private String interfaceName;

+    /**

+     * network name - internal ATT field

+     * 

+     */

+    @JsonProperty("networkService")

+    @JsonPropertyDescription("network name - internal ATT field")

+    private String networkService;

+    /**

+     * Reserved for future use

+     * 

+     */

+    @JsonProperty("possibleRootCause")

+    @JsonPropertyDescription("Reserved for future use")

+    private String possibleRootCause;

+    /**

+     * version of the thresholdCrossingAlertFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("thresholdCrossingFieldsVersion")

+    @JsonPropertyDescription("version of the thresholdCrossingAlertFields block")

+    private ThresholdCrossingAlertFields.ThresholdCrossingFieldsVersion thresholdCrossingFieldsVersion;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public AlarmAdditionalInformation getAdditionalFields() {

+        return additionalFields;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalFields")

+    public void setAdditionalFields(AlarmAdditionalInformation additionalFields) {

+        this.additionalFields = additionalFields;

+    }

+

+    /**

+     * performance counters

+     * (Required)

+     * 

+     */

+    @JsonProperty("additionalParameters")

+    public List<AdditionalParameter> getAdditionalParameters() {

+        return additionalParameters;

+    }

+

+    /**

+     * performance counters

+     * (Required)

+     * 

+     */

+    @JsonProperty("additionalParameters")

+    public void setAdditionalParameters(List<AdditionalParameter> additionalParameters) {

+        this.additionalParameters = additionalParameters;

+    }

+

+    /**

+     * Event action

+     * (Required)

+     * 

+     */

+    @JsonProperty("alertAction")

+    public ThresholdCrossingAlertFields.AlertAction getAlertAction() {

+        return alertAction;

+    }

+

+    /**

+     * Event action

+     * (Required)

+     * 

+     */

+    @JsonProperty("alertAction")

+    public void setAlertAction(ThresholdCrossingAlertFields.AlertAction alertAction) {

+        this.alertAction = alertAction;

+    }

+

+    /**

+     * Unique short alert description such as IF-SHUB-ERRDROP

+     * (Required)

+     * 

+     */

+    @JsonProperty("alertDescription")

+    public String getAlertDescription() {

+        return alertDescription;

+    }

+

+    /**

+     * Unique short alert description such as IF-SHUB-ERRDROP

+     * (Required)

+     * 

+     */

+    @JsonProperty("alertDescription")

+    public void setAlertDescription(String alertDescription) {

+        this.alertDescription = alertDescription;

+    }

+

+    /**

+     * Event type

+     * (Required)

+     * 

+     */

+    @JsonProperty("alertType")

+    public ThresholdCrossingAlertFields.AlertType getAlertType() {

+        return alertType;

+    }

+

+    /**

+     * Event type

+     * (Required)

+     * 

+     */

+    @JsonProperty("alertType")

+    public void setAlertType(ThresholdCrossingAlertFields.AlertType alertType) {

+        this.alertType = alertType;

+    }

+

+    /**

+     * Calculated API value (if applicable)

+     * 

+     */

+    @JsonProperty("alertValue")

+    public String getAlertValue() {

+        return alertValue;

+    }

+

+    /**

+     * Calculated API value (if applicable)

+     * 

+     */

+    @JsonProperty("alertValue")

+    public void setAlertValue(String alertValue) {

+        this.alertValue = alertValue;

+    }

+

+    /**

+     * List of eventIds associated with the event being reported

+     * 

+     */

+    @JsonProperty("associatedAlertIdList")

+    public List<String> getAssociatedAlertIdList() {

+        return associatedAlertIdList;

+    }

+

+    /**

+     * List of eventIds associated with the event being reported

+     * 

+     */

+    @JsonProperty("associatedAlertIdList")

+    public void setAssociatedAlertIdList(List<String> associatedAlertIdList) {

+        this.associatedAlertIdList = associatedAlertIdList;

+    }

+

+    /**

+     * Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * (Required)

+     * 

+     */

+    @JsonProperty("collectionTimestamp")

+    public String getCollectionTimestamp() {

+        return collectionTimestamp;

+    }

+

+    /**

+     * Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * (Required)

+     * 

+     */

+    @JsonProperty("collectionTimestamp")

+    public void setCollectionTimestamp(String collectionTimestamp) {

+        this.collectionTimestamp = collectionTimestamp;

+    }

+

+    /**

+     * Specific performance collector instance used

+     * 

+     */

+    @JsonProperty("dataCollector")

+    public String getDataCollector() {

+        return dataCollector;

+    }

+

+    /**

+     * Specific performance collector instance used

+     * 

+     */

+    @JsonProperty("dataCollector")

+    public void setDataCollector(String dataCollector) {

+        this.dataCollector = dataCollector;

+    }

+

+    /**

+     * type of network element - internal ATT field

+     * 

+     */

+    @JsonProperty("elementType")

+    public String getElementType() {

+        return elementType;

+    }

+

+    /**

+     * type of network element - internal ATT field

+     * 

+     */

+    @JsonProperty("elementType")

+    public void setElementType(String elementType) {

+        this.elementType = elementType;

+    }

+

+    /**

+     * event severity or priority

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSeverity")

+    public ThresholdCrossingAlertFields.EventSeverity getEventSeverity() {

+        return eventSeverity;

+    }

+

+    /**

+     * event severity or priority

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventSeverity")

+    public void setEventSeverity(ThresholdCrossingAlertFields.EventSeverity eventSeverity) {

+        this.eventSeverity = eventSeverity;

+    }

+

+    /**

+     * Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventStartTimestamp")

+    public String getEventStartTimestamp() {

+        return eventStartTimestamp;

+    }

+

+    /**

+     * Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800

+     * (Required)

+     * 

+     */

+    @JsonProperty("eventStartTimestamp")

+    public void setEventStartTimestamp(String eventStartTimestamp) {

+        this.eventStartTimestamp = eventStartTimestamp;

+    }

+

+    /**

+     * Physical or logical port or card (if applicable)

+     * 

+     */

+    @JsonProperty("interfaceName")

+    public String getInterfaceName() {

+        return interfaceName;

+    }

+

+    /**

+     * Physical or logical port or card (if applicable)

+     * 

+     */

+    @JsonProperty("interfaceName")

+    public void setInterfaceName(String interfaceName) {

+        this.interfaceName = interfaceName;

+    }

+

+    /**

+     * network name - internal ATT field

+     * 

+     */

+    @JsonProperty("networkService")

+    public String getNetworkService() {

+        return networkService;

+    }

+

+    /**

+     * network name - internal ATT field

+     * 

+     */

+    @JsonProperty("networkService")

+    public void setNetworkService(String networkService) {

+        this.networkService = networkService;

+    }

+

+    /**

+     * Reserved for future use

+     * 

+     */

+    @JsonProperty("possibleRootCause")

+    public String getPossibleRootCause() {

+        return possibleRootCause;

+    }

+

+    /**

+     * Reserved for future use

+     * 

+     */

+    @JsonProperty("possibleRootCause")

+    public void setPossibleRootCause(String possibleRootCause) {

+        this.possibleRootCause = possibleRootCause;

+    }

+

+    /**

+     * version of the thresholdCrossingAlertFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("thresholdCrossingFieldsVersion")

+    public ThresholdCrossingAlertFields.ThresholdCrossingFieldsVersion getThresholdCrossingFieldsVersion() {

+        return thresholdCrossingFieldsVersion;

+    }

+

+    /**

+     * version of the thresholdCrossingAlertFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("thresholdCrossingFieldsVersion")

+    public void setThresholdCrossingFieldsVersion(ThresholdCrossingAlertFields.ThresholdCrossingFieldsVersion thresholdCrossingFieldsVersion) {

+        this.thresholdCrossingFieldsVersion = thresholdCrossingFieldsVersion;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalFields).append(additionalParameters).append(alertAction).append(alertDescription).append(alertType).append(alertValue).append(associatedAlertIdList).append(collectionTimestamp).append(dataCollector).append(elementType).append(eventSeverity).append(eventStartTimestamp).append(interfaceName).append(networkService).append(possibleRootCause).append(thresholdCrossingFieldsVersion).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof ThresholdCrossingAlertFields) == false) {

+            return false;

+        }

+        ThresholdCrossingAlertFields rhs = ((ThresholdCrossingAlertFields) other);

+        return new EqualsBuilder().append(additionalFields, rhs.additionalFields).append(additionalParameters, rhs.additionalParameters).append(alertAction, rhs.alertAction).append(alertDescription, rhs.alertDescription).append(alertType, rhs.alertType).append(alertValue, rhs.alertValue).append(associatedAlertIdList, rhs.associatedAlertIdList).append(collectionTimestamp, rhs.collectionTimestamp).append(dataCollector, rhs.dataCollector).append(elementType, rhs.elementType).append(eventSeverity, rhs.eventSeverity).append(eventStartTimestamp, rhs.eventStartTimestamp).append(interfaceName, rhs.interfaceName).append(networkService, rhs.networkService).append(possibleRootCause, rhs.possibleRootCause).append(thresholdCrossingFieldsVersion, rhs.thresholdCrossingFieldsVersion).isEquals();

+    }

+

+    public enum AlertAction {

+

+        CLEAR("CLEAR"),

+        CONT("CONT"),

+        SET("SET");

+        private final String value;

+        private final static Map<String, ThresholdCrossingAlertFields.AlertAction> CONSTANTS = new HashMap<String, ThresholdCrossingAlertFields.AlertAction>();

+

+        static {

+            for (ThresholdCrossingAlertFields.AlertAction c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private AlertAction(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static ThresholdCrossingAlertFields.AlertAction fromValue(String value) {

+            ThresholdCrossingAlertFields.AlertAction constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum AlertType {

+

+        CARD_ANOMALY("CARD-ANOMALY"),

+        ELEMENT_ANOMALY("ELEMENT-ANOMALY"),

+        INTERFACE_ANOMALY("INTERFACE-ANOMALY"),

+        SERVICE_ANOMALY("SERVICE-ANOMALY");

+        private final String value;

+        private final static Map<String, ThresholdCrossingAlertFields.AlertType> CONSTANTS = new HashMap<String, ThresholdCrossingAlertFields.AlertType>();

+

+        static {

+            for (ThresholdCrossingAlertFields.AlertType c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private AlertType(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static ThresholdCrossingAlertFields.AlertType fromValue(String value) {

+            ThresholdCrossingAlertFields.AlertType constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum EventSeverity {

+

+        CRITICAL("CRITICAL"),

+        MAJOR("MAJOR"),

+        MINOR("MINOR"),

+        WARNING("WARNING"),

+        NORMAL("NORMAL");

+        private final String value;

+        private final static Map<String, ThresholdCrossingAlertFields.EventSeverity> CONSTANTS = new HashMap<String, ThresholdCrossingAlertFields.EventSeverity>();

+

+        static {

+            for (ThresholdCrossingAlertFields.EventSeverity c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private EventSeverity(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static ThresholdCrossingAlertFields.EventSeverity fromValue(String value) {

+            ThresholdCrossingAlertFields.EventSeverity constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+    public enum ThresholdCrossingFieldsVersion {

+

+        _4_0("4.0");

+        private final String value;

+        private final static Map<String, ThresholdCrossingAlertFields.ThresholdCrossingFieldsVersion> CONSTANTS = new HashMap<String, ThresholdCrossingAlertFields.ThresholdCrossingFieldsVersion>();

+

+        static {

+            for (ThresholdCrossingAlertFields.ThresholdCrossingFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private ThresholdCrossingFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static ThresholdCrossingAlertFields.ThresholdCrossingFieldsVersion fromValue(String value) {

+            ThresholdCrossingAlertFields.ThresholdCrossingFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VendorNfNameFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VendorNfNameFields.java
new file mode 100644
index 0000000..f665097
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VendorNfNameFields.java
@@ -0,0 +1,144 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * provides vendor, nf and nfModule identifying information

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "vendorName",

+    "nfModuleName",

+    "nfName"

+})

+public class VendorNfNameFields {

+

+    /**

+     * network function vendor name

+     * (Required)

+     * 

+     */

+    @JsonProperty("vendorName")

+    @JsonPropertyDescription("network function vendor name")

+    private String vendorName;

+    /**

+     * name of the nfModule generating the event

+     * 

+     */

+    @JsonProperty("nfModuleName")

+    @JsonPropertyDescription("name of the nfModule generating the event")

+    private String nfModuleName;

+    /**

+     * name of the network function generating the event

+     * 

+     */

+    @JsonProperty("nfName")

+    @JsonPropertyDescription("name of the network function generating the event")

+    private String nfName;

+

+    /**

+     * network function vendor name

+     * (Required)

+     * 

+     */

+    @JsonProperty("vendorName")

+    public String getVendorName() {

+        return vendorName;

+    }

+

+    /**

+     * network function vendor name

+     * (Required)

+     * 

+     */

+    @JsonProperty("vendorName")

+    public void setVendorName(String vendorName) {

+        this.vendorName = vendorName;

+    }

+

+    /**

+     * name of the nfModule generating the event

+     * 

+     */

+    @JsonProperty("nfModuleName")

+    public String getNfModuleName() {

+        return nfModuleName;

+    }

+

+    /**

+     * name of the nfModule generating the event

+     * 

+     */

+    @JsonProperty("nfModuleName")

+    public void setNfModuleName(String nfModuleName) {

+        this.nfModuleName = nfModuleName;

+    }

+

+    /**

+     * name of the network function generating the event

+     * 

+     */

+    @JsonProperty("nfName")

+    public String getNfName() {

+        return nfName;

+    }

+

+    /**

+     * name of the network function generating the event

+     * 

+     */

+    @JsonProperty("nfName")

+    public void setNfName(String nfName) {

+        this.nfName = nfName;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(vendorName).append(nfModuleName).append(nfName).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof VendorNfNameFields) == false) {

+            return false;

+        }

+        VendorNfNameFields rhs = ((VendorNfNameFields) other);

+        return new EqualsBuilder().append(vendorName, rhs.vendorName).append(nfModuleName, rhs.nfModuleName).append(nfName, rhs.nfName).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalMeasurement.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VesEvent.java
index a82bf56..9342f0b 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/AdditionalMeasurement.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VesEvent.java
@@ -1,101 +1,116 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "arrayOfFields"
-})
-public class AdditionalMeasurement {
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("arrayOfFields")
-    private List<ArrayOfField> arrayOfFields = null;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("arrayOfFields")
-    public List<ArrayOfField> getArrayOfFields() {
-        return arrayOfFields;
-    }
-
-    @JsonProperty("arrayOfFields")
-    public void setArrayOfFields(List<ArrayOfField> arrayOfFields) {
-        this.arrayOfFields = arrayOfFields;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("name", name).append("arrayOfFields", arrayOfFields).append("additionalProperties", additionalProperties).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(arrayOfFields).append(additionalProperties).append(name).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof AdditionalMeasurement) == false) {
-            return false;
-        }
-        AdditionalMeasurement rhs = ((AdditionalMeasurement) other);
-        return new EqualsBuilder().append(arrayOfFields, rhs.arrayOfFields).append(additionalProperties, rhs.additionalProperties).append(name, rhs.name).isEquals();
-    }
-
-}
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonAnyGetter;

+import com.fasterxml.jackson.annotation.JsonAnySetter;

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * VES Event Listener Common Event Format

+ * <p>

+ * 

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "event"

+    

+})

+public class VesEvent {

+

+    /**

+     * the root level of the common event format

+     * 

+     */

+    @JsonProperty("event")

+    @JsonPropertyDescription("the root level of the common event format")

+    private Event event;

+    

+   

+    @JsonIgnore

+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();

+

+    /**

+     * the root level of the common event format

+     * 

+     */

+    @JsonProperty("event")

+    public Event getEvent() {

+        return event;

+    }

+

+    /**

+     * the root level of the common event format

+     * 

+     */

+    @JsonProperty("event")

+    public void setEvent(Event event) {

+        this.event = event;

+    }

+

+   

+

+  

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @JsonAnyGetter

+    public Map<String, Object> getAdditionalProperties() {

+        return this.additionalProperties;

+    }

+

+    @JsonAnySetter

+    public void setAdditionalProperty(String name, Object value) {

+        this.additionalProperties.put(name, value);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(event).append(additionalProperties).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof VesEvent) == false) {

+            return false;

+        }

+        VesEvent rhs = ((VesEvent) other);

+        return new EqualsBuilder().append(event, rhs.event).append(additionalProperties, rhs.additionalProperties).isEquals();

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VoiceQualityFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VoiceQualityFields.java
new file mode 100644
index 0000000..80572c9
--- /dev/null
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VoiceQualityFields.java
@@ -0,0 +1,357 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DCAE

+* ================================================================================

+* Copyright 2018 TechMahindra

+*=================================================================================

+* 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.onap.dcaegen2.ves.domain.ves7_0;

+

+import java.util.HashMap;

+import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonCreator;

+import com.fasterxml.jackson.annotation.JsonInclude;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import com.fasterxml.jackson.annotation.JsonPropertyDescription;

+import com.fasterxml.jackson.annotation.JsonPropertyOrder;

+import com.fasterxml.jackson.annotation.JsonValue;

+import org.apache.commons.lang.builder.EqualsBuilder;

+import org.apache.commons.lang.builder.HashCodeBuilder;

+import org.apache.commons.lang.builder.ToStringBuilder;

+

+

+/**

+ * provides statistics related to customer facing voice products

+ * 

+ */

+@JsonInclude(JsonInclude.Include.NON_NULL)

+@JsonPropertyOrder({

+    "additionalInformation",

+    "calleeSideCodec",

+    "callerSideCodec",

+    "correlator",

+    "endOfCallVqmSummaries",

+    "phoneNumber",

+    "midCallRtcp",

+    "vendorNfNameFields",

+    "voiceQualityFieldsVersion"

+})

+public class VoiceQualityFields {

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalInformation")

+    @JsonPropertyDescription("an associative array which is an array of key:value pairs")

+    private AlarmAdditionalInformation additionalInformation;

+    /**

+     * callee codec for the call

+     * (Required)

+     * 

+     */

+    @JsonProperty("calleeSideCodec")

+    @JsonPropertyDescription("callee codec for the call")

+    private String calleeSideCodec;

+    /**

+     * caller codec for the call

+     * (Required)

+     * 

+     */

+    @JsonProperty("callerSideCodec")

+    @JsonPropertyDescription("caller codec for the call")

+    private String callerSideCodec;

+    /**

+     * this is the same for all events on this call

+     * (Required)

+     * 

+     */

+    @JsonProperty("correlator")

+    @JsonPropertyDescription("this is the same for all events on this call")

+    private String correlator;

+    /**

+     * provides end of call voice quality metrics

+     * 

+     */

+    @JsonProperty("endOfCallVqmSummaries")

+    @JsonPropertyDescription("provides end of call voice quality metrics")

+    private EndOfCallVqmSummaries endOfCallVqmSummaries;

+    /**

+     * phone number associated with the correlator

+     * 

+     */

+    @JsonProperty("phoneNumber")

+    @JsonPropertyDescription("phone number associated with the correlator")

+    private String phoneNumber;

+    /**

+     * Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers

+     * (Required)

+     * 

+     */

+    @JsonProperty("midCallRtcp")

+    @JsonPropertyDescription("Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers")

+    private String midCallRtcp;

+    /**

+     * provides vendor, nf and nfModule identifying information

+     * (Required)

+     * 

+     */

+    @JsonProperty("vendorNfNameFields")

+    @JsonPropertyDescription("provides vendor, nf and nfModule identifying information")

+    private VendorNfNameFields vendorNfNameFields;

+    /**

+     * version of the voiceQualityFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("voiceQualityFieldsVersion")

+    @JsonPropertyDescription("version of the voiceQualityFields block")

+    private VoiceQualityFields.VoiceQualityFieldsVersion voiceQualityFieldsVersion;

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalInformation")

+    public AlarmAdditionalInformation getAdditionalInformation() {

+        return additionalInformation;

+    }

+

+    /**

+     * an associative array which is an array of key:value pairs

+     * 

+     */

+    @JsonProperty("additionalInformation")

+    public void setAdditionalInformation(AlarmAdditionalInformation additionalInformation) {

+        this.additionalInformation = additionalInformation;

+    }

+

+    /**

+     * callee codec for the call

+     * (Required)

+     * 

+     */

+    @JsonProperty("calleeSideCodec")

+    public String getCalleeSideCodec() {

+        return calleeSideCodec;

+    }

+

+    /**

+     * callee codec for the call

+     * (Required)

+     * 

+     */

+    @JsonProperty("calleeSideCodec")

+    public void setCalleeSideCodec(String calleeSideCodec) {

+        this.calleeSideCodec = calleeSideCodec;

+    }

+

+    /**

+     * caller codec for the call

+     * (Required)

+     * 

+     */

+    @JsonProperty("callerSideCodec")

+    public String getCallerSideCodec() {

+        return callerSideCodec;

+    }

+

+    /**

+     * caller codec for the call

+     * (Required)

+     * 

+     */

+    @JsonProperty("callerSideCodec")

+    public void setCallerSideCodec(String callerSideCodec) {

+        this.callerSideCodec = callerSideCodec;

+    }

+

+    /**

+     * this is the same for all events on this call

+     * (Required)

+     * 

+     */

+    @JsonProperty("correlator")

+    public String getCorrelator() {

+        return correlator;

+    }

+

+    /**

+     * this is the same for all events on this call

+     * (Required)

+     * 

+     */

+    @JsonProperty("correlator")

+    public void setCorrelator(String correlator) {

+        this.correlator = correlator;

+    }

+

+    /**

+     * provides end of call voice quality metrics

+     * 

+     */

+    @JsonProperty("endOfCallVqmSummaries")

+    public EndOfCallVqmSummaries getEndOfCallVqmSummaries() {

+        return endOfCallVqmSummaries;

+    }

+

+    /**

+     * provides end of call voice quality metrics

+     * 

+     */

+    @JsonProperty("endOfCallVqmSummaries")

+    public void setEndOfCallVqmSummaries(EndOfCallVqmSummaries endOfCallVqmSummaries) {

+        this.endOfCallVqmSummaries = endOfCallVqmSummaries;

+    }

+

+    /**

+     * phone number associated with the correlator

+     * 

+     */

+    @JsonProperty("phoneNumber")

+    public String getPhoneNumber() {

+        return phoneNumber;

+    }

+

+    /**

+     * phone number associated with the correlator

+     * 

+     */

+    @JsonProperty("phoneNumber")

+    public void setPhoneNumber(String phoneNumber) {

+        this.phoneNumber = phoneNumber;

+    }

+

+    /**

+     * Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers

+     * (Required)

+     * 

+     */

+    @JsonProperty("midCallRtcp")

+    public String getMidCallRtcp() {

+        return midCallRtcp;

+    }

+

+    /**

+     * Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers

+     * (Required)

+     * 

+     */

+    @JsonProperty("midCallRtcp")

+    public void setMidCallRtcp(String midCallRtcp) {

+        this.midCallRtcp = midCallRtcp;

+    }

+

+    /**

+     * provides vendor, nf and nfModule identifying information

+     * (Required)

+     * 

+     */

+    @JsonProperty("vendorNfNameFields")

+    public VendorNfNameFields getVendorNfNameFields() {

+        return vendorNfNameFields;

+    }

+

+    /**

+     * provides vendor, nf and nfModule identifying information

+     * (Required)

+     * 

+     */

+    @JsonProperty("vendorNfNameFields")

+    public void setVendorNfNameFields(VendorNfNameFields vendorNfNameFields) {

+        this.vendorNfNameFields = vendorNfNameFields;

+    }

+

+    /**

+     * version of the voiceQualityFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("voiceQualityFieldsVersion")

+    public VoiceQualityFields.VoiceQualityFieldsVersion getVoiceQualityFieldsVersion() {

+        return voiceQualityFieldsVersion;

+    }

+

+    /**

+     * version of the voiceQualityFields block

+     * (Required)

+     * 

+     */

+    @JsonProperty("voiceQualityFieldsVersion")

+    public void setVoiceQualityFieldsVersion(VoiceQualityFields.VoiceQualityFieldsVersion voiceQualityFieldsVersion) {

+        this.voiceQualityFieldsVersion = voiceQualityFieldsVersion;

+    }

+

+    @Override

+    public String toString() {

+        return ToStringBuilder.reflectionToString(this);

+    }

+

+    @Override

+    public int hashCode() {

+        return new HashCodeBuilder().append(additionalInformation).append(calleeSideCodec).append(callerSideCodec).append(correlator).append(endOfCallVqmSummaries).append(phoneNumber).append(midCallRtcp).append(vendorNfNameFields).append(voiceQualityFieldsVersion).toHashCode();

+    }

+

+    @Override

+    public boolean equals(Object other) {

+        if (other == this) {

+            return true;

+        }

+        if ((other instanceof VoiceQualityFields) == false) {

+            return false;

+        }

+        VoiceQualityFields rhs = ((VoiceQualityFields) other);

+        return new EqualsBuilder().append(additionalInformation, rhs.additionalInformation).append(calleeSideCodec, rhs.calleeSideCodec).append(callerSideCodec, rhs.callerSideCodec).append(correlator, rhs.correlator).append(endOfCallVqmSummaries, rhs.endOfCallVqmSummaries).append(phoneNumber, rhs.phoneNumber).append(midCallRtcp, rhs.midCallRtcp).append(vendorNfNameFields, rhs.vendorNfNameFields).append(voiceQualityFieldsVersion, rhs.voiceQualityFieldsVersion).isEquals();

+    }

+

+    public enum VoiceQualityFieldsVersion {

+

+        _4_0("4.0");

+        private final String value;

+        private final static Map<String, VoiceQualityFields.VoiceQualityFieldsVersion> CONSTANTS = new HashMap<String, VoiceQualityFields.VoiceQualityFieldsVersion>();

+

+        static {

+            for (VoiceQualityFields.VoiceQualityFieldsVersion c: values()) {

+                CONSTANTS.put(c.value, c);

+            }

+        }

+

+        private VoiceQualityFieldsVersion(String value) {

+            this.value = value;

+        }

+

+        @Override

+        public String toString() {

+            return this.value;

+        }

+

+        @JsonValue

+        public String value() {

+            return this.value;

+        }

+

+        @JsonCreator

+        public static VoiceQualityFields.VoiceQualityFieldsVersion fromValue(String value) {

+            VoiceQualityFields.VoiceQualityFieldsVersion constant = CONSTANTS.get(value);

+            if (constant == null) {

+                throw new IllegalArgumentException(value);

+            } else {

+                return constant;

+            }

+        }

+

+    }

+

+}

diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/adapter/UniversalEventAdapter.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/adapter/UniversalEventAdapter.java
index c161977..f17f3a6 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/adapter/UniversalEventAdapter.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/adapter/UniversalEventAdapter.java
@@ -22,13 +22,14 @@ package org.onap.universalvesadapter.adapter;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.annotation.PreDestroy;
 
 import org.milyn.Smooks;
-import org.onap.dcaegen2.ves.domain.VesEvent;
+import org.onap.dcaegen2.ves.domain.ves7_0.VesEvent;
 import org.onap.universalvesadapter.exception.ConfigFileSmooksConversionException;
 import org.onap.universalvesadapter.exception.VesException;
 import org.onap.universalvesadapter.service.VESAdapterInitializer;
@@ -36,6 +37,7 @@ import org.onap.universalvesadapter.utils.CollectorConfigPropertyRetrival;
 import org.onap.universalvesadapter.utils.SmooksUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.xml.sax.SAXException;
 
@@ -58,7 +60,9 @@ import com.google.gson.JsonSyntaxException;
 public class UniversalEventAdapter implements GenericAdapter {
 	 private static final Logger debugLogger = LoggerFactory.getLogger("debugLogger");
 	 private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
-
+	 
+	@Value("${defaultConfigFilelocation}")
+	private String defaultConfigFilelocation;
 	private String collectorIdentifierValue;
 	private String collectorIdentifierKey;
 	private Map<String, Smooks> eventToSmooksMapping = new ConcurrentHashMap<>();
@@ -79,7 +83,7 @@ public class UniversalEventAdapter implements GenericAdapter {
 		String result = "";
 		String configFileData;
 		
-		String identifier[]= CollectorConfigPropertyRetrival.getProperyArray("identifier");
+		String identifier[]= CollectorConfigPropertyRetrival.getProperyArray("identifier",defaultConfigFilelocation );
 		String defaultMappingFile="defaultMappingFile-"+Thread.currentThread().getName();
 		try {
 
@@ -89,10 +93,11 @@ public class UniversalEventAdapter implements GenericAdapter {
 				JsonElement results;
 				for(int i=0;i<identifier.length;i++)
 				{
-				if(body.has(identifier[i]))
+				JsonObject obj;
+				if((obj=keyObject(body,identifier[i])).has(identifier[i]))
 				{
 					collectorIdentifierKey=identifier[i];
-					 results=body.get(identifier[i]);
+					 results=obj.get(identifier[i]);
 					 collectorIdentifierValue=results.getAsString();
 					
 				}
@@ -156,5 +161,25 @@ public class UniversalEventAdapter implements GenericAdapter {
 			smooks.close();
 		debugLogger.warn("All Smooks objects closed");
 	}
+	
+	public JsonObject keyObject(JsonObject  object, String searchedKey) {
+	    boolean exists = object.has(searchedKey);
+	    JsonObject jsonObject = object;
+	   
+	    if(!exists) {      
+	        Iterator<?> keys = object.keySet().iterator();
+	        while( keys.hasNext() ) {
+	            String key = (String)keys.next();
+	            if ( object.get(key) instanceof JsonObject ) {
+	            	 
+	            	jsonObject=(JsonObject) object.get(key);
+	            	JsonObject   obj = keyObject(jsonObject, searchedKey);
+	            	exists = obj.has(searchedKey);
+	            }
+	        }
+	    }
+	    
+	    return jsonObject;
+	}
 
 }
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
index 220c5e0..671fcc3 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
@@ -52,19 +52,28 @@ public class VESAdapterInitializer implements CommandLineRunner, Ordered {
 	private Creator creator;
 	@Autowired
 	private DmaapConfig dmaapConfig;
+	@Value("${defaultConfigFilelocation}")
+	String defaultConfigFilelocation;
 	@Value("${server.port}")
 	String serverPort;
 
 	private static Map<String, String> mappingFiles = new HashMap<String, String>();
 	private static Map<String, String> env;
-	public static String configFile = "/opt/app/VESAdapter/conf/kv.json";
-	//public static String configFile = "src\\main\\resources\\kv.json";
 
     @Autowired 
     private ApplicationContext applicationContext;
     
 	@Override
 	public void run(String... args) throws Exception {
+		debugLogger.info("The Default Config file Location:" + defaultConfigFilelocation.trim());
+		
+		   if (ClassLoader.getSystemResource(defaultConfigFilelocation.trim()) == null) {
+	        	errorLogger.error("Default Config file " + defaultConfigFilelocation.trim() + " is missing");
+	            System.exit(SpringApplication.exit(applicationContext, () -> {
+					errorLogger.error("Application stoped due to missing default Config file");
+	                return -1;
+	            }));
+	        }
 		env = System.getenv();
 		for (Map.Entry<String, String> entry : env.entrySet()) {
 			debugLogger.debug(entry.getKey() + ":" + entry.getValue());
@@ -73,7 +82,7 @@ public class VESAdapterInitializer implements CommandLineRunner, Ordered {
 		//checks for DMaaP  Host and Port No
 		if( (env.get("DMAAPHOST")==null ||(env.get("MR_DEFAULT_PORT_NUMBER")==null))) {
 			
-			errorLogger.error("Some docker environment parameter is missing. Sample Usage is -\n sudo docker run -d -p 8085:8085/tcp --env MR_DEFAULT_PORT_NUMBER=3904 --env CONSUL_HOST=10.53.172.109 --env HOSTNAME=mvp-dcaegen2-service-mua --env CONFIG_BINDING_SERVICE=config_binding_service --env DMAAPHOST='10.53.172.156' onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:latest");
+			errorLogger.error("DMAAPHOST,MR_DEFAULT_PORT_NUMBER environment parameter is missing. Sample Usage is -\n sudo docker run -d -p 8085:8085/tcp --env MR_DEFAULT_PORT_NUMBER=3904 --env CONSUL_HOST=10.53.172.109 --env HOSTNAME=mvp-dcaegen2-service-mua --env CONFIG_BINDING_SERVICE=config_binding_service --env DMAAPHOST='10.53.172.156' nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:latest");
 			
 			System.exit(SpringApplication.exit(applicationContext, () -> {errorLogger.error("Application stoped due missing DMAAPHOST or MR_DEFAULT_PORT_NUMBER environment varibales.Please refer above example for environment varibales to pass ");return-1;}));
 		} 
@@ -84,13 +93,13 @@ public class VESAdapterInitializer implements CommandLineRunner, Ordered {
 		//check for consul details
 		if (env.containsKey("CONSUL_HOST") && env.containsKey("CONFIG_BINDING_SERVICE") && env.containsKey("HOSTNAME")) {
 			debugLogger.info(">>>Dynamic configuration to be used");
-			FetchDynamicConfig.cbsCall();
+			FetchDynamicConfig.cbsCall(defaultConfigFilelocation);
 
 		} else {
 			debugLogger.info(">>>Static configuration to be used");
 			
 		}
-		readJsonToMap(configFile);
+		readJsonToMap(defaultConfigFilelocation);
 		
 		//prepareDatabase();
 		//fetchMappingFile();
@@ -118,7 +127,6 @@ public class VESAdapterInitializer implements CommandLineRunner, Ordered {
 				    builder.append(line);
 				}
 				result = builder.toString();
-				debugLogger.debug(result);
 			}
 		} catch (IOException e) {
 			errorLogger.error("error", e);
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VesService.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VesService.java
index 79317ea..a5b88ec 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VesService.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VesService.java
@@ -40,6 +40,7 @@ import org.onap.universalvesadapter.utils.DmaapConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 /**
@@ -56,6 +57,8 @@ public class VesService {
 	 private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
 
 	private boolean isRunning = true;
+	@Value("${defaultConfigFilelocation}")
+	private String defaultConfigFilelocation;
 	@Autowired
 	private Creator creator;
 	@Autowired
@@ -74,7 +77,7 @@ public class VesService {
 
 		DMaaPMRPublisher publisher = creator.getDMaaPMRPublisher();
 
-		String topicArray[]= CollectorConfigPropertyRetrival.getProperyArray("subscriberTopic");
+		String topicArray[]= CollectorConfigPropertyRetrival.getProperyArray("subscriberTopic",defaultConfigFilelocation);
 		
 		
 		ExecutorService executorService=Executors.newFixedThreadPool(topicArray.length);
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/CollectorConfigPropertyRetrival.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/CollectorConfigPropertyRetrival.java
index 9de7e63..2262b9b 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/CollectorConfigPropertyRetrival.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/CollectorConfigPropertyRetrival.java
@@ -19,6 +19,7 @@
 */
 package org.onap.universalvesadapter.utils;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
@@ -29,56 +30,59 @@ import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
-
+@Component
 public class CollectorConfigPropertyRetrival {
 
+	@Value("${defaultConfigFilelocation}")
+	public String defaultConfigFilelocation;
+	private static final Logger debugLogger = LoggerFactory.getLogger("debugLogger");
+	private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
+	private static JSONArray array;
 
-	 public static String configFile = "/opt/app/VESAdapter/conf/kv.json";
-	 //public static String configFile = "src\\main\\resources\\kv.json";
-	 private static final Logger debugLogger = LoggerFactory.getLogger("debugLogger");
-	 private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
-	 private static  JSONArray array;
-
-	public static  JSONArray collectorConfigArray(String configFile){
+	public static JSONArray collectorConfigArray(String configFile) {
 		try {
-		JSONParser parser = new JSONParser();
-		FileReader fileReader = new FileReader(configFile);
-		JSONObject obj = (JSONObject) parser.parse(fileReader);
-		JSONObject appobj = (JSONObject) obj.get("app_preferences");
-		 array =(JSONArray) appobj.get("collectors");
-		
-		 debugLogger.info("Retrieved JsonArray from Collector Config File");
+			JSONParser parser = new JSONParser();
+
+			File file = new File(ClassLoader.getSystemResource(configFile.trim()).getFile());
+
+			FileReader fileReader = new FileReader(file);
+			JSONObject obj = (JSONObject) parser.parse(fileReader);
+			JSONObject appobj = (JSONObject) obj.get("app_preferences");
+			array = (JSONArray) appobj.get("collectors");
+
+			debugLogger.info("Retrieved JsonArray from Collector Config File");
+			
 		} catch (ParseException e) {
-			errorLogger.error("ParseException occured at position:",e.getPosition());
+			errorLogger.error("ParseException occured at position:", e.getPosition());
 		} catch (FileNotFoundException e) {
-			
-			errorLogger.error("Collector Config File is not found..",e.getMessage());
+
+			errorLogger.error("Collector Config File is not found..", e.getMessage());
 		} catch (IOException e) {
-			
-			errorLogger.error("Error occured due to :",e.getMessage());
+
+			errorLogger.error("Error occured due to :", e.getMessage());
 		}
-		
-		
+
 		return array;
-		
+
 	}
-	
-	
-	public static String [] getProperyArray(String properyName) {
-		JSONArray jsonArray =collectorConfigArray(configFile);
-		
-		String [] propertyArray=new String[jsonArray.size()];
-		
-		 for (int k=0;k<jsonArray.size();k++) {
-				
-				 JSONObject collJson= (JSONObject) jsonArray.get(k);
-				 
-				 propertyArray[k]=(String) collJson.get(properyName);
-			 }
-		 debugLogger.info("returning "+properyName+" array from Collector Config");
+
+	public static String[] getProperyArray(String properyName, String defaultConfigFilelocation) {
+		JSONArray jsonArray = collectorConfigArray(defaultConfigFilelocation);
+
+		String[] propertyArray = new String[jsonArray.size()];
+
+		for (int k = 0; k < jsonArray.size(); k++) {
+
+			JSONObject collJson = (JSONObject) jsonArray.get(k);
+
+			propertyArray[k] = (String) collJson.get(properyName);
+		}
+		debugLogger.info("returning " + properyName + " array from Collector Config");
 		return propertyArray;
-		
+
 	}
 
 }
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java
index f515858..af219ce 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java
@@ -32,17 +32,16 @@ import org.json.JSONObject;
 import org.json.JSONTokener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+@Component
 public class FetchDynamicConfig {
 
 	private static final Logger debugLogger = LoggerFactory.getLogger("debugLogger");
 	private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
 
-	// need to change below path
-	public static String configFile = "/opt/app/VESAdapter/conf/kv.json";
-	//public static String configFile = "src\\main\\resources\\kv.json";
 	private static String url;
 	public static String retString;
 	public static String retCBSString;
@@ -51,7 +50,7 @@ public class FetchDynamicConfig {
 	public FetchDynamicConfig() {
 	}
 
-	public static void cbsCall() {
+	public static void cbsCall(String configFile) {
 
 		env = System.getenv();
 		Boolean areEqual;
@@ -60,11 +59,11 @@ public class FetchDynamicConfig {
 		// Construct and invoke CBS API to get application Configuration
 		getCBS();
 		// Verify if data has changed
-		areEqual = verifyConfigChange();
+		areEqual = verifyConfigChange(configFile);
 
 		if (!areEqual) {
 			FetchDynamicConfig fc = new FetchDynamicConfig();
-			fc.writefile(retCBSString);
+			fc.writefile(retCBSString,configFile);
 		} else {
 			debugLogger.info("New config pull results identical -  " + configFile + " NOT refreshed");
 		}
@@ -73,16 +72,11 @@ public class FetchDynamicConfig {
 	
 	private static void getconsul() {
 		url = env.get("CONSUL_HOST") + ":8500/v1/catalog/service/" + env.get("CONFIG_BINDING_SERVICE");
-
-		// for testing :url="10.12.6.50:8500/v1/catalog/service/config_binding_service";
-		//http://10.12.6.44:8500/v1/catlog/service/config_binding_service
-
 		retString = executecurl(url);
 		debugLogger.info("CBS details fetched from Consul");
-	
 	}
 
-	public static boolean verifyConfigChange() {
+	public static boolean verifyConfigChange(String configFile) {
 
 		boolean areEqual = false;
 		// Read current data
@@ -138,12 +132,12 @@ public class FetchDynamicConfig {
 
 	}
 
-	public void writefile(String retCBSString) {
+	public void writefile(String retCBSString, String configFile) {
 		debugLogger.info("URL to fetch configuration:" + url);
 
 		String indentedretstring = (new JSONObject(retCBSString)).toString(4);
 
-		try (FileWriter file = new FileWriter(FetchDynamicConfig.configFile)) {
+		try (FileWriter file = new FileWriter(configFile)) {
 			file.write(indentedretstring);
 
 			debugLogger.info("Successfully Copied JSON Object to file " + configFile);
@@ -189,8 +183,6 @@ public class FetchDynamicConfig {
 				builder.append(line);
 			}
 			result = builder.toString();
-			debugLogger.info(result);
-
 			reader.close();
 			ipr.close();
 		} catch (IOException e) {
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/SmooksUtils.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/SmooksUtils.java
index e77c965..9b341d5 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/SmooksUtils.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/SmooksUtils.java
@@ -27,7 +27,7 @@ import javax.xml.transform.stream.StreamSource;
 import org.milyn.Smooks;
 import org.milyn.container.ExecutionContext;
 import org.milyn.payload.StringResult;
-import org.onap.dcaegen2.ves.domain.VesEvent;
+import org.onap.dcaegen2.ves.domain.ves7_0.VesEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/UniversalVesAdapter/src/main/resources/application.properties b/UniversalVesAdapter/src/main/resources/application.properties
index cd2d02b..db497c6 100644
--- a/UniversalVesAdapter/src/main/resources/application.properties
+++ b/UniversalVesAdapter/src/main/resources/application.properties
@@ -1 +1,2 @@
 server.port=8085
+defaultConfigFilelocation=kv.json
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/main/resources/kv.json b/UniversalVesAdapter/src/main/resources/kv.json
index 065ac64..e1b8d2a 100644
--- a/UniversalVesAdapter/src/main/resources/kv.json
+++ b/UniversalVesAdapter/src/main/resources/kv.json
@@ -1,21 +1,15 @@
-{"collectors": [
-    {
-        "identifier": "notify OID",
-        "subscriberTopic": "ONAP-COLLECTOR-SNMPTRAP",
-        "mapping-files": [{
-            "1.3.6.1.6.3.1.1.5.3": "<?xml version='1.0'?> <smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd'> <json:reader rootName='vesevent' keyWhitspaceReplacement='-'> <json:keyMap> <json:key from='date&amp;time' to='date-and-time' /> <\/json:keyMap> <\/json:reader> <jb:bean class='org.onap.dcaegen2.ves.domain.VesEvent' beanId='vesEvent' createOnElement='vesevent'> <jb:wiring property='event' beanIdRef='event'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.Event' beanId='event' createOnElement='vesevent'> <jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader'/> <jb:wiring property='faultFields' beanIdRef='faultFields'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'> <jb:expression property='version'>'3.0'<\/jb:expression> <jb:expression property='eventId'>'XXXX'<\/jb:expression> <jb:expression property='reportingEntityName'>'VesAdapter'<\/jb:expression> <jb:expression property='domain'>'fault'<\/jb:expression> <jb:expression property='eventName' execOnElement='vesevent' >commonEventHeader.domain+'_'+'_'+ faultFields.alarmCondition;<\/jb:expression> <jb:value property='sequence' data='0' default='0' decoder='Long'/> <jb:value property='lastEpochMicrosec' data='#/time-received' decoder='Double' /> <jb:value property='startEpochMicrosec' data='#/time-received' decoder='Double'/> <jb:expression property='priority'>'Medium'<\/jb:expression> <jb:value property='sourceName' data='#/agent-address'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.FaultFields' beanId='faultFields' createOnElement='vesevent'> <jb:value property='alarmCondition' data='#/trap-category' /> <jb:expression property='eventSeverity'>'MINOR'<\/jb:expression> <jb:expression property='eventSourceType'>'SNMP Agent'<\/jb:expression> <jb:expression property='specificProblem'>'SNMP Fault'<\/jb:expression> <jb:value property='faultFieldsVersion' data='2.0' default='2.0' decoder='Double' /> <jb:wiring property='alarmAdditionalInformation' beanIdRef='alarmAdditionalInformationroot'/> <jb:expression property='vfStatus'>'Active'<\/jb:expression> <\/jb:bean> <jb:bean class='java.util.ArrayList' beanId='alarmAdditionalInformationroot' createOnElement='vesevent'> <jb:wiring beanIdRef='alarmAdditionalInformation'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='varbinds/element'> <jb:value property='name' data='#/varbind_oid'/> <jb:value property='value' data='#/varbind_value' /> <\/jb:bean> <\/smooks-resource-list>",
-            ".1.3.6.1.4.1.74.2.46.12.1.1": "<?xml version='19.0'?> <smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd'> <json:reader rootName='vesevent' keyWhitspaceReplacement='-'> <json:keyMap> <json:key from='date&amp;time' to='date-and-time' /> <\/json:keyMap> <\/json:reader> <jb:bean class='org.onap.dcaegen2.ves.domain.VesEvent' beanId='vesEvent' createOnElement='vesevent'> <jb:wiring property='event' beanIdRef='event'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.Event' beanId='event' createOnElement='vesevent'> <jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader'/> <jb:wiring property='faultFields' beanIdRef='faultFields'/> <!--<jb:wiring property='measurementsForVfScalingFields' beanIdRef='measurementsForVfScalingFields'/> --> <\/jb:bean> <!--<jb:bean class='org.onap.dcaegen2.ves.domain.MeasurementsForVfScalingFields' beanId='measurementsForVfScalingFields' createOnElement='simple'> <jb:wiring property='additionalMeasurements' beanIdRef='additionalMeasurements'/> <\/jb:bean>--> <jb:bean class='org.onap.dcaegen2.ves.domain.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'> <jb:expression property='version'>'3.0'<\/jb:expression> <jb:expression property='eventId'>'XXXX'<\/jb:expression><!-- --> <jb:expression property='reportingEntityName'>'VesAdapter'<\/jb:expression> <jb:expression property='domain'>'fault'<\/jb:expression> <jb:expression property='eventName' execOnElement='vesevent' >commonEventHeader.domain+'_'+'_'+ faultFields.alarmCondition;<\/jb:expression> <jb:value property='sequence' data='0' default='0' decoder='Long'/> <jb:value property='lastEpochMicrosec' data='#/time-received' decoder='Double' /> <jb:value property='startEpochMicrosec' data='#/time-received' decoder='Double'/> <jb:expression property='priority'>'Medium'<\/jb:expression> <jb:expression property='sourceName'>'VesAdapter'<\/jb:expression> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.FaultFields' beanId='faultFields' createOnElement='vesevent'> <jb:value property='alarmCondition' data='#/trap-category' /> <jb:expression property='eventSeverity'>'MINOR'<\/jb:expression> <jb:expression property='eventSourceType'>'SNMP Agent'<\/jb:expression> <jb:expression property='specificProblem'>'SNMP Fault'<\/jb:expression> <jb:value property='faultFieldsVersion' data='2.0' default='2.0' decoder='Double' /> <jb:wiring property='alarmAdditionalInformation' beanIdRef='alarmAdditionalInformationroot'/> <jb:expression property='vfStatus'>'Active'<\/jb:expression> <\/jb:bean> <jb:bean class='java.util.ArrayList' beanId='alarmAdditionalInformationroot' createOnElement='vesevent'> <jb:wiring beanIdRef='alarmAdditionalInformation'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='varbinds/element'> <jb:value property='name' data='#/varbind_oid'/> <jb:value property='value' data='#/varbind_value' /> <\/jb:bean> <!--<jb:bean class='java.util.ArrayList' beanId='additionalMeasurements' createOnElement='simple'> <jb:wiring beanIdRef='additionalMeasurement'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.AdditionalMeasurement' beanId='additionalMeasurement' createOnElement='varbinds/element'> <jb:value property='name' data='#/varbind_value' /> <\/jb:bean> --> <\/smooks-resource-list>",
-            "eventname1": "SNMP xml mapping string",
-            "defaultMappingFile-ONAP-COLLECTOR-SNMPTRAP": "<?xml version='1.0'?> <smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd'> <json:reader rootName='vesevent' keyWhitspaceReplacement='-'> <json:keyMap> <json:key from='date&amp;time' to='date-and-time' /> <\/json:keyMap> <\/json:reader> <jb:bean class='org.onap.dcaegen2.ves.domain.VesEvent' beanId='vesEvent' createOnElement='vesevent'> <jb:wiring property='event' beanIdRef='event'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.Event' beanId='event' createOnElement='vesevent'> <jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader'/> <jb:wiring property='faultFields' beanIdRef='faultFields'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'> <jb:expression property='version'>'3.0'<\/jb:expression> <jb:expression property='eventId'>'XXXsnmp'<\/jb:expression> <jb:expression property='reportingEntityName'>'VesAdapter'<\/jb:expression> <jb:expression property='domain'>'fault'<\/jb:expression> <jb:expression property='eventName' execOnElement='vesevent' >commonEventHeader.domain+'_'+'_'+ faultFields.alarmCondition;<\/jb:expression> <jb:value property='sequence' data='0' default='0' decoder='Long'/> <jb:value property='lastEpochMicrosec' data='#/time-received' decoder='Double' /> <jb:value property='startEpochMicrosec' data='#/time-received' decoder='Double'/> <jb:expression property='priority'>'Medium'<\/jb:expression> <jb:value property='sourceName' data='#/agent-address'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.FaultFields' beanId='faultFields' createOnElement='vesevent'> <jb:value property='alarmCondition' data='#/trap-category' /> <jb:expression property='eventSeverity'>'MINOR'<\/jb:expression> <jb:expression property='eventSourceType'>'SNMP Agent'<\/jb:expression> <jb:expression property='specificProblem'>'SNMP Fault'<\/jb:expression> <jb:value property='faultFieldsVersion' data='2.0' default='2.0' decoder='Double' /> <jb:wiring property='alarmAdditionalInformation' beanIdRef='alarmAdditionalInformationroot'/> <jb:expression property='vfStatus'>'Active'<\/jb:expression> <\/jb:bean> <jb:bean class='java.util.ArrayList' beanId='alarmAdditionalInformationroot' createOnElement='vesevent'> <jb:wiring beanIdRef='alarmAdditionalInformation'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='varbinds/element'> <jb:value property='name' data='#/varbind_oid'/> <jb:value property='value' data='#/varbind_value' /> <\/jb:bean> <\/smooks-resource-list>"
-        }]
-    },
-    {
-        "identifier": "notification1-id",
-        "subscriberTopic": "ONAP-COLLECTOR-RESTCONFTRAP",
-        "mapping-files": [{
-            "defaultMappingFile-ONAP-COLLECTOR-RESTCONFTRAP": "<?xml version='1.0'?> <smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd'> <json:reader rootName='vesevent' keyWhitspaceReplacement='-'> <json:keyMap> <json:key from='date&amp;time' to='date-and-time' /> <\/json:keyMap> <\/json:reader> <jb:bean class='org.onap.dcaegen2.ves.domain.VesEvent' beanId='vesEvent' createOnElement='vesevent'> <jb:wiring property='event' beanIdRef='event'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.Event' beanId='event' createOnElement='vesevent'> <jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader'/> <jb:wiring property='faultFields' beanIdRef='faultFields'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'> <jb:expression property='version'>'3.0'<\/jb:expression> <jb:expression property='eventId'>'XXXRestConf'<\/jb:expression> <jb:expression property='reportingEntityName'>'VesAdapter'<\/jb:expression> <jb:expression property='domain'>'fault'<\/jb:expression> <jb:expression property='eventName' execOnElement='vesevent' >commonEventHeader.domain+'_'+'_'+ faultFields.alarmCondition;<\/jb:expression> <jb:value property='sequence' data='0' default='0' decoder='Long'/> <jb:value property='lastEpochMicrosec' data='#/time-received' decoder='Double' /> <jb:value property='startEpochMicrosec' data='#/time-received' decoder='Double'/> <jb:expression property='priority'>'Medium'<\/jb:expression> <jb:value property='sourceName' data='#/agent-address'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.FaultFields' beanId='faultFields' createOnElement='vesevent'> <jb:value property='alarmCondition' data='#/trap-category' /> <jb:expression property='eventSeverity'>'MINOR'<\/jb:expression> <jb:expression property='eventSourceType'>'SNMP Agent'<\/jb:expression> <jb:expression property='specificProblem'>'SNMP Fault'<\/jb:expression> <jb:value property='faultFieldsVersion' data='2.0' default='2.0' decoder='Double' /> <jb:wiring property='alarmAdditionalInformation' beanIdRef='alarmAdditionalInformationroot'/> <jb:expression property='vfStatus'>'Active'<\/jb:expression> <\/jb:bean> <jb:bean class='java.util.ArrayList' beanId='alarmAdditionalInformationroot' createOnElement='vesevent'> <jb:wiring beanIdRef='alarmAdditionalInformation'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='varbinds/element'> <jb:value property='name' data='#/varbind_oid'/> <jb:value property='value' data='#/varbind_value' /> <\/jb:bean> <\/smooks-resource-list>",
-            "eventname2": "rest conf xml mapping string",
-            "2541256": "<?xml version2='1.0'?> <smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:core='http://www.milyn.org/xsd/smooks/smooks-core-1.4.xsd'> <core:namespaces> <core:namespace prefix='ietf-restconf' uri='http://urn:ietf:params:xml:ns:yang:ietf-restconf '/> <core:namespace prefix='ietf-yang-patch' uri='http://urn:ietf:params:xml:ns:yang:ietf-yang-patch'/> <core:namespace prefix='ietf-yang-push' uri='http://urn:ietf:params:xml:ns:yang:ietf-yang-push'/> <core:namespace prefix='ietf-network-topology' uri='http://urn:ietf:params:xml:ns:yang:ietf-network-topology'/> <\/core:namespaces> <json:reader rootName='vesevent' keyWhitspaceReplacement='-'> <json:keyMap> <json:key from='date&amp;time' to='date-and-time'/> <json:key from='ietf-restconf:notification'>notification<\/json:key> <json:key from='ietf-yang-push:push-change-update'>push-change-update<\/json:key> <json:key from='ietf-yang-patch:yang-patch'>yang-patch<\/json:key> <json:key from='ietf-network-topology:termination-point'>termination-point<\/json:key> <\/json:keyMap> <\/json:reader> <jb:bean class='org.onap.dcaegen2.ves.domain.VesEvent' beanId='vesEvent' createOnElement='vesevent'> <jb:wiring property='event' beanIdRef='event'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.Event' beanId='event' createOnElement='vesevent'> <jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader'/> <jb:wiring property='faultFields' beanIdRef='faultFields'/> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'> <jb:value property='sourceId' data='#/notification/push-change-update/datastore-changes/yang-patch/edit/element/target'/> <jb:value property='startEpochMicrosec' data='0' default='1413378172000000' decoder='Double'/> <!-- <jb:expression property='eventId'>'ab305d54-85b4-a31b-7db2-fb6b977766'<\/jb:expression> --> <jb:value property='eventId' data='#/notification/push-change-update/datastore-changes/yang-patch/edit/element/value/termination-point/element/supporting-termination-point/element/network-ref'/> <!-- /termination-point/element/supporting-termination-point/element/network-ref--> <jb:value property='sequence' data='0' default='0' decoder='Long'/> <jb:expression property='domain'>'fault'<\/jb:expression> <jb:value property='lastEpochMicrosec' data='0' default='1413378172000033' decoder='Double'/> <jb:expression property='eventName'>'fault_Status_Change'<\/jb:expression> <jb:value property='sourceName' data='#/notification/push-change-update/datastore-changes/yang-patch/edit/element/target'/> <jb:expression property='priority'>'High'<\/jb:expression> <jb:expression property='version'>'3.0'<\/jb:expression> <jb:expression property='reportingEntityName'>'Domain_Contorller'<\/jb:expression> <\/jb:bean> <jb:bean class='org.onap.dcaegen2.ves.domain.FaultFields' beanId='faultFields' createOnElement='vesevent'> <jb:expression property='eventSeverity'>'CRITICAL'<\/jb:expression> <jb:expression property='alarmCondition'>'Route_Status'<\/jb:expression> <jb:value property='faultFieldsVersion' data='2.0' default='2.0' decoder='Double' /> <jb:expression property='specificProblem'>'Fault_SOTN_Service_Status'<\/jb:expression> <jb:wiring property='alarmAdditionalInformation' beanIdRef='alarmAdditionalInformationroot'/> <jb:expression property='eventSourceType'>'other'<\/jb:expression> <jb:expression property='vfStatus'>'Active'<\/jb:expression> <\/jb:bean> <jb:bean class='java.util.ArrayList' beanId='alarmAdditionalInformationroot' createOnElement='vesevent'> <jb:wiring beanIdRef='alarmAdditionalInformation'/> <\/jb:bean> <!-- createOnElement='/notification/push-change-update/datastore-changes/yang-patch/varbinds/element' #/notification/push-change-update/datastore-changes/yang-patch/varbinds/element/varbind_value' and createOnElement='vesevent' in this case last element from array will be fetach varbinds/element --> <!-- <jb:bean class='org.onap.dcaegen2.ves.domain.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='/notification/push-change-update/datastore-changes/yang-patch/varbinds/element'> <jb:value property='name' data='#/varbind_oid'/> <jb:value property='value' data='#/varbind_value' /> <\/jb:bean> --> <jb:bean class='org.onap.dcaegen2.ves.domain.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='varbinds/element'> <jb:value property='name' data='#/varbind_oid'/> <jb:value property='value' data='#/varbind_value' /> <\/jb:bean> <\/smooks-resource-list>"
-        }]
-    }
-]}
\ No newline at end of file
+{  
+  "app_preferences":{  
+    "collectors":[  
+      {  
+        "identifier":"notification-id",
+        "subscriberTopic":"ONAP-COLLECTOR-RESTCONFTRAP",
+        "mapping-files":[  
+          {  
+            "defaultMappingFile-ONAP-COLLECTOR-RESTCONFTRAP":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /><\/json:keyMap><\/json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Version._4_0_1<\/jb:expression><jb:expression property='eventType'>'pnfRegistration'<\/jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1<\/jb:expression><jb:expression property='reportingEntityName'>'VESMapper'<\/jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain<\/jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Priority.NORMAL<\/jb:expression><jb:value property='sourceName' data='notification/message/target' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves7_0.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><jb:value property='serialNumber' data='notification/message/content/onu/sn' /><\/jb:bean><\/smooks-resource-list>"
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalFieldTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalFieldTest.java
deleted file mode 100644
index e082249..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalFieldTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class AdditionalFieldTest {
-    
-    @Autowired
-    AdditionalField additionalField = new AdditionalField();
-//    Object value1 = new Object();
-//    Map<String, Object> map = new HashMap<String, Object>();
-//
-//    @Test
-//    public void test() {
-//        additionalField.setAdditionalProperty("name", value1);
-//        additionalField.setName("name2");
-//        additionalField.setValue("value2");
-//        
-//        map.put("name", value1);
-//        assertEquals(additionalField.getName(),"name2");
-//        assertEquals(additionalField.getValue(),"value2");
-//        assertEquals(additionalField.getAdditionalProperties(),map);
-//        assert (additionalField.toString() != null);
-//        assert (additionalField.hashCode() != 0);
-//    }
-    
-    @Test
-    public void testgetName() {
-    	additionalField.getName();
-    }
-    
-    @Test
-    public void testsetName() {
-    	additionalField.setName("Test");
-    }
-
-    @Test
-    public void testgetValue() {
-    	additionalField.getValue();
-    }
-    
-    @Test
-    public void testsetValue() {
-    	additionalField.setValue("Test");
-    }
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalInformationTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalInformationTest.java
deleted file mode 100644
index 058cb79..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalInformationTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class AdditionalInformationTest {
-	@Autowired
-    AdditionalInformation ai = new AdditionalInformation();
-	Object value;
-	Map<String, Object> additionalProperties = new HashMap<String, Object>(); 
-	
-
-	@Test
-	public void testAdditionalInformation() {
-		
-		ai.setName("name");
-		ai.setValue("value");
-		ai.setAdditionalProperty("name", value);
-		assertEquals(ai.getName(), "name");
-		assertEquals(ai.getValue(), "value");
-		additionalProperties.put("name", value);
-		assertEquals(additionalProperties, ai.getAdditionalProperties()); 
-		assert (ai.toString() != null);
-	    assert (ai.hashCode() != 0);
-	    assertEquals(true, ai.equals(ai)); 
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalMeasurementTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalMeasurementTest.java
deleted file mode 100644
index 58a2507..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalMeasurementTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class AdditionalMeasurementTest {
-
-	private AdditionalMeasurement createTestSubject() {
-		return new AdditionalMeasurement();
-	}
-
-	@Test
-	public void testGetName() throws Exception {
-		AdditionalMeasurement testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getName();
-	}
-
-	@Test
-	public void testSetName() throws Exception {
-		AdditionalMeasurement testSubject;
-		String name = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setName(name);
-	}
-
-	@Test
-	public void testGetArrayOfFields() throws Exception {
-		AdditionalMeasurement testSubject;
-		List<ArrayOfField> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getArrayOfFields();
-	}
-
-	@Test
-	public void testSetArrayOfFields() throws Exception {
-		AdditionalMeasurement testSubject;
-		List<ArrayOfField> arrayOfFields = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setArrayOfFields(arrayOfFields);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		AdditionalMeasurement testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		AdditionalMeasurement testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		AdditionalMeasurement testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		AdditionalMeasurement testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		AdditionalMeasurement testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalObjectTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalObjectTest.java
deleted file mode 100644
index d3750ed..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalObjectTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class AdditionalObjectTest {
-
-	private AdditionalObject createTestSubject() {
-		return new AdditionalObject();
-	}
-
-	@Test
-	public void testGetObjectInstances() throws Exception {
-		AdditionalObject testSubject;
-		List<ObjectInstance> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getObjectInstances();
-	}
-
-	@Test
-	public void testSetObjectInstances() throws Exception {
-		AdditionalObject testSubject;
-		List<ObjectInstance> objectInstances = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setObjectInstances(objectInstances);
-	}
-
-	@Test
-	public void testGetObjectName() throws Exception {
-		AdditionalObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getObjectName();
-	}
-
-	@Test
-	public void testSetObjectName() throws Exception {
-		AdditionalObject testSubject;
-		String objectName = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setObjectName(objectName);
-	}
-
-	@Test
-	public void testGetObjectSchema() throws Exception {
-		AdditionalObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getObjectSchema();
-	}
-
-	@Test
-	public void testSetObjectSchema() throws Exception {
-		AdditionalObject testSubject;
-		String objectSchema = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setObjectSchema(objectSchema);
-	}
-
-	@Test
-	public void testGetObjectSchemaUrl() throws Exception {
-		AdditionalObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getObjectSchemaUrl();
-	}
-
-	@Test
-	public void testSetObjectSchemaUrl() throws Exception {
-		AdditionalObject testSubject;
-		String objectSchemaUrl = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setObjectSchemaUrl(objectSchemaUrl);
-	}
-
-	@Test
-	public void testGetNfSubscribedObjectName() throws Exception {
-		AdditionalObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNfSubscribedObjectName();
-	}
-
-	@Test
-	public void testSetNfSubscribedObjectName() throws Exception {
-		AdditionalObject testSubject;
-		String nfSubscribedObjectName = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNfSubscribedObjectName(nfSubscribedObjectName);
-	}
-
-	@Test
-	public void testGetNfSubscriptionId() throws Exception {
-		AdditionalObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNfSubscriptionId();
-	}
-
-	@Test
-	public void testSetNfSubscriptionId() throws Exception {
-		AdditionalObject testSubject;
-		String nfSubscriptionId = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNfSubscriptionId(nfSubscriptionId);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		AdditionalObject testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		AdditionalObject testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		AdditionalObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		AdditionalObject testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		AdditionalObject testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalParameterTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalParameterTest.java
deleted file mode 100644
index 9b64ddd..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AdditionalParameterTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-public class AdditionalParameterTest {
-
-	private AdditionalParameter createTestSubject() {
-		return new AdditionalParameter();
-	}
-
-	@Test
-	public void testGetCriticality() throws Exception {
-		AdditionalParameter testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getCriticality();
-		
-	}
-
-	@Test
-	public void testSetCriticality() throws Exception {
-		AdditionalParameter testSubject;
-		String criticality = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setCriticality(criticality);
-	}
-
-	@Test
-	public void testGetName() throws Exception {
-		AdditionalParameter testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getName();
-		
-	}
-
-	@Test
-	public void testSetName() throws Exception {
-		AdditionalParameter testSubject;
-		String name = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setName(name);
-	}
-
-	@Test
-	public void testGetThresholdCrossed() throws Exception {
-		AdditionalParameter testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getThresholdCrossed();
-		
-	}
-
-	@Test
-	public void testSetThresholdCrossed() throws Exception {
-		AdditionalParameter testSubject;
-		String thresholdCrossed = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setThresholdCrossed(thresholdCrossed);
-	}
-
-	@Test
-	public void testGetValue() throws Exception {
-		AdditionalParameter testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getValue();
-		
-	}
-
-	@Test
-	public void testSetValue() throws Exception {
-		AdditionalParameter testSubject;
-		String value = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setValue(value);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		AdditionalParameter testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-		
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		AdditionalParameter testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		AdditionalParameter testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-		
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		AdditionalParameter testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-		
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		AdditionalParameter testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-		
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AlarmAdditionalInformationTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AlarmAdditionalInformationTest.java
deleted file mode 100644
index a481729..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/AlarmAdditionalInformationTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class AlarmAdditionalInformationTest {
-
-   @Autowired
-   AlarmAdditionalInformation alarmAdditionalInformation = new AlarmAdditionalInformation();
-   Object value1 = new Object();
-   Map<String, Object> map = new HashMap<String, Object>();
-   
-       
-    
-    @Test
-    public void test() {
-        alarmAdditionalInformation.setAdditionalProperty("name", value1);
-        alarmAdditionalInformation.setName("name2");
-        alarmAdditionalInformation.setValue("value2");
-        
-        map.put("name", value1);
-        assertEquals(alarmAdditionalInformation.getName(),"name2");
-        assertEquals(alarmAdditionalInformation.getValue(),"value2");
-        assertEquals(alarmAdditionalInformation.getAdditionalProperties(),map);
-        assert (alarmAdditionalInformation.toString() != null);
-        assert (alarmAdditionalInformation.hashCode() != 0);
-        
-        
-     }
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ArrayOfField_Test.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ArrayOfField_Test.java
deleted file mode 100644
index a4cd280..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ArrayOfField_Test.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class ArrayOfField_Test {
-    @Autowired
-    ArrayOfField_  arrayOfField = new  ArrayOfField_();
-    Object value1 = new Object();
-    Map<String, Object> map = new HashMap<String, Object>();
-    
-        
-     
-     @Test
-     public void test() {
-         arrayOfField.setAdditionalProperty("name", value1);
-         arrayOfField.setName("name2");
-         arrayOfField.setValue("value2");
-         
-         map.put("name", value1);
-         assertEquals (arrayOfField.getName(),"name2");
-         assertEquals (arrayOfField.getValue(),"value2");
-         assertEquals (arrayOfField.getAdditionalProperties(),map);
-         assert (arrayOfField.toString() != null);
-         assert (arrayOfField.hashCode() != 0);
-         
-}
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/CodecUsageArrayTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/CodecUsageArrayTest.java
deleted file mode 100644
index dc79f44..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/CodecUsageArrayTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class CodecUsageArrayTest {
-
-	@Autowired
-	CodecUsageArray codecUsageArray = new CodecUsageArray();
-	Object value;
-	Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	
-	@Test
-	public void test() {
-		codecUsageArray.setAdditionalProperty("name", value);
-		codecUsageArray.setCodecIdentifier("test");
-		codecUsageArray.setNumberInUse(1L);
-		additionalProperties.put("name", value);
-		
-
-		assertEquals(additionalProperties, codecUsageArray.getAdditionalProperties());
-		assertEquals("test", codecUsageArray.getCodecIdentifier());
-		assertEquals(new Long(1L), codecUsageArray.getNumberInUse());
-		assert (codecUsageArray.toString() != null);
-        assert (codecUsageArray.hashCode() != 0);
-        assertEquals(true, codecUsageArray.equals(codecUsageArray));
-		
-		
-	
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/CommonEventHeaderTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/CommonEventHeaderTest.java
deleted file mode 100644
index b015d63..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/CommonEventHeaderTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class CommonEventHeaderTest {
-
-    @Autowired
-    CommonEventHeader commonEventHeader = new CommonEventHeader();
-    Object value =new Object();
-    private Map<String, Object> map = new HashMap<String, Object>();
-    @Mock
-    InternalHeaderFields internalHeaderFields = new InternalHeaderFields();
-    
-    @Test
-    public void test() {
-        
-        commonEventHeader.setDomain("Domain");
-        commonEventHeader.setEventId("EventID");
-        commonEventHeader.setEventName("EventName");
-        commonEventHeader.setEventType("EventType");
-        commonEventHeader.setLastEpochMicrosec(11.25);
-        commonEventHeader.setAdditionalProperty("name", value);
-        commonEventHeader.setInternalHeaderFields(internalHeaderFields);
-        commonEventHeader.setNfcNamingCode("nfcNamingCode");
-        commonEventHeader.setNfNamingCode("nfNamingCode");
-        commonEventHeader.setPriority("priority");
-        commonEventHeader.setReportingEntityId("reportingEntityId");
-        commonEventHeader.setReportingEntityName("reportingEntityName");
-        commonEventHeader.setSequence(1L);
-        commonEventHeader.setSourceId("sourceId");
-        commonEventHeader.setSourceName("sourceName");
-        commonEventHeader.setStartEpochMicrosec(11.1);
-        commonEventHeader.setVersion(1.2);
-        map.put("name", value);
-        
-        assertEquals (commonEventHeader.getDomain(),"Domain");
-        assertEquals (commonEventHeader.getEventId(),"EventID");
-        assertEquals (commonEventHeader.getEventName(),"EventName");
-        assertEquals (commonEventHeader.getEventType(),"EventType");
-        assertEquals(commonEventHeader.getLastEpochMicrosec(), new Double(11.25));
-       
-        assertEquals (commonEventHeader.getAdditionalProperties(),map);
-        assertEquals (commonEventHeader.getInternalHeaderFields(),internalHeaderFields);
-        assertEquals (commonEventHeader.getNfcNamingCode(),"nfcNamingCode");
-        assertEquals (commonEventHeader.getNfNamingCode(),"nfNamingCode");
-        assertEquals (commonEventHeader.getPriority(),"priority");
-        assertEquals (commonEventHeader.getReportingEntityId(),"reportingEntityId");
-        assertEquals (commonEventHeader.getReportingEntityName(),"reportingEntityName");
-        assertEquals (commonEventHeader.getSequence(),new Long(1L));
-        assertEquals (commonEventHeader.getSourceId(),"sourceId");
-        assertEquals (commonEventHeader.getSourceName(),"sourceName");
-        assertEquals (commonEventHeader.getStartEpochMicrosec(),new Double(11.1));
-        assertEquals (commonEventHeader.getVersion(),new Double(1.2));
-        
-        assert (commonEventHeader.toString() != null);
-        assert (commonEventHeader.hashCode() != 0);
-        
-        
-        
-        
-    }
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/CpuUsageArrayTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/CpuUsageArrayTest.java
deleted file mode 100644
index c7d3e3b..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/CpuUsageArrayTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class CpuUsageArrayTest {
-	
-	@Autowired
-	CpuUsageArray cpuUsageArray = new CpuUsageArray();
-	Object value;
-	Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	@Test
-	public void test() {
-		
-		cpuUsageArray.setAdditionalProperty("name", value);
-		cpuUsageArray.setCpuIdentifier("test");
-		cpuUsageArray.setCpuIdle(2.2);
-		cpuUsageArray.setCpuUsageInterrupt(2.2);
-		cpuUsageArray.setCpuUsageNice(2.2);
-		cpuUsageArray.setCpuUsageSoftIrq(2.2);
-		cpuUsageArray.setCpuUsageSteal(2.2);
-		cpuUsageArray.setCpuUsageSystem(2.2);
-		cpuUsageArray.setCpuUsageUser(2.2);
-		cpuUsageArray.setCpuWait(2.2);
-		cpuUsageArray.setPercentUsage(2.2);
-		additionalProperties.put("name", value);
-		
-		assertEquals(additionalProperties, cpuUsageArray.getAdditionalProperties());
-		assertEquals(new Double(2.2), cpuUsageArray.getCpuIdle());
-		assertEquals("test", cpuUsageArray.getCpuIdentifier());
-		assertEquals(new Double(2.2), cpuUsageArray.getCpuUsageInterrupt());
-		assertEquals(new Double(2.2), cpuUsageArray.getCpuUsageNice());
-		assertEquals(new Double(2.2), cpuUsageArray.getCpuUsageSoftIrq());
-		assertEquals(new Double(2.2), cpuUsageArray.getCpuUsageSteal());
-		assertEquals(new Double(2.2), cpuUsageArray.getCpuUsageSystem());
-		assertEquals(new Double(2.2), cpuUsageArray.getCpuUsageUser());
-		assertEquals(new Double(2.2), cpuUsageArray.getCpuWait());
-		assertEquals(new Double(2.2), cpuUsageArray.getPercentUsage());
-		assert (cpuUsageArray.toString() != null);
-        assert (cpuUsageArray.hashCode() != 0);
-        assertEquals(true, cpuUsageArray.equals(cpuUsageArray));
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/DiskUsageArrayTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/DiskUsageArrayTest.java
deleted file mode 100644
index eb34e1d..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/DiskUsageArrayTest.java
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-public class DiskUsageArrayTest {
-
-	private DiskUsageArray createTestSubject() {
-		return new DiskUsageArray();
-	}
-
-	@Test
-	public void testGetDiskIdentifier() throws Exception {
-		DiskUsageArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskIdentifier();
-	}
-
-	@Test
-	public void testSetDiskIdentifier() throws Exception {
-		DiskUsageArray testSubject;
-		String diskIdentifier = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskIdentifier(diskIdentifier);
-	}
-
-	@Test
-	public void testGetDiskIoTimeAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskIoTimeAvg();
-	}
-
-	@Test
-	public void testSetDiskIoTimeAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskIoTimeAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskIoTimeAvg(diskIoTimeAvg);
-	}
-
-	@Test
-	public void testGetDiskIoTimeLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskIoTimeLast();
-	}
-
-	@Test
-	public void testSetDiskIoTimeLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskIoTimeLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskIoTimeLast(diskIoTimeLast);
-	}
-
-	@Test
-	public void testGetDiskIoTimeMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskIoTimeMax();
-	}
-
-	@Test
-	public void testSetDiskIoTimeMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskIoTimeMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskIoTimeMax(diskIoTimeMax);
-	}
-
-	@Test
-	public void testGetDiskIoTimeMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskIoTimeMin();
-	}
-
-	@Test
-	public void testSetDiskIoTimeMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskIoTimeMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskIoTimeMin(diskIoTimeMin);
-	}
-
-	@Test
-	public void testGetDiskMergedReadAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskMergedReadAvg();
-	}
-
-	@Test
-	public void testSetDiskMergedReadAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskMergedReadAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskMergedReadAvg(diskMergedReadAvg);
-	}
-
-	@Test
-	public void testGetDiskMergedReadLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskMergedReadLast();
-	}
-
-	@Test
-	public void testSetDiskMergedReadLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskMergedReadLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskMergedReadLast(diskMergedReadLast);
-	}
-
-	@Test
-	public void testGetDiskMergedReadMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskMergedReadMax();
-	}
-
-	@Test
-	public void testSetDiskMergedReadMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskMergedReadMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskMergedReadMax(diskMergedReadMax);
-	}
-
-	@Test
-	public void testGetDiskMergedReadMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskMergedReadMin();
-	}
-
-	@Test
-	public void testSetDiskMergedReadMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskMergedReadMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskMergedReadMin(diskMergedReadMin);
-	}
-
-	@Test
-	public void testGetDiskMergedWriteAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskMergedWriteAvg();
-	}
-
-	@Test
-	public void testSetDiskMergedWriteAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskMergedWriteAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskMergedWriteAvg(diskMergedWriteAvg);
-	}
-
-	@Test
-	public void testGetDiskMergedWriteLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskMergedWriteLast();
-	}
-
-	@Test
-	public void testSetDiskMergedWriteLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskMergedWriteLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskMergedWriteLast(diskMergedWriteLast);
-	}
-
-	@Test
-	public void testGetDiskMergedWriteMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskMergedWriteMax();
-	}
-
-	@Test
-	public void testSetDiskMergedWriteMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskMergedWriteMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskMergedWriteMax(diskMergedWriteMax);
-	}
-
-	@Test
-	public void testGetDiskMergedWriteMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskMergedWriteMin();
-	}
-
-	@Test
-	public void testSetDiskMergedWriteMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskMergedWriteMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskMergedWriteMin(diskMergedWriteMin);
-	}
-
-	@Test
-	public void testGetDiskOctetsReadAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOctetsReadAvg();
-	}
-
-	@Test
-	public void testSetDiskOctetsReadAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOctetsReadAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOctetsReadAvg(diskOctetsReadAvg);
-	}
-
-	@Test
-	public void testGetDiskOctetsReadLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOctetsReadLast();
-	}
-
-	@Test
-	public void testSetDiskOctetsReadLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOctetsReadLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOctetsReadLast(diskOctetsReadLast);
-	}
-
-	@Test
-	public void testGetDiskOctetsReadMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOctetsReadMax();
-	}
-
-	@Test
-	public void testSetDiskOctetsReadMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOctetsReadMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOctetsReadMax(diskOctetsReadMax);
-	}
-
-	@Test
-	public void testGetDiskOctetsReadMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOctetsReadMin();
-	}
-
-	@Test
-	public void testSetDiskOctetsReadMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOctetsReadMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOctetsReadMin(diskOctetsReadMin);
-	}
-
-	@Test
-	public void testGetDiskOctetsWriteAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOctetsWriteAvg();
-	}
-
-	@Test
-	public void testSetDiskOctetsWriteAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOctetsWriteAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOctetsWriteAvg(diskOctetsWriteAvg);
-	}
-
-	@Test
-	public void testGetDiskOctetsWriteLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOctetsWriteLast();
-	}
-
-	@Test
-	public void testSetDiskOctetsWriteLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOctetsWriteLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOctetsWriteLast(diskOctetsWriteLast);
-	}
-
-	@Test
-	public void testGetDiskOctetsWriteMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOctetsWriteMax();
-	}
-
-	@Test
-	public void testSetDiskOctetsWriteMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOctetsWriteMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOctetsWriteMax(diskOctetsWriteMax);
-	}
-
-	@Test
-	public void testGetDiskOctetsWriteMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOctetsWriteMin();
-	}
-
-	@Test
-	public void testSetDiskOctetsWriteMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOctetsWriteMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOctetsWriteMin(diskOctetsWriteMin);
-	}
-
-	@Test
-	public void testGetDiskOpsReadAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOpsReadAvg();
-	}
-
-	@Test
-	public void testSetDiskOpsReadAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOpsReadAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOpsReadAvg(diskOpsReadAvg);
-	}
-
-	@Test
-	public void testGetDiskOpsReadLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOpsReadLast();
-	}
-
-	@Test
-	public void testSetDiskOpsReadLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOpsReadLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOpsReadLast(diskOpsReadLast);
-	}
-
-	@Test
-	public void testGetDiskOpsReadMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOpsReadMax();
-	}
-
-	@Test
-	public void testSetDiskOpsReadMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOpsReadMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOpsReadMax(diskOpsReadMax);
-	}
-
-	@Test
-	public void testGetDiskOpsReadMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOpsReadMin();
-	}
-
-	@Test
-	public void testSetDiskOpsReadMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOpsReadMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOpsReadMin(diskOpsReadMin);
-	}
-
-	@Test
-	public void testGetDiskOpsWriteAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOpsWriteAvg();
-	}
-
-	@Test
-	public void testSetDiskOpsWriteAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOpsWriteAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOpsWriteAvg(diskOpsWriteAvg);
-	}
-
-	@Test
-	public void testGetDiskOpsWriteLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOpsWriteLast();
-	}
-
-	@Test
-	public void testSetDiskOpsWriteLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOpsWriteLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOpsWriteLast(diskOpsWriteLast);
-	}
-
-	@Test
-	public void testGetDiskOpsWriteMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOpsWriteMax();
-	}
-
-	@Test
-	public void testSetDiskOpsWriteMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOpsWriteMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOpsWriteMax(diskOpsWriteMax);
-	}
-
-	@Test
-	public void testGetDiskOpsWriteMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskOpsWriteMin();
-	}
-
-	@Test
-	public void testSetDiskOpsWriteMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskOpsWriteMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskOpsWriteMin(diskOpsWriteMin);
-	}
-
-	@Test
-	public void testGetDiskPendingOperationsAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskPendingOperationsAvg();
-	}
-
-	@Test
-	public void testSetDiskPendingOperationsAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskPendingOperationsAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskPendingOperationsAvg(diskPendingOperationsAvg);
-	}
-
-	@Test
-	public void testGetDiskPendingOperationsLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskPendingOperationsLast();
-	}
-
-	@Test
-	public void testSetDiskPendingOperationsLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskPendingOperationsLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskPendingOperationsLast(diskPendingOperationsLast);
-	}
-
-	@Test
-	public void testGetDiskPendingOperationsMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskPendingOperationsMax();
-	}
-
-	@Test
-	public void testSetDiskPendingOperationsMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskPendingOperationsMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskPendingOperationsMax(diskPendingOperationsMax);
-	}
-
-	@Test
-	public void testGetDiskPendingOperationsMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskPendingOperationsMin();
-	}
-
-	@Test
-	public void testSetDiskPendingOperationsMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskPendingOperationsMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskPendingOperationsMin(diskPendingOperationsMin);
-	}
-
-	@Test
-	public void testGetDiskTimeReadAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskTimeReadAvg();
-	}
-
-	@Test
-	public void testSetDiskTimeReadAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskTimeReadAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskTimeReadAvg(diskTimeReadAvg);
-	}
-
-	@Test
-	public void testGetDiskTimeReadLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskTimeReadLast();
-	}
-
-	@Test
-	public void testSetDiskTimeReadLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskTimeReadLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskTimeReadLast(diskTimeReadLast);
-	}
-
-	@Test
-	public void testGetDiskTimeReadMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskTimeReadMax();
-	}
-
-	@Test
-	public void testSetDiskTimeReadMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskTimeReadMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskTimeReadMax(diskTimeReadMax);
-	}
-
-	@Test
-	public void testGetDiskTimeReadMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskTimeReadMin();
-	}
-
-	@Test
-	public void testSetDiskTimeReadMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskTimeReadMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskTimeReadMin(diskTimeReadMin);
-	}
-
-	@Test
-	public void testGetDiskTimeWriteAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskTimeWriteAvg();
-	}
-
-	@Test
-	public void testSetDiskTimeWriteAvg() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskTimeWriteAvg = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskTimeWriteAvg(diskTimeWriteAvg);
-	}
-
-	@Test
-	public void testGetDiskTimeWriteLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskTimeWriteLast();
-	}
-
-	@Test
-	public void testSetDiskTimeWriteLast() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskTimeWriteLast = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskTimeWriteLast(diskTimeWriteLast);
-	}
-
-	@Test
-	public void testGetDiskTimeWriteMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskTimeWriteMax();
-	}
-
-	@Test
-	public void testSetDiskTimeWriteMax() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskTimeWriteMax = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskTimeWriteMax(diskTimeWriteMax);
-	}
-
-	@Test
-	public void testGetDiskTimeWriteMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskTimeWriteMin();
-	}
-
-	@Test
-	public void testSetDiskTimeWriteMin() throws Exception {
-		DiskUsageArray testSubject;
-		Double diskTimeWriteMin = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskTimeWriteMin(diskTimeWriteMin);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		DiskUsageArray testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		DiskUsageArray testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		DiskUsageArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		DiskUsageArray testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		DiskUsageArray testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/EndOfCallVqmSummariesTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/EndOfCallVqmSummariesTest.java
deleted file mode 100644
index 56aacc1..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/EndOfCallVqmSummariesTest.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-public class EndOfCallVqmSummariesTest {
-
-	private EndOfCallVqmSummaries createTestSubject() {
-		return new EndOfCallVqmSummaries();
-	}
-
-	@Test
-	public void testGetAdjacencyName() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdjacencyName();
-	}
-
-	@Test
-	public void testSetAdjacencyName() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		String adjacencyName = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdjacencyName(adjacencyName);
-	}
-
-	@Test
-	public void testGetEndpointDescription() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEndpointDescription();
-	}
-
-	@Test
-	public void testSetEndpointDescription() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		String endpointDescription = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEndpointDescription(endpointDescription);
-	}
-
-	@Test
-	public void testGetEndpointJitter() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEndpointJitter();
-	}
-
-	@Test
-	public void testSetEndpointJitter() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double endpointJitter = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEndpointJitter(endpointJitter);
-	}
-
-	@Test
-	public void testGetEndpointRtpOctetsDiscarded() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEndpointRtpOctetsDiscarded();
-	}
-
-	@Test
-	public void testSetEndpointRtpOctetsDiscarded() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double endpointRtpOctetsDiscarded = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEndpointRtpOctetsDiscarded(endpointRtpOctetsDiscarded);
-	}
-
-	@Test
-	public void testGetEndpointRtpOctetsReceived() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEndpointRtpOctetsReceived();
-	}
-
-	@Test
-	public void testSetEndpointRtpOctetsReceived() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double endpointRtpOctetsReceived = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEndpointRtpOctetsReceived(endpointRtpOctetsReceived);
-	}
-
-	@Test
-	public void testGetEndpointRtpOctetsSent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEndpointRtpOctetsSent();
-	}
-
-	@Test
-	public void testSetEndpointRtpOctetsSent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double endpointRtpOctetsSent = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEndpointRtpOctetsSent(endpointRtpOctetsSent);
-	}
-
-	@Test
-	public void testGetEndpointRtpPacketsDiscarded() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEndpointRtpPacketsDiscarded();
-	}
-
-	@Test
-	public void testSetEndpointRtpPacketsDiscarded() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double endpointRtpPacketsDiscarded = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEndpointRtpPacketsDiscarded(endpointRtpPacketsDiscarded);
-	}
-
-	@Test
-	public void testGetEndpointRtpPacketsReceived() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEndpointRtpPacketsReceived();
-	}
-
-	@Test
-	public void testSetEndpointRtpPacketsReceived() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double endpointRtpPacketsReceived = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEndpointRtpPacketsReceived(endpointRtpPacketsReceived);
-	}
-
-	@Test
-	public void testGetEndpointRtpPacketsSent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEndpointRtpPacketsSent();
-	}
-
-	@Test
-	public void testSetEndpointRtpPacketsSent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double endpointRtpPacketsSent = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEndpointRtpPacketsSent(endpointRtpPacketsSent);
-	}
-
-	@Test
-	public void testGetLocalJitter() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLocalJitter();
-	}
-
-	@Test
-	public void testSetLocalJitter() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double localJitter = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLocalJitter(localJitter);
-	}
-
-	@Test
-	public void testGetLocalRtpOctetsDiscarded() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLocalRtpOctetsDiscarded();
-	}
-
-	@Test
-	public void testSetLocalRtpOctetsDiscarded() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double localRtpOctetsDiscarded = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLocalRtpOctetsDiscarded(localRtpOctetsDiscarded);
-	}
-
-	@Test
-	public void testGetLocalRtpOctetsReceived() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLocalRtpOctetsReceived();
-	}
-
-	@Test
-	public void testSetLocalRtpOctetsReceived() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double localRtpOctetsReceived = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLocalRtpOctetsReceived(localRtpOctetsReceived);
-	}
-
-	@Test
-	public void testGetLocalRtpOctetsSent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLocalRtpOctetsSent();
-	}
-
-	@Test
-	public void testSetLocalRtpOctetsSent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double localRtpOctetsSent = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLocalRtpOctetsSent(localRtpOctetsSent);
-	}
-
-	@Test
-	public void testGetLocalRtpPacketsDiscarded() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLocalRtpPacketsDiscarded();
-	}
-
-	@Test
-	public void testSetLocalRtpPacketsDiscarded() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double localRtpPacketsDiscarded = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLocalRtpPacketsDiscarded(localRtpPacketsDiscarded);
-	}
-
-	@Test
-	public void testGetLocalRtpPacketsReceived() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLocalRtpPacketsReceived();
-	}
-
-	@Test
-	public void testSetLocalRtpPacketsReceived() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double localRtpPacketsReceived = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLocalRtpPacketsReceived(localRtpPacketsReceived);
-	}
-
-	@Test
-	public void testGetLocalRtpPacketsSent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLocalRtpPacketsSent();
-	}
-
-	@Test
-	public void testSetLocalRtpPacketsSent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double localRtpPacketsSent = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLocalRtpPacketsSent(localRtpPacketsSent);
-	}
-
-	@Test
-	public void testGetMosCqe() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMosCqe();
-	}
-
-	@Test
-	public void testSetMosCqe() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double mosCqe = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMosCqe(mosCqe);
-	}
-
-	@Test
-	public void testGetPacketsLost() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getPacketsLost();
-	}
-
-	@Test
-	public void testSetPacketsLost() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double packetsLost = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setPacketsLost(packetsLost);
-	}
-
-	@Test
-	public void testGetPacketLossPercent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getPacketLossPercent();
-	}
-
-	@Test
-	public void testSetPacketLossPercent() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double packetLossPercent = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setPacketLossPercent(packetLossPercent);
-	}
-
-	@Test
-	public void testGetRFactor() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getRFactor();
-	}
-
-	@Test
-	public void testSetRFactor() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double rFactor = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setRFactor(rFactor);
-	}
-
-	@Test
-	public void testGetRoundTripDelay() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getRoundTripDelay();
-	}
-
-	@Test
-	public void testSetRoundTripDelay() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Double roundTripDelay = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setRoundTripDelay(roundTripDelay);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		EndOfCallVqmSummaries testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/EventTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/EventTest.java
deleted file mode 100644
index 192abfb..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/EventTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class EventTest {
-
-    @Autowired
-    Event event = new Event();
-    @Mock
-    CommonEventHeader commonEventHeader = new CommonEventHeader();
-    @Mock
-    FaultFields faultFields = new FaultFields();
-    @Mock
-    HeartbeatFields heartbeatFields = new HeartbeatFields();
-    
-    @Test
-    public void test() {
-       event.setCommonEventHeader(commonEventHeader);
-       event.setFaultFields(faultFields);
-       event.setHeartbeatFields(heartbeatFields);
-       
-       assertEquals (event.getCommonEventHeader(),commonEventHeader);
-       assertEquals (event.getFaultFields(),faultFields);
-       assertEquals (event.getHeartbeatFields(),heartbeatFields);
-       
-       assert (event.toString() != null);
-       assert (event.hashCode() != 0);
-       
-       
-       
-    }
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/FaultFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/FaultFieldsTest.java
deleted file mode 100644
index 89a6533..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/FaultFieldsTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.antlr.grammar.v3.ANTLRParser.action_return;
-//import org.apache.bcel.generic.NEW;
-import org.junit.Test;
-
-public class FaultFieldsTest {
-
-    FaultFields ff=new FaultFields();
-    Object o=new Object();
-    Object o2=new Object();
-    List<AlarmAdditionalInformation> alarmAdditionalInformation;
-    Map<String, Object> a = new HashMap<String, Object>();
-    @Test
-    public void test() {
-       
-       ff.setAdditionalProperty("name",o);
-       ff.setAlarmAdditionalInformation(alarmAdditionalInformation);
-       ff.setAlarmCondition("alarmCondition");
-       ff.setAlarmInterfaceA("alarmInterfaceA");
-       ff.setEventCategory("eventCategory");
-       ff.setEventSeverity("eventSeverity");
-       ff.setEventSourceType("eventSourceType");
-       ff.setFaultFieldsVersion(11.25);
-       ff.setSpecificProblem("specificProblem");
-       ff.setVfStatus("vfStatus");
-       a.put("name",o);
-       assertEquals(ff.getAdditionalProperties(),a);
-       assertEquals(ff.getAlarmAdditionalInformation(),alarmAdditionalInformation);
-       assertEquals(ff.getAlarmCondition(), "alarmCondition");
-       assertEquals(ff.getAlarmInterfaceA(), "alarmInterfaceA");
-       assertEquals(ff.getEventCategory(), "eventCategory");
-       assertEquals(ff.getEventSeverity(), "eventSeverity");
-       assertEquals(ff.getEventSourceType(), "eventSourceType");
-       assertEquals(ff.getSpecificProblem(), "specificProblem");
-       assert(ff.getFaultFieldsVersion().equals(11.25));
-       assertEquals(ff.getVfStatus(), "vfStatus");
-       assert(ff.toString()!=null);
-       assert(ff.hashCode()!=0);
-      // assert(equals(ff));
-       //assert(ff.equals(o)!=false);
-       //ff.equals(o);
-     // assert(ff.equals(o));
-      //assert(ff.equals(o2));
-   
-    }
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/FeatureUsageArrayTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/FeatureUsageArrayTest.java
deleted file mode 100644
index 5dfc74c..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/FeatureUsageArrayTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-public class FeatureUsageArrayTest {
-
-	private FeatureUsageArray createTestSubject() {
-		return new FeatureUsageArray();
-	}
-
-	@Test
-	public void testGetFeatureIdentifier() throws Exception {
-		FeatureUsageArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFeatureIdentifier();
-	}
-
-	@Test
-	public void testSetFeatureIdentifier() throws Exception {
-		FeatureUsageArray testSubject;
-		String featureIdentifier = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFeatureIdentifier(featureIdentifier);
-	}
-
-	@Test
-	public void testGetFeatureUtilization() throws Exception {
-		FeatureUsageArray testSubject;
-		Long result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFeatureUtilization();
-	}
-
-	@Test
-	public void testSetFeatureUtilization() throws Exception {
-		FeatureUsageArray testSubject;
-		Long featureUtilization = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFeatureUtilization(featureUtilization);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		FeatureUsageArray testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		FeatureUsageArray testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		FeatureUsageArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		FeatureUsageArray testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		FeatureUsageArray testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/FilesystemUsageArrayTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/FilesystemUsageArrayTest.java
deleted file mode 100644
index 36b8af6..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/FilesystemUsageArrayTest.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-public class FilesystemUsageArrayTest {
-
-	private FilesystemUsageArray createTestSubject() {
-		return new FilesystemUsageArray();
-	}
-
-	@Test
-	public void testGetBlockConfigured() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getBlockConfigured();
-	}
-
-	@Test
-	public void testSetBlockConfigured() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double blockConfigured = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setBlockConfigured(blockConfigured);
-	}
-
-	@Test
-	public void testGetBlockIops() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getBlockIops();
-	}
-
-	@Test
-	public void testSetBlockIops() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double blockIops = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setBlockIops(blockIops);
-	}
-
-	@Test
-	public void testGetBlockUsed() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getBlockUsed();
-	}
-
-	@Test
-	public void testSetBlockUsed() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double blockUsed = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setBlockUsed(blockUsed);
-	}
-
-	@Test
-	public void testGetEphemeralConfigured() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEphemeralConfigured();
-	}
-
-	@Test
-	public void testSetEphemeralConfigured() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double ephemeralConfigured = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEphemeralConfigured(ephemeralConfigured);
-	}
-
-	@Test
-	public void testGetEphemeralIops() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEphemeralIops();
-	}
-
-	@Test
-	public void testSetEphemeralIops() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double ephemeralIops = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEphemeralIops(ephemeralIops);
-	}
-
-	@Test
-	public void testGetEphemeralUsed() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEphemeralUsed();
-	}
-
-	@Test
-	public void testSetEphemeralUsed() throws Exception {
-		FilesystemUsageArray testSubject;
-		Double ephemeralUsed = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEphemeralUsed(ephemeralUsed);
-	}
-
-	@Test
-	public void testGetFilesystemName() throws Exception {
-		FilesystemUsageArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFilesystemName();
-	}
-
-	@Test
-	public void testSetFilesystemName() throws Exception {
-		FilesystemUsageArray testSubject;
-		String filesystemName = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFilesystemName(filesystemName);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		FilesystemUsageArray testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		FilesystemUsageArray testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		FilesystemUsageArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		FilesystemUsageArray testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		FilesystemUsageArray testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/GtpPerFlowMetricsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/GtpPerFlowMetricsTest.java
deleted file mode 100644
index d84f191..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/GtpPerFlowMetricsTest.java
+++ /dev/null
@@ -1,1084 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.List;
-import java.util.Map;
-import org.onap.dcaegen2.ves.domain.GtpPerFlowMetrics;
-import org.junit.Test;
-
-public class GtpPerFlowMetricsTest {
-
-	private GtpPerFlowMetrics createTestSubject() {
-		return new GtpPerFlowMetrics();
-	}
-
-	@Test
-	public void testGetAvgBitErrorRate() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAvgBitErrorRate();
-	}
-
-	@Test
-	public void testSetAvgBitErrorRate() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double avgBitErrorRate = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAvgBitErrorRate(avgBitErrorRate);
-	}
-
-	@Test
-	public void testGetAvgPacketDelayVariation() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAvgPacketDelayVariation();
-	}
-
-	@Test
-	public void testSetAvgPacketDelayVariation() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double avgPacketDelayVariation = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAvgPacketDelayVariation(avgPacketDelayVariation);
-	}
-
-	@Test
-	public void testGetAvgPacketLatency() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAvgPacketLatency();
-	}
-
-	@Test
-	public void testSetAvgPacketLatency() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double avgPacketLatency = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAvgPacketLatency(avgPacketLatency);
-	}
-
-	@Test
-	public void testGetAvgReceiveThroughput() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAvgReceiveThroughput();
-	}
-
-	@Test
-	public void testSetAvgReceiveThroughput() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double avgReceiveThroughput = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAvgReceiveThroughput(avgReceiveThroughput);
-	}
-
-	@Test
-	public void testGetAvgTransmitThroughput() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAvgTransmitThroughput();
-	}
-
-	@Test
-	public void testSetAvgTransmitThroughput() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double avgTransmitThroughput = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAvgTransmitThroughput(avgTransmitThroughput);
-	}
-
-	@Test
-	public void testGetFlowActivationEpoch() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowActivationEpoch();
-	}
-
-	@Test
-	public void testSetFlowActivationEpoch() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double flowActivationEpoch = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowActivationEpoch(flowActivationEpoch);
-	}
-
-	@Test
-	public void testGetFlowActivationMicrosec() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowActivationMicrosec();
-	}
-
-	@Test
-	public void testSetFlowActivationMicrosec() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double flowActivationMicrosec = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowActivationMicrosec(flowActivationMicrosec);
-	}
-
-	@Test
-	public void testGetFlowDeactivationEpoch() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowDeactivationEpoch();
-	}
-
-	@Test
-	public void testSetFlowDeactivationEpoch() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double flowDeactivationEpoch = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowDeactivationEpoch(flowDeactivationEpoch);
-	}
-
-	@Test
-	public void testGetFlowDeactivationMicrosec() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowDeactivationMicrosec();
-	}
-
-	@Test
-	public void testSetFlowDeactivationMicrosec() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double flowDeactivationMicrosec = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowDeactivationMicrosec(flowDeactivationMicrosec);
-	}
-
-	@Test
-	public void testGetFlowDeactivationTime() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowDeactivationTime();
-	}
-
-	@Test
-	public void testSetFlowDeactivationTime() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String flowDeactivationTime = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowDeactivationTime(flowDeactivationTime);
-	}
-
-	@Test
-	public void testGetFlowStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowStatus();
-	}
-
-	@Test
-	public void testSetFlowStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String flowStatus = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowStatus(flowStatus);
-	}
-
-	@Test
-	public void testGetMaxPacketDelayVariation() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMaxPacketDelayVariation();
-	}
-
-	@Test
-	public void testSetMaxPacketDelayVariation() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double maxPacketDelayVariation = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMaxPacketDelayVariation(maxPacketDelayVariation);
-	}
-
-	@Test
-	public void testGetNumActivationFailures() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumActivationFailures();
-	}
-
-	@Test
-	public void testSetNumActivationFailures() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numActivationFailures = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumActivationFailures(numActivationFailures);
-	}
-
-	@Test
-	public void testGetNumBitErrors() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumBitErrors();
-	}
-
-	@Test
-	public void testSetNumBitErrors() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numBitErrors = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumBitErrors(numBitErrors);
-	}
-
-	@Test
-	public void testGetNumBytesReceived() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumBytesReceived();
-	}
-
-	@Test
-	public void testSetNumBytesReceived() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numBytesReceived = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumBytesReceived(numBytesReceived);
-	}
-
-	@Test
-	public void testGetNumBytesTransmitted() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumBytesTransmitted();
-	}
-
-	@Test
-	public void testSetNumBytesTransmitted() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numBytesTransmitted = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumBytesTransmitted(numBytesTransmitted);
-	}
-
-	@Test
-	public void testGetNumDroppedPackets() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumDroppedPackets();
-	}
-
-	@Test
-	public void testSetNumDroppedPackets() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numDroppedPackets = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumDroppedPackets(numDroppedPackets);
-	}
-
-	@Test
-	public void testGetNumL7BytesReceived() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumL7BytesReceived();
-	}
-
-	@Test
-	public void testSetNumL7BytesReceived() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numL7BytesReceived = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumL7BytesReceived(numL7BytesReceived);
-	}
-
-	@Test
-	public void testGetNumL7BytesTransmitted() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumL7BytesTransmitted();
-	}
-
-	@Test
-	public void testSetNumL7BytesTransmitted() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numL7BytesTransmitted = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumL7BytesTransmitted(numL7BytesTransmitted);
-	}
-
-	@Test
-	public void testGetNumLostPackets() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumLostPackets();
-	}
-
-	@Test
-	public void testSetNumLostPackets() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numLostPackets = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumLostPackets(numLostPackets);
-	}
-
-	@Test
-	public void testGetNumOutOfOrderPackets() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumOutOfOrderPackets();
-	}
-
-	@Test
-	public void testSetNumOutOfOrderPackets() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numOutOfOrderPackets = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumOutOfOrderPackets(numOutOfOrderPackets);
-	}
-
-	@Test
-	public void testGetNumPacketErrors() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumPacketErrors();
-	}
-
-	@Test
-	public void testSetNumPacketErrors() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numPacketErrors = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumPacketErrors(numPacketErrors);
-	}
-
-	@Test
-	public void testGetNumPacketsReceivedExclRetrans() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumPacketsReceivedExclRetrans();
-	}
-
-	@Test
-	public void testSetNumPacketsReceivedExclRetrans() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numPacketsReceivedExclRetrans = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumPacketsReceivedExclRetrans(numPacketsReceivedExclRetrans);
-	}
-
-	@Test
-	public void testGetNumPacketsReceivedInclRetrans() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumPacketsReceivedInclRetrans();
-	}
-
-	@Test
-	public void testSetNumPacketsReceivedInclRetrans() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numPacketsReceivedInclRetrans = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumPacketsReceivedInclRetrans(numPacketsReceivedInclRetrans);
-	}
-
-	@Test
-	public void testGetNumPacketsTransmittedInclRetrans() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumPacketsTransmittedInclRetrans();
-	}
-
-	@Test
-	public void testSetNumPacketsTransmittedInclRetrans() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numPacketsTransmittedInclRetrans = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumPacketsTransmittedInclRetrans(numPacketsTransmittedInclRetrans);
-	}
-
-	@Test
-	public void testGetNumRetries() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumRetries();
-	}
-
-	@Test
-	public void testSetNumRetries() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numRetries = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumRetries(numRetries);
-	}
-
-	@Test
-	public void testGetNumTimeouts() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumTimeouts();
-	}
-
-	@Test
-	public void testSetNumTimeouts() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numTimeouts = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumTimeouts(numTimeouts);
-	}
-
-	@Test
-	public void testGetNumTunneledL7BytesReceived() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumTunneledL7BytesReceived();
-	}
-
-	@Test
-	public void testSetNumTunneledL7BytesReceived() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numTunneledL7BytesReceived = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumTunneledL7BytesReceived(numTunneledL7BytesReceived);
-	}
-
-	@Test
-	public void testGetRoundTripTime() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getRoundTripTime();
-	}
-
-	@Test
-	public void testSetRoundTripTime() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double roundTripTime = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setRoundTripTime(roundTripTime);
-	}
-
-	@Test
-	public void testGetTimeToFirstByte() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTimeToFirstByte();
-	}
-
-	@Test
-	public void testSetTimeToFirstByte() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double timeToFirstByte = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTimeToFirstByte(timeToFirstByte);
-	}
-
-	@Test
-	public void testGetDurConnectionFailedStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDurConnectionFailedStatus();
-	}
-
-	@Test
-	public void testSetDurConnectionFailedStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double durConnectionFailedStatus = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDurConnectionFailedStatus(durConnectionFailedStatus);
-	}
-
-	@Test
-	public void testGetDurTunnelFailedStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDurTunnelFailedStatus();
-	}
-
-	@Test
-	public void testSetDurTunnelFailedStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double durTunnelFailedStatus = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDurTunnelFailedStatus(durTunnelFailedStatus);
-	}
-
-	@Test
-	public void testGetFlowActivatedBy() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowActivatedBy();
-	}
-
-	@Test
-	public void testSetFlowActivatedBy() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String flowActivatedBy = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowActivatedBy(flowActivatedBy);
-	}
-
-	@Test
-	public void testGetFlowActivationTime() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowActivationTime();
-	}
-
-	@Test
-	public void testSetFlowActivationTime() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String flowActivationTime = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowActivationTime(flowActivationTime);
-	}
-
-	@Test
-	public void testGetFlowDeactivatedBy() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowDeactivatedBy();
-	}
-
-	@Test
-	public void testSetFlowDeactivatedBy() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String flowDeactivatedBy = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowDeactivatedBy(flowDeactivatedBy);
-	}
-
-	@Test
-	public void testGetGtpConnectionStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getGtpConnectionStatus();
-	}
-
-	@Test
-	public void testSetGtpConnectionStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String gtpConnectionStatus = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setGtpConnectionStatus(gtpConnectionStatus);
-	}
-
-	@Test
-	public void testGetGtpTunnelStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getGtpTunnelStatus();
-	}
-
-	@Test
-	public void testSetGtpTunnelStatus() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String gtpTunnelStatus = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setGtpTunnelStatus(gtpTunnelStatus);
-	}
-
-	@Test
-	public void testGetIpTosCountList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<List<String>> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getIpTosCountList();
-	}
-
-	@Test
-	public void testSetIpTosCountList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<List<String>> ipTosCountList = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setIpTosCountList(ipTosCountList);
-	}
-
-	@Test
-	public void testGetIpTosList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getIpTosList();
-	}
-
-	@Test
-	public void testSetIpTosList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<String> ipTosList = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setIpTosList(ipTosList);
-	}
-
-	@Test
-	public void testGetLargePacketRtt() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLargePacketRtt();
-	}
-
-	@Test
-	public void testSetLargePacketRtt() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double largePacketRtt = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLargePacketRtt(largePacketRtt);
-	}
-
-	@Test
-	public void testGetLargePacketThreshold() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLargePacketThreshold();
-	}
-
-	@Test
-	public void testSetLargePacketThreshold() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double largePacketThreshold = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLargePacketThreshold(largePacketThreshold);
-	}
-
-	@Test
-	public void testGetMaxReceiveBitRate() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMaxReceiveBitRate();
-	}
-
-	@Test
-	public void testSetMaxReceiveBitRate() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double maxReceiveBitRate = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMaxReceiveBitRate(maxReceiveBitRate);
-	}
-
-	@Test
-	public void testGetMaxTransmitBitRate() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMaxTransmitBitRate();
-	}
-
-	@Test
-	public void testSetMaxTransmitBitRate() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double maxTransmitBitRate = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMaxTransmitBitRate(maxTransmitBitRate);
-	}
-
-	@Test
-	public void testGetMobileQciCosCountList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<List<String>> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMobileQciCosCountList();
-	}
-
-	@Test
-	public void testSetMobileQciCosCountList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<List<String>> mobileQciCosCountList = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMobileQciCosCountList(mobileQciCosCountList);
-	}
-
-	@Test
-	public void testGetMobileQciCosList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMobileQciCosList();
-	}
-
-	@Test
-	public void testSetMobileQciCosList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<String> mobileQciCosList = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMobileQciCosList(mobileQciCosList);
-	}
-
-	@Test
-	public void testGetNumGtpEchoFailures() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumGtpEchoFailures();
-	}
-
-	@Test
-	public void testSetNumGtpEchoFailures() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numGtpEchoFailures = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumGtpEchoFailures(numGtpEchoFailures);
-	}
-
-	@Test
-	public void testGetNumGtpTunnelErrors() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumGtpTunnelErrors();
-	}
-
-	@Test
-	public void testSetNumGtpTunnelErrors() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numGtpTunnelErrors = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumGtpTunnelErrors(numGtpTunnelErrors);
-	}
-
-	@Test
-	public void testGetNumHttpErrors() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumHttpErrors();
-	}
-
-	@Test
-	public void testSetNumHttpErrors() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Double numHttpErrors = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumHttpErrors(numHttpErrors);
-	}
-
-	@Test
-	public void testGetTcpFlagCountList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<List<String>> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTcpFlagCountList();
-	}
-
-	@Test
-	public void testSetTcpFlagCountList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<List<String>> tcpFlagCountList = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTcpFlagCountList(tcpFlagCountList);
-	}
-
-	@Test
-	public void testGetTcpFlagList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<String> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTcpFlagList();
-	}
-
-	@Test
-	public void testSetTcpFlagList() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		List<String> tcpFlagList = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTcpFlagList(tcpFlagList);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		GtpPerFlowMetrics testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/HashOfNameValuePairArrayTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/HashOfNameValuePairArrayTest.java
deleted file mode 100644
index 7be5384..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/HashOfNameValuePairArrayTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.onap.dcaegen2.ves.domain.HashOfNameValuePairArray;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class HashOfNameValuePairArrayTest {
-
-	@Autowired
-	HashOfNameValuePairArray hashOfNameValuePairArray = new HashOfNameValuePairArray();
-	Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	Object value;
-	@Mock
-	List<ArrayOfField_> arrayOfFields;
-	@Test
-	public void test() {
-		hashOfNameValuePairArray.setAdditionalProperty("name", value);
-		hashOfNameValuePairArray.setArrayOfFields(arrayOfFields);
-		hashOfNameValuePairArray.setName("name");
-		additionalProperties.put("name", value);
-		
-		assertEquals(additionalProperties, hashOfNameValuePairArray.getAdditionalProperties());
-		assertEquals(arrayOfFields, hashOfNameValuePairArray.getArrayOfFields());
-		assertEquals("name", hashOfNameValuePairArray.getName());
-		assert (hashOfNameValuePairArray.toString() != null);
-		assert (hashOfNameValuePairArray.hashCode() != 0);
-		assertEquals(true, hashOfNameValuePairArray.equals(hashOfNameValuePairArray));
-		
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/HeartbeatFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/HeartbeatFieldsTest.java
deleted file mode 100644
index 3695281..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/HeartbeatFieldsTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class HeartbeatFieldsTest {
-
-    @Autowired
-    HeartbeatFields heartbeatFields = new HeartbeatFields();
-    Object value = new Object();
-    
-    List<AdditionalField> additionalFields = null;
-    @Mock
-    AdditionalField field = new AdditionalField();
-    
-    Map<String, Object> a = new HashMap<String, Object>();
-    @Test
-    public void test() {
-        //additionalFields.add(field);
-        heartbeatFields.setAdditionalFields(additionalFields);
-        heartbeatFields.setAdditionalProperty("name", value);
-        heartbeatFields.setHeartbeatFieldsVersion(11.1);
-        heartbeatFields.setHeartbeatInterval(1L);
-        a.put("name", value);
-        assertEquals (heartbeatFields.getAdditionalFields(),additionalFields);
-        assertEquals (heartbeatFields.getAdditionalProperties(),a);
-        assertEquals (heartbeatFields.getHeartbeatFieldsVersion(),new Double(11.1));
-        assertEquals (heartbeatFields.getHeartbeatInterval(),new Long(1L));
-        assert (heartbeatFields.toString() != null);
-        assert (heartbeatFields.hashCode() != 0);
-        
-        
-        
-        
-    }
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/InternalHeaderFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/InternalHeaderFieldsTest.java
deleted file mode 100644
index c644ba1..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/InternalHeaderFieldsTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class InternalHeaderFieldsTest {
-
-    @Autowired
-    InternalHeaderFields internalHeaderFields = new InternalHeaderFields();
-    Object value = new Object();
-    Map<String, Object> additionalProperties = new HashMap<String, Object>();
-    @Test
-    public void test() {
-        internalHeaderFields.setAdditionalProperty("name", value);
-        additionalProperties.put("name", value);
-        
-        assertEquals (internalHeaderFields.getAdditionalProperties(),additionalProperties);
-        assert (internalHeaderFields.toString() != null);
-        assert (internalHeaderFields.hashCode() != 0);
-        
-        
-    }
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/JsonObjectTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/JsonObjectTest.java
deleted file mode 100644
index 9a57ae1..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/JsonObjectTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class JsonObjectTest {
-
-	private JsonObject createTestSubject() {
-		return new JsonObject();
-	}
-
-	@Test
-	public void testGetObjectInstances() throws Exception {
-		JsonObject testSubject;
-		List<ObjectInstance> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getObjectInstances();
-	}
-
-	@Test
-	public void testSetObjectInstances() throws Exception {
-		JsonObject testSubject;
-		List<ObjectInstance> objectInstances = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setObjectInstances(objectInstances);
-	}
-
-	@Test
-	public void testGetObjectName() throws Exception {
-		JsonObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getObjectName();
-	}
-
-	@Test
-	public void testSetObjectName() throws Exception {
-		JsonObject testSubject;
-		String objectName = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setObjectName(objectName);
-	}
-
-	@Test
-	public void testGetObjectSchema() throws Exception {
-		JsonObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getObjectSchema();
-	}
-
-	@Test
-	public void testSetObjectSchema() throws Exception {
-		JsonObject testSubject;
-		String objectSchema = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setObjectSchema(objectSchema);
-	}
-
-	@Test
-	public void testGetObjectSchemaUrl() throws Exception {
-		JsonObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getObjectSchemaUrl();
-	}
-
-	@Test
-	public void testSetObjectSchemaUrl() throws Exception {
-		JsonObject testSubject;
-		String objectSchemaUrl = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setObjectSchemaUrl(objectSchemaUrl);
-	}
-
-	@Test
-	public void testGetNfSubscribedObjectName() throws Exception {
-		JsonObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNfSubscribedObjectName();
-	}
-
-	@Test
-	public void testSetNfSubscribedObjectName() throws Exception {
-		JsonObject testSubject;
-		String nfSubscribedObjectName = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNfSubscribedObjectName(nfSubscribedObjectName);
-	}
-
-	@Test
-	public void testGetNfSubscriptionId() throws Exception {
-		JsonObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNfSubscriptionId();
-	}
-
-	@Test
-	public void testSetNfSubscriptionId() throws Exception {
-		JsonObject testSubject;
-		String nfSubscriptionId = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNfSubscriptionId(nfSubscriptionId);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		JsonObject testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		JsonObject testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		JsonObject testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		JsonObject testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		JsonObject testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/LatencyDistributionTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/LatencyDistributionTest.java
deleted file mode 100644
index 01422d6..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/LatencyDistributionTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.Map;
-import org.onap.dcaegen2.ves.domain.LatencyDistribution;
-import org.junit.Test;
-
-public class LatencyDistributionTest {
-
-	private LatencyDistribution createTestSubject() {
-		return new LatencyDistribution();
-	}
-
-	@Test
-	public void testGetCountsInTheBucket() throws Exception {
-		LatencyDistribution testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getCountsInTheBucket();
-	}
-
-	@Test
-	public void testSetCountsInTheBucket() throws Exception {
-		LatencyDistribution testSubject;
-		Double countsInTheBucket = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setCountsInTheBucket(countsInTheBucket);
-	}
-
-	@Test
-	public void testGetHighEndOfLatencyBucket() throws Exception {
-		LatencyDistribution testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getHighEndOfLatencyBucket();
-	}
-
-	@Test
-	public void testSetHighEndOfLatencyBucket() throws Exception {
-		LatencyDistribution testSubject;
-		Double highEndOfLatencyBucket = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setHighEndOfLatencyBucket(highEndOfLatencyBucket);
-	}
-
-	@Test
-	public void testGetLowEndOfLatencyBucket() throws Exception {
-		LatencyDistribution testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLowEndOfLatencyBucket();
-	}
-
-	@Test
-	public void testSetLowEndOfLatencyBucket() throws Exception {
-		LatencyDistribution testSubject;
-		Double lowEndOfLatencyBucket = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLowEndOfLatencyBucket(lowEndOfLatencyBucket);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		LatencyDistribution testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		LatencyDistribution testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		LatencyDistribution testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		LatencyDistribution testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		LatencyDistribution testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/MeasurementsForVfScalingFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/MeasurementsForVfScalingFieldsTest.java
deleted file mode 100644
index 7c6b78a..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/MeasurementsForVfScalingFieldsTest.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.List;
-import java.util.Map;
-import org.onap.dcaegen2.ves.domain.MeasurementsForVfScalingFields;
-import org.junit.Test;
-
-public class MeasurementsForVfScalingFieldsTest {
-
-	private MeasurementsForVfScalingFields createTestSubject() {
-		return new MeasurementsForVfScalingFields();
-	}
-
-	@Test
-	public void testGetMeasurementInterval() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMeasurementInterval();
-	}
-
-	@Test
-	public void testSetMeasurementInterval() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Double measurementInterval = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMeasurementInterval(measurementInterval);
-	}
-
-	@Test
-	public void testGetMeasurementsForVfScalingVersion() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMeasurementsForVfScalingVersion();
-	}
-
-	@Test
-	public void testSetMeasurementsForVfScalingVersion() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Double measurementsForVfScalingVersion = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMeasurementsForVfScalingVersion(measurementsForVfScalingVersion);
-	}
-
-	@Test
-	public void testGetAdditionalFields() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<AdditionalField> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalFields();
-	}
-
-	@Test
-	public void testSetAdditionalFields() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<AdditionalField> additionalFields = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalFields(additionalFields);
-	}
-
-	@Test
-	public void testGetAdditionalMeasurements() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<AdditionalMeasurement> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalMeasurements();
-	}
-
-	@Test
-	public void testSetAdditionalMeasurements() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<AdditionalMeasurement> additionalMeasurements = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalMeasurements(additionalMeasurements);
-	}
-
-	@Test
-	public void testGetAdditionalObjects() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<AdditionalObject> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalObjects();
-	}
-
-	@Test
-	public void testSetAdditionalObjects() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<AdditionalObject> additionalObjects = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalObjects(additionalObjects);
-	}
-
-	@Test
-	public void testGetCodecUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<CodecUsageArray> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getCodecUsageArray();
-	}
-
-	@Test
-	public void testSetCodecUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<CodecUsageArray> codecUsageArray = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setCodecUsageArray(codecUsageArray);
-	}
-
-	@Test
-	public void testGetConcurrentSessions() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Long result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getConcurrentSessions();
-	}
-
-	@Test
-	public void testSetConcurrentSessions() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Long concurrentSessions = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setConcurrentSessions(concurrentSessions);
-	}
-
-	@Test
-	public void testGetConfiguredEntities() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Long result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getConfiguredEntities();
-	}
-
-	@Test
-	public void testSetConfiguredEntities() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Long configuredEntities = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setConfiguredEntities(configuredEntities);
-	}
-
-	@Test
-	public void testGetCpuUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<CpuUsageArray> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getCpuUsageArray();
-	}
-
-	@Test
-	public void testSetCpuUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<CpuUsageArray> cpuUsageArray = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setCpuUsageArray(cpuUsageArray);
-	}
-
-	@Test
-	public void testGetDiskUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<DiskUsageArray> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getDiskUsageArray();
-	}
-
-	@Test
-	public void testSetDiskUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<DiskUsageArray> diskUsageArray = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setDiskUsageArray(diskUsageArray);
-	}
-
-	@Test
-	public void testGetFeatureUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<FeatureUsageArray> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFeatureUsageArray();
-	}
-
-	@Test
-	public void testSetFeatureUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<FeatureUsageArray> featureUsageArray = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFeatureUsageArray(featureUsageArray);
-	}
-
-	@Test
-	public void testGetFilesystemUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<FilesystemUsageArray> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFilesystemUsageArray();
-	}
-
-	@Test
-	public void testSetFilesystemUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<FilesystemUsageArray> filesystemUsageArray = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFilesystemUsageArray(filesystemUsageArray);
-	}
-
-	@Test
-	public void testGetLatencyDistribution() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<LatencyDistribution> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLatencyDistribution();
-	}
-
-	@Test
-	public void testSetLatencyDistribution() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<LatencyDistribution> latencyDistribution = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLatencyDistribution(latencyDistribution);
-	}
-
-	@Test
-	public void testGetMeanRequestLatency() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMeanRequestLatency();
-	}
-
-	@Test
-	public void testSetMeanRequestLatency() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Double meanRequestLatency = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMeanRequestLatency(meanRequestLatency);
-	}
-
-	@Test
-	public void testGetMemoryUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<MemoryUsageArray> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMemoryUsageArray();
-	}
-
-	@Test
-	public void testSetMemoryUsageArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<MemoryUsageArray> memoryUsageArray = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMemoryUsageArray(memoryUsageArray);
-	}
-
-	@Test
-	public void testGetNumberOfMediaPortsInUse() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Long result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getNumberOfMediaPortsInUse();
-	}
-
-	@Test
-	public void testSetNumberOfMediaPortsInUse() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Long numberOfMediaPortsInUse = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setNumberOfMediaPortsInUse(numberOfMediaPortsInUse);
-	}
-
-	@Test
-	public void testGetRequestRate() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getRequestRate();
-	}
-
-	@Test
-	public void testSetRequestRate() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Double requestRate = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setRequestRate(requestRate);
-	}
-
-	@Test
-	public void testGetVnfcScalingMetric() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Long result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVnfcScalingMetric();
-	}
-
-	@Test
-	public void testSetVnfcScalingMetric() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Long vnfcScalingMetric = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVnfcScalingMetric(vnfcScalingMetric);
-	}
-
-	@Test
-	public void testGetVNicPerformanceArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<VNicPerformanceArray> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVNicPerformanceArray();
-	}
-
-	@Test
-	public void testSetVNicPerformanceArray() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		List<VNicPerformanceArray> vNicPerformanceArray = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVNicPerformanceArray(vNicPerformanceArray);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		MeasurementsForVfScalingFields testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/MemoryUsageArrayTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/MemoryUsageArrayTest.java
deleted file mode 100644
index ffac3e2..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/MemoryUsageArrayTest.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-public class MemoryUsageArrayTest {
-
-	private MemoryUsageArray createTestSubject() {
-		return new MemoryUsageArray();
-	}
-
-	@Test
-	public void testGetMemoryFree() throws Exception {
-		MemoryUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMemoryFree();
-	}
-
-	@Test
-	public void testSetMemoryFree() throws Exception {
-		MemoryUsageArray testSubject;
-		Double memoryFree = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMemoryFree(memoryFree);
-	}
-
-	@Test
-	public void testGetMemoryUsed() throws Exception {
-		MemoryUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMemoryUsed();
-	}
-
-	@Test
-	public void testSetMemoryUsed() throws Exception {
-		MemoryUsageArray testSubject;
-		Double memoryUsed = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMemoryUsed(memoryUsed);
-	}
-
-	@Test
-	public void testGetVmIdentifier() throws Exception {
-		MemoryUsageArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVmIdentifier();
-	}
-
-	@Test
-	public void testSetVmIdentifier() throws Exception {
-		MemoryUsageArray testSubject;
-		String vmIdentifier = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVmIdentifier(vmIdentifier);
-	}
-
-	@Test
-	public void testGetMemoryBuffered() throws Exception {
-		MemoryUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMemoryBuffered();
-	}
-
-	@Test
-	public void testSetMemoryBuffered() throws Exception {
-		MemoryUsageArray testSubject;
-		Double memoryBuffered = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMemoryBuffered(memoryBuffered);
-	}
-
-	@Test
-	public void testGetMemoryCached() throws Exception {
-		MemoryUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMemoryCached();
-	}
-
-	@Test
-	public void testSetMemoryCached() throws Exception {
-		MemoryUsageArray testSubject;
-		Double memoryCached = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMemoryCached(memoryCached);
-	}
-
-	@Test
-	public void testGetMemoryConfigured() throws Exception {
-		MemoryUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMemoryConfigured();
-	}
-
-	@Test
-	public void testSetMemoryConfigured() throws Exception {
-		MemoryUsageArray testSubject;
-		Double memoryConfigured = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMemoryConfigured(memoryConfigured);
-	}
-
-	@Test
-	public void testGetMemorySlabRecl() throws Exception {
-		MemoryUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMemorySlabRecl();
-	}
-
-	@Test
-	public void testSetMemorySlabRecl() throws Exception {
-		MemoryUsageArray testSubject;
-		Double memorySlabRecl = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMemorySlabRecl(memorySlabRecl);
-	}
-
-	@Test
-	public void testGetMemorySlabUnrecl() throws Exception {
-		MemoryUsageArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMemorySlabUnrecl();
-	}
-
-	@Test
-	public void testSetMemorySlabUnrecl() throws Exception {
-		MemoryUsageArray testSubject;
-		Double memorySlabUnrecl = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMemorySlabUnrecl(memorySlabUnrecl);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		MemoryUsageArray testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		MemoryUsageArray testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		MemoryUsageArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		MemoryUsageArray testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		MemoryUsageArray testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/MobileFlowFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/MobileFlowFieldsTest.java
deleted file mode 100644
index dc7431f..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/MobileFlowFieldsTest.java
+++ /dev/null
@@ -1,744 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class MobileFlowFieldsTest {
-
-	private MobileFlowFields createTestSubject() {
-		return new MobileFlowFields();
-	}
-
-	@Test
-	public void testGetFlowDirection() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getFlowDirection();
-	}
-
-	@Test
-	public void testSetFlowDirection() throws Exception {
-		MobileFlowFields testSubject;
-		String flowDirection = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setFlowDirection(flowDirection);
-	}
-
-	@Test
-	public void testGetGtpPerFlowMetrics() throws Exception {
-		MobileFlowFields testSubject;
-		GtpPerFlowMetrics result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getGtpPerFlowMetrics();
-	}
-
-	@Test
-	public void testSetGtpPerFlowMetrics() throws Exception {
-		MobileFlowFields testSubject;
-		GtpPerFlowMetrics gtpPerFlowMetrics = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setGtpPerFlowMetrics(gtpPerFlowMetrics);
-	}
-
-	@Test
-	public void testGetIpProtocolType() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getIpProtocolType();
-	}
-
-	@Test
-	public void testSetIpProtocolType() throws Exception {
-		MobileFlowFields testSubject;
-		String ipProtocolType = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setIpProtocolType(ipProtocolType);
-	}
-
-	@Test
-	public void testGetIpVersion() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getIpVersion();
-	}
-
-	@Test
-	public void testSetIpVersion() throws Exception {
-		MobileFlowFields testSubject;
-		String ipVersion = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setIpVersion(ipVersion);
-	}
-
-	@Test
-	public void testGetMobileFlowFieldsVersion() throws Exception {
-		MobileFlowFields testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMobileFlowFieldsVersion();
-	}
-
-	@Test
-	public void testSetMobileFlowFieldsVersion() throws Exception {
-		MobileFlowFields testSubject;
-		Double mobileFlowFieldsVersion = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMobileFlowFieldsVersion(mobileFlowFieldsVersion);
-	}
-
-	@Test
-	public void testGetOtherEndpointIpAddress() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getOtherEndpointIpAddress();
-	}
-
-	@Test
-	public void testSetOtherEndpointIpAddress() throws Exception {
-		MobileFlowFields testSubject;
-		String otherEndpointIpAddress = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setOtherEndpointIpAddress(otherEndpointIpAddress);
-	}
-
-	@Test
-	public void testGetOtherEndpointPort() throws Exception {
-		MobileFlowFields testSubject;
-		Long result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getOtherEndpointPort();
-	}
-
-	@Test
-	public void testSetOtherEndpointPort() throws Exception {
-		MobileFlowFields testSubject;
-		Long otherEndpointPort = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setOtherEndpointPort(otherEndpointPort);
-	}
-
-	@Test
-	public void testGetReportingEndpointIpAddr() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReportingEndpointIpAddr();
-	}
-
-	@Test
-	public void testSetReportingEndpointIpAddr() throws Exception {
-		MobileFlowFields testSubject;
-		String reportingEndpointIpAddr = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReportingEndpointIpAddr(reportingEndpointIpAddr);
-	}
-
-	@Test
-	public void testGetReportingEndpointPort() throws Exception {
-		MobileFlowFields testSubject;
-		Long result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReportingEndpointPort();
-	}
-
-	@Test
-	public void testSetReportingEndpointPort() throws Exception {
-		MobileFlowFields testSubject;
-		Long reportingEndpointPort = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReportingEndpointPort(reportingEndpointPort);
-	}
-
-	@Test
-	public void testGetAdditionalFields() throws Exception {
-		MobileFlowFields testSubject;
-		List<AdditionalField> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalFields();
-	}
-
-	@Test
-	public void testSetAdditionalFields() throws Exception {
-		MobileFlowFields testSubject;
-		List<AdditionalField> additionalFields = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalFields(additionalFields);
-	}
-
-	@Test
-	public void testGetApplicationType() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getApplicationType();
-	}
-
-	@Test
-	public void testSetApplicationType() throws Exception {
-		MobileFlowFields testSubject;
-		String applicationType = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setApplicationType(applicationType);
-	}
-
-	@Test
-	public void testGetAppProtocolType() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAppProtocolType();
-	}
-
-	@Test
-	public void testSetAppProtocolType() throws Exception {
-		MobileFlowFields testSubject;
-		String appProtocolType = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAppProtocolType(appProtocolType);
-	}
-
-	@Test
-	public void testGetAppProtocolVersion() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAppProtocolVersion();
-	}
-
-	@Test
-	public void testSetAppProtocolVersion() throws Exception {
-		MobileFlowFields testSubject;
-		String appProtocolVersion = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAppProtocolVersion(appProtocolVersion);
-	}
-
-	@Test
-	public void testGetCid() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getCid();
-	}
-
-	@Test
-	public void testSetCid() throws Exception {
-		MobileFlowFields testSubject;
-		String cid = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setCid(cid);
-	}
-
-	@Test
-	public void testGetConnectionType() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getConnectionType();
-	}
-
-	@Test
-	public void testSetConnectionType() throws Exception {
-		MobileFlowFields testSubject;
-		String connectionType = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setConnectionType(connectionType);
-	}
-
-	@Test
-	public void testGetEcgi() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getEcgi();
-	}
-
-	@Test
-	public void testSetEcgi() throws Exception {
-		MobileFlowFields testSubject;
-		String ecgi = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setEcgi(ecgi);
-	}
-
-	@Test
-	public void testGetGtpProtocolType() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getGtpProtocolType();
-	}
-
-	@Test
-	public void testSetGtpProtocolType() throws Exception {
-		MobileFlowFields testSubject;
-		String gtpProtocolType = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setGtpProtocolType(gtpProtocolType);
-	}
-
-	@Test
-	public void testGetGtpVersion() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getGtpVersion();
-	}
-
-	@Test
-	public void testSetGtpVersion() throws Exception {
-		MobileFlowFields testSubject;
-		String gtpVersion = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setGtpVersion(gtpVersion);
-	}
-
-	@Test
-	public void testGetHttpHeader() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getHttpHeader();
-	}
-
-	@Test
-	public void testSetHttpHeader() throws Exception {
-		MobileFlowFields testSubject;
-		String httpHeader = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setHttpHeader(httpHeader);
-	}
-
-	@Test
-	public void testGetImei() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getImei();
-	}
-
-	@Test
-	public void testSetImei() throws Exception {
-		MobileFlowFields testSubject;
-		String imei = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setImei(imei);
-	}
-
-	@Test
-	public void testGetImsi() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getImsi();
-	}
-
-	@Test
-	public void testSetImsi() throws Exception {
-		MobileFlowFields testSubject;
-		String imsi = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setImsi(imsi);
-	}
-
-	@Test
-	public void testGetLac() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getLac();
-	}
-
-	@Test
-	public void testSetLac() throws Exception {
-		MobileFlowFields testSubject;
-		String lac = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setLac(lac);
-	}
-
-	@Test
-	public void testGetMcc() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMcc();
-	}
-
-	@Test
-	public void testSetMcc() throws Exception {
-		MobileFlowFields testSubject;
-		String mcc = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMcc(mcc);
-	}
-
-	@Test
-	public void testGetMnc() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMnc();
-	}
-
-	@Test
-	public void testSetMnc() throws Exception {
-		MobileFlowFields testSubject;
-		String mnc = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMnc(mnc);
-	}
-
-	@Test
-	public void testGetMsisdn() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getMsisdn();
-	}
-
-	@Test
-	public void testSetMsisdn() throws Exception {
-		MobileFlowFields testSubject;
-		String msisdn = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setMsisdn(msisdn);
-	}
-
-	@Test
-	public void testGetOtherFunctionalRole() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getOtherFunctionalRole();
-	}
-
-	@Test
-	public void testSetOtherFunctionalRole() throws Exception {
-		MobileFlowFields testSubject;
-		String otherFunctionalRole = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setOtherFunctionalRole(otherFunctionalRole);
-	}
-
-	@Test
-	public void testGetRac() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getRac();
-	}
-
-	@Test
-	public void testSetRac() throws Exception {
-		MobileFlowFields testSubject;
-		String rac = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setRac(rac);
-	}
-
-	@Test
-	public void testGetRadioAccessTechnology() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getRadioAccessTechnology();
-	}
-
-	@Test
-	public void testSetRadioAccessTechnology() throws Exception {
-		MobileFlowFields testSubject;
-		String radioAccessTechnology = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setRadioAccessTechnology(radioAccessTechnology);
-	}
-
-	@Test
-	public void testGetSac() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getSac();
-	}
-
-	@Test
-	public void testSetSac() throws Exception {
-		MobileFlowFields testSubject;
-		String sac = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setSac(sac);
-	}
-
-	@Test
-	public void testGetSamplingAlgorithm() throws Exception {
-		MobileFlowFields testSubject;
-		Long result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getSamplingAlgorithm();
-	}
-
-	@Test
-	public void testSetSamplingAlgorithm() throws Exception {
-		MobileFlowFields testSubject;
-		Long samplingAlgorithm = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setSamplingAlgorithm(samplingAlgorithm);
-	}
-
-	@Test
-	public void testGetTac() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTac();
-	}
-
-	@Test
-	public void testSetTac() throws Exception {
-		MobileFlowFields testSubject;
-		String tac = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTac(tac);
-	}
-
-	@Test
-	public void testGetTunnelId() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTunnelId();
-	}
-
-	@Test
-	public void testSetTunnelId() throws Exception {
-		MobileFlowFields testSubject;
-		String tunnelId = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTunnelId(tunnelId);
-	}
-
-	@Test
-	public void testGetVlanId() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVlanId();
-	}
-
-	@Test
-	public void testSetVlanId() throws Exception {
-		MobileFlowFields testSubject;
-		String vlanId = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVlanId(vlanId);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		MobileFlowFields testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		MobileFlowFields testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		MobileFlowFields testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		MobileFlowFields testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		MobileFlowFields testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/NameValuePairTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/NameValuePairTest.java
deleted file mode 100644
index f014279..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/NameValuePairTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-public class NameValuePairTest {
-
-	private NameValuePair createTestSubject() {
-		return new NameValuePair();
-	}
-
-	@Test
-	public void testGetName() throws Exception {
-		NameValuePair testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getName();
-	}
-
-	@Test
-	public void testSetName() throws Exception {
-		NameValuePair testSubject;
-		String name = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setName(name);
-	}
-
-	@Test
-	public void testGetValue() throws Exception {
-		NameValuePair testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getValue();
-	}
-
-	@Test
-	public void testSetValue() throws Exception {
-		NameValuePair testSubject;
-		String value = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setValue(value);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		NameValuePair testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		NameValuePair testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-
-	@Test
-	public void testToString() throws Exception {
-		NameValuePair testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.toString();
-	}
-
-	@Test
-	public void testHashCode() throws Exception {
-		NameValuePair testSubject;
-		int result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.hashCode();
-	}
-
-	@Test
-	public void testEquals() throws Exception {
-		NameValuePair testSubject;
-		Object other = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.equals(other);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ObjectInstanceTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ObjectInstanceTest.java
deleted file mode 100644
index 96bb0ac..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ObjectInstanceTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class ObjectInstanceTest {
-	
-	ObjectInstance object = new ObjectInstance();
-	ObjectInstance_ objectInstance = new ObjectInstance_();
-	Double objectInstanceEpochMicrosec;
-	List<ObjectKey> objectKeys;
-	Object value;
-    Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@Test
-	public void test() {
-		object.setObjectInstance(objectInstance);
-		object.setObjectInstanceEpochMicrosec(objectInstanceEpochMicrosec);
-		object.setObjectKeys(objectKeys);
-		object.setAdditionalProperty("name", value);
-		additionalProperties.put("name", value);
-		assertEquals(additionalProperties, object.getAdditionalProperties());
-		assertEquals(object.getObjectInstance(), objectInstance);
-		assertEquals(object.getObjectKeys(), objectKeys);
-		assertEquals(object.getObjectInstanceEpochMicrosec(), objectInstanceEpochMicrosec);
-		assert(object.toString()!=null);
-		assert(object.hashCode()!=0);
-		assertEquals(true, object.equals(object));
-		
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ObjectInstance_Test.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ObjectInstance_Test.java
deleted file mode 100644
index 7080498..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ObjectInstance_Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class ObjectInstance_Test {
-	
-	ObjectInstance_ oi = new ObjectInstance_();
-    Object value;
-    Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	@Test
-	public void test() {
-		
-		oi.setAdditionalProperty("name", value);
-		additionalProperties.put("name", value);
-		assertEquals(additionalProperties, oi.getAdditionalProperties());
-		assert(oi.toString()!=null);
-		assert(oi.hashCode()!=0);
-		assertEquals(true, oi.equals(oi));
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ObjectKeyTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ObjectKeyTest.java
deleted file mode 100644
index 8aaab6e..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ObjectKeyTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class ObjectKeyTest {
-	ObjectKey ok = new ObjectKey();
-	Long l;
-	 Object value;
-	    Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-	@Test
-	public void testObjectKey() {
-		ok.setKeyName("keyName");
-		ok.setKeyOrder(l);
-		ok.setKeyValue("keyValue");
-		ok.setAdditionalProperty("name", value);
-		
-		assertEquals(ok.getKeyName(), "keyName");
-		assertEquals(ok.getKeyOrder(), l);
-		assertEquals(ok.getKeyValue(), "keyValue");
-		additionalProperties.put("name", value);
-		assertEquals(additionalProperties, ok.getAdditionalProperties());
-		assert(ok.toString()!=null);
-		
-		assert(ok.hashCode()!=0);
-		assertEquals(true, ok.equals(ok));
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/OtherFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/OtherFieldsTest.java
deleted file mode 100644
index 52332c6..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/OtherFieldsTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class OtherFieldsTest {
-
-	@Autowired
-	OtherFields otherFields = new OtherFields();
-	Object value = new Object();// = new Object();
-	@Mock
-	List<JsonObject> jsonObjects;
-	@Mock
-	List<HashOfNameValuePairArray> hashOfNameValuePairArrays;
-
-	@Mock
-	List<NameValuePair> nameValuePairs;
-	 private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	@Test
-	public void test() {
-		
-		otherFields.setAdditionalProperty("name", value);
-		otherFields.setHashOfNameValuePairArrays(hashOfNameValuePairArrays);
-		otherFields.setJsonObjects(jsonObjects);
-		otherFields.setNameValuePairs(nameValuePairs);
-		otherFields.setOtherFieldsVersion(2.2);
-		additionalProperties.put("name", value);
-		
-		assertEquals(hashOfNameValuePairArrays, otherFields.getHashOfNameValuePairArrays());
-		assertEquals(jsonObjects, otherFields.getJsonObjects());
-		assertEquals(nameValuePairs, otherFields.getNameValuePairs());
-		assertEquals(new Double(2.2), otherFields.getOtherFieldsVersion());
-		assertEquals(additionalProperties,otherFields.getAdditionalProperties() );
-		
-		
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/SipSignalingFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/SipSignalingFieldsTest.java
deleted file mode 100644
index 2809c4d..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/SipSignalingFieldsTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class SipSignalingFieldsTest {
-
-	@Autowired
-	SipSignalingFields sipSignalingFields = new SipSignalingFields();
-	List<AdditionalInformation> additionalInformation;
-	Object value;
-	Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	@Mock
-	VendorVnfNameFields vendorVnfNameFields;
-	
-	@Test
-	public void test() {
-		sipSignalingFields.setAdditionalInformation(additionalInformation);
-		sipSignalingFields.setAdditionalProperty("name", value);
-		sipSignalingFields.setCompressedSip("compressedSip");
-		sipSignalingFields.setCorrelator("correlator");
-		sipSignalingFields.setLocalIpAddress("localIpAddress");
-		sipSignalingFields.setLocalPort("localPort");
-		sipSignalingFields.setRemoteIpAddress("remoteIpAddress");
-		sipSignalingFields.setRemotePort("remotePort");
-		sipSignalingFields.setSipSignalingFieldsVersion(2.2);
-		sipSignalingFields.setSummarySip("summarySip");
-		sipSignalingFields.setVendorVnfNameFields(vendorVnfNameFields);
-		additionalProperties.put("name", value);
-		
-		assertEquals(additionalInformation, sipSignalingFields.getAdditionalInformation());
-		assertEquals(additionalInformation, sipSignalingFields.getAdditionalInformation());
-		assertEquals("compressedSip", sipSignalingFields.getCompressedSip());
-		assertEquals("correlator", sipSignalingFields.getCorrelator());
-		assertEquals("localIpAddress", sipSignalingFields.getLocalIpAddress());
-		assertEquals("localPort", sipSignalingFields.getLocalPort());
-		assertEquals("remoteIpAddress", sipSignalingFields.getRemoteIpAddress());
-		assertEquals("remotePort", sipSignalingFields.getRemotePort());
-		assertEquals(new Double(2.2), sipSignalingFields.getSipSignalingFieldsVersion());
-		assertEquals("summarySip", sipSignalingFields.getSummarySip());
-		assertEquals(vendorVnfNameFields, sipSignalingFields.getVendorVnfNameFields());
-		 assert (sipSignalingFields.toString() != null);
-       assert (sipSignalingFields.hashCode() != 0);
-       assertEquals(true,sipSignalingFields.equals(sipSignalingFields));
-		
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/StateChangeFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/StateChangeFieldsTest.java
deleted file mode 100644
index 93cee2d..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/StateChangeFieldsTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class StateChangeFieldsTest {
-	@Autowired
-	StateChangeFields stateChangeFields = new StateChangeFields();
-	@Mock
-	List<AdditionalField> additionalFields;
-	Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	Object value;
-
-	@Test
-	public void test() {
-		stateChangeFields.setAdditionalFields(additionalFields);
-		stateChangeFields.setAdditionalProperty("name", value);
-		stateChangeFields.setNewState("newState");
-		stateChangeFields.setOldState("oldState");
-		stateChangeFields.setStateChangeFieldsVersion(2.2);
-		stateChangeFields.setStateInterface("stateInterface");
-		additionalProperties.put("name", value);
-		assertEquals(additionalFields, stateChangeFields.getAdditionalFields());
-		assertEquals(additionalProperties, stateChangeFields.getAdditionalProperties());
-		assertEquals("newState", stateChangeFields.getNewState());
-		assertEquals("oldState", stateChangeFields.getOldState());
-		assertEquals(new Double(2.2), stateChangeFields.getStateChangeFieldsVersion());
-		assertEquals("stateInterface", stateChangeFields.getStateInterface());
-		assert (stateChangeFields.toString() != null);
-		assert (stateChangeFields.hashCode() != 0);
-		assertEquals(true, stateChangeFields.equals(stateChangeFields));
-
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/SyslogFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/SyslogFieldsTest.java
deleted file mode 100644
index 8159651..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/SyslogFieldsTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class SyslogFieldsTest {
-
-	@Autowired
-	SyslogFields syslogFields = new SyslogFields();
-	Object value;
-	 Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	@Test
-	public void test() {
-		syslogFields.setAdditionalFields("additionalFields");
-		syslogFields.setAdditionalProperty("name", value);
-		syslogFields.setEventSourceHost("eventSourceHost");
-		syslogFields.setEventSourceType("eventSourceType");
-		syslogFields.setSyslogFacility(1L);
-		syslogFields.setSyslogFieldsVersion(2.2);
-		syslogFields.setSyslogMsg("syslogMsg");
-		syslogFields.setSyslogPri(1L);
-		syslogFields.setSyslogProc("syslogProc");
-		syslogFields.setSyslogProcId(2.2);
-		syslogFields.setSyslogSData("syslogSData");
-		syslogFields.setSyslogSdId("syslogSdId");
-		syslogFields.setSyslogSdId("syslogSdId");
-		syslogFields.setSyslogSev("syslogSev");
-		syslogFields.setSyslogTag("syslogTag");
-		syslogFields.setSyslogVer(2.2);
-		additionalProperties.put("name", value);
-		assertEquals("additionalFields", syslogFields.getAdditionalFields());
-		assertEquals(additionalProperties, syslogFields.getAdditionalProperties());
-		assertEquals("eventSourceHost", syslogFields.getEventSourceHost());
-		assertEquals("eventSourceType", syslogFields.getEventSourceType());
-		assertEquals(new Long(1L), syslogFields.getSyslogFacility());
-		assertEquals(new Double(2.2), syslogFields.getSyslogProcId());
-		assertEquals(new Long(1L), syslogFields.getSyslogPri());
-		assertEquals("syslogMsg", syslogFields.getSyslogMsg());
-		assertEquals(new Long(1L), syslogFields.getSyslogPri());
-		assertEquals("syslogProc", syslogFields.getSyslogProc());
-		assertEquals("syslogSData", syslogFields.getSyslogSData());
-		assertEquals("syslogSdId", syslogFields.getSyslogSdId());
-		assertEquals("syslogTag", syslogFields.getSyslogTag());
-		assertEquals("syslogSev", syslogFields.getSyslogSev());
-		assertEquals(new Double(2.2), syslogFields.getSyslogVer());
-		 assert (syslogFields.toString() != null);
-	       assert (syslogFields.hashCode() != 0);
-	       assertEquals(true,syslogFields.equals(syslogFields));
-	
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ThresholdCrossingAlertFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ThresholdCrossingAlertFieldsTest.java
deleted file mode 100644
index 5c6b746..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/ThresholdCrossingAlertFieldsTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class ThresholdCrossingAlertFieldsTest {
-
-	@Autowired
-	ThresholdCrossingAlertFields thresholdCrossingAlertFields =new ThresholdCrossingAlertFields();
-	List<String> associatedAlertIdList;
-	List<AdditionalParameter> additionalParameters;
-	List<AdditionalField> additionalFields;
-	Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	Object value;
-	@Test
-	public void test() {
-		thresholdCrossingAlertFields.setAdditionalFields(additionalFields);
-		thresholdCrossingAlertFields.setAdditionalParameters(additionalParameters);
-		thresholdCrossingAlertFields.setAdditionalProperty("name", value);
-		thresholdCrossingAlertFields.setAlertAction("test");
-		thresholdCrossingAlertFields.setAlertDescription("test");
-		thresholdCrossingAlertFields.setAlertType("test");
-		thresholdCrossingAlertFields.setAlertValue("test");
-		thresholdCrossingAlertFields.setAssociatedAlertIdList(associatedAlertIdList);
-		thresholdCrossingAlertFields.setCollectionTimestamp("test");
-		thresholdCrossingAlertFields.setDataCollector("test");
-		thresholdCrossingAlertFields.setElementType("test");
-		thresholdCrossingAlertFields.setEventSeverity("test");
-		thresholdCrossingAlertFields.setEventStartTimestamp("test");
-		thresholdCrossingAlertFields.setInterfaceName("test");
-		thresholdCrossingAlertFields.setNetworkService("test");
-		thresholdCrossingAlertFields.setPossibleRootCause("test");
-		thresholdCrossingAlertFields.setThresholdCrossingFieldsVersion(2.2);
-		
-		additionalProperties.put("name", value);
-		assertEquals(additionalFields, thresholdCrossingAlertFields.getAdditionalFields());
-		assertEquals("test", thresholdCrossingAlertFields.getAlertAction());
-		assertEquals("test", thresholdCrossingAlertFields.getAlertDescription());
-		assertEquals("test", thresholdCrossingAlertFields.getAlertType());
-		assertEquals("test", thresholdCrossingAlertFields.getAlertValue());
-		assertEquals("test", thresholdCrossingAlertFields.getCollectionTimestamp());
-		assertEquals("test", thresholdCrossingAlertFields.getDataCollector());
-		assertEquals("test", thresholdCrossingAlertFields.getElementType());
-		assertEquals("test", thresholdCrossingAlertFields.getEventSeverity());
-		assertEquals("test", thresholdCrossingAlertFields.getEventStartTimestamp());
-		assertEquals("test", thresholdCrossingAlertFields.getInterfaceName());
-		assertEquals("test", thresholdCrossingAlertFields.getNetworkService());
-		assertEquals("test", thresholdCrossingAlertFields.getPossibleRootCause());
-		assertEquals(new Double(2.2), thresholdCrossingAlertFields.getThresholdCrossingFieldsVersion());
-		assertEquals(associatedAlertIdList, thresholdCrossingAlertFields.getAssociatedAlertIdList());
-		assertEquals(additionalProperties, thresholdCrossingAlertFields.getAdditionalProperties());
-		assertEquals(additionalParameters, thresholdCrossingAlertFields.getAdditionalParameters());
-		
-		
-		
-		
-		
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VNicPerformanceArrayTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VNicPerformanceArrayTest.java
deleted file mode 100644
index 6674244..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VNicPerformanceArrayTest.java
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import java.util.Map;
-import org.junit.Test;
-
-public class VNicPerformanceArrayTest {
-
-	private VNicPerformanceArray createTestSubject() {
-		return new VNicPerformanceArray();
-	}
-
-	@Test
-	public void testGetValuesAreSuspect() throws Exception {
-		VNicPerformanceArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getValuesAreSuspect();
-	}
-
-	@Test
-	public void testSetValuesAreSuspect() throws Exception {
-		VNicPerformanceArray testSubject;
-		String valuesAreSuspect = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setValuesAreSuspect(valuesAreSuspect);
-	}
-
-	@Test
-	public void testGetVNicIdentifier() throws Exception {
-		VNicPerformanceArray testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getVNicIdentifier();
-	}
-
-	@Test
-	public void testSetVNicIdentifier() throws Exception {
-		VNicPerformanceArray testSubject;
-		String vNicIdentifier = "";
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setVNicIdentifier(vNicIdentifier);
-	}
-
-	@Test
-	public void testGetReceivedBroadcastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedBroadcastPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetReceivedBroadcastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedBroadcastPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedBroadcastPacketsAccumulated(receivedBroadcastPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetReceivedBroadcastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedBroadcastPacketsDelta();
-	}
-
-	@Test
-	public void testSetReceivedBroadcastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedBroadcastPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedBroadcastPacketsDelta(receivedBroadcastPacketsDelta);
-	}
-
-	@Test
-	public void testGetReceivedDiscardedPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedDiscardedPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetReceivedDiscardedPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedDiscardedPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedDiscardedPacketsAccumulated(receivedDiscardedPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetReceivedDiscardedPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedDiscardedPacketsDelta();
-	}
-
-	@Test
-	public void testSetReceivedDiscardedPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedDiscardedPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedDiscardedPacketsDelta(receivedDiscardedPacketsDelta);
-	}
-
-	@Test
-	public void testGetReceivedErrorPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedErrorPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetReceivedErrorPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedErrorPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedErrorPacketsAccumulated(receivedErrorPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetReceivedErrorPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedErrorPacketsDelta();
-	}
-
-	@Test
-	public void testSetReceivedErrorPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedErrorPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedErrorPacketsDelta(receivedErrorPacketsDelta);
-	}
-
-	@Test
-	public void testGetReceivedMulticastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedMulticastPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetReceivedMulticastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedMulticastPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedMulticastPacketsAccumulated(receivedMulticastPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetReceivedMulticastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedMulticastPacketsDelta();
-	}
-
-	@Test
-	public void testSetReceivedMulticastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedMulticastPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedMulticastPacketsDelta(receivedMulticastPacketsDelta);
-	}
-
-	@Test
-	public void testGetReceivedOctetsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedOctetsAccumulated();
-	}
-
-	@Test
-	public void testSetReceivedOctetsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedOctetsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedOctetsAccumulated(receivedOctetsAccumulated);
-	}
-
-	@Test
-	public void testGetReceivedOctetsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedOctetsDelta();
-	}
-
-	@Test
-	public void testSetReceivedOctetsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedOctetsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedOctetsDelta(receivedOctetsDelta);
-	}
-
-	@Test
-	public void testGetReceivedTotalPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedTotalPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetReceivedTotalPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedTotalPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedTotalPacketsAccumulated(receivedTotalPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetReceivedTotalPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedTotalPacketsDelta();
-	}
-
-	@Test
-	public void testSetReceivedTotalPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedTotalPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedTotalPacketsDelta(receivedTotalPacketsDelta);
-	}
-
-	@Test
-	public void testGetReceivedUnicastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedUnicastPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetReceivedUnicastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedUnicastPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedUnicastPacketsAccumulated(receivedUnicastPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetReceivedUnicastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getReceivedUnicastPacketsDelta();
-	}
-
-	@Test
-	public void testSetReceivedUnicastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double receivedUnicastPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setReceivedUnicastPacketsDelta(receivedUnicastPacketsDelta);
-	}
-
-	@Test
-	public void testGetTransmittedBroadcastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedBroadcastPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetTransmittedBroadcastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedBroadcastPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedBroadcastPacketsAccumulated(transmittedBroadcastPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetTransmittedBroadcastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedBroadcastPacketsDelta();
-	}
-
-	@Test
-	public void testSetTransmittedBroadcastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedBroadcastPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedBroadcastPacketsDelta(transmittedBroadcastPacketsDelta);
-	}
-
-	@Test
-	public void testGetTransmittedDiscardedPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedDiscardedPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetTransmittedDiscardedPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedDiscardedPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedDiscardedPacketsAccumulated(transmittedDiscardedPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetTransmittedDiscardedPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedDiscardedPacketsDelta();
-	}
-
-	@Test
-	public void testSetTransmittedDiscardedPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedDiscardedPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedDiscardedPacketsDelta(transmittedDiscardedPacketsDelta);
-	}
-
-	@Test
-	public void testGetTransmittedErrorPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedErrorPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetTransmittedErrorPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedErrorPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedErrorPacketsAccumulated(transmittedErrorPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetTransmittedErrorPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedErrorPacketsDelta();
-	}
-
-	@Test
-	public void testSetTransmittedErrorPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedErrorPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedErrorPacketsDelta(transmittedErrorPacketsDelta);
-	}
-
-	@Test
-	public void testGetTransmittedMulticastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedMulticastPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetTransmittedMulticastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedMulticastPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedMulticastPacketsAccumulated(transmittedMulticastPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetTransmittedMulticastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedMulticastPacketsDelta();
-	}
-
-	@Test
-	public void testSetTransmittedMulticastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedMulticastPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedMulticastPacketsDelta(transmittedMulticastPacketsDelta);
-	}
-
-	@Test
-	public void testGetTransmittedOctetsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedOctetsAccumulated();
-	}
-
-	@Test
-	public void testSetTransmittedOctetsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedOctetsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedOctetsAccumulated(transmittedOctetsAccumulated);
-	}
-
-	@Test
-	public void testGetTransmittedOctetsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedOctetsDelta();
-	}
-
-	@Test
-	public void testSetTransmittedOctetsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedOctetsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedOctetsDelta(transmittedOctetsDelta);
-	}
-
-	@Test
-	public void testGetTransmittedTotalPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedTotalPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetTransmittedTotalPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedTotalPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedTotalPacketsAccumulated(transmittedTotalPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetTransmittedTotalPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedTotalPacketsDelta();
-	}
-
-	@Test
-	public void testSetTransmittedTotalPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedTotalPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedTotalPacketsDelta(transmittedTotalPacketsDelta);
-	}
-
-	@Test
-	public void testGetTransmittedUnicastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedUnicastPacketsAccumulated();
-	}
-
-	@Test
-	public void testSetTransmittedUnicastPacketsAccumulated() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedUnicastPacketsAccumulated = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedUnicastPacketsAccumulated(transmittedUnicastPacketsAccumulated);
-	}
-
-	@Test
-	public void testGetTransmittedUnicastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getTransmittedUnicastPacketsDelta();
-	}
-
-	@Test
-	public void testSetTransmittedUnicastPacketsDelta() throws Exception {
-		VNicPerformanceArray testSubject;
-		Double transmittedUnicastPacketsDelta = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setTransmittedUnicastPacketsDelta(transmittedUnicastPacketsDelta);
-	}
-
-	@Test
-	public void testGetAdditionalProperties() throws Exception {
-		VNicPerformanceArray testSubject;
-		Map<String, Object> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAdditionalProperties();
-	}
-
-	@Test
-	public void testSetAdditionalProperty() throws Exception {
-		VNicPerformanceArray testSubject;
-		String name = "";
-		Object value = null;
-
-		// default test
-		testSubject = createTestSubject();
-		testSubject.setAdditionalProperty(name, value);
-	}
-}
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VendorVnfNameFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VendorVnfNameFieldsTest.java
deleted file mode 100644
index bc7d3bd..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VendorVnfNameFieldsTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class VendorVnfNameFieldsTest {
-
-	@Autowired
-	VendorVnfNameFields vendorVnfNameFields = new VendorVnfNameFields();
-	Object value;
-	 Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	@Test
-	public void test() {
-		vendorVnfNameFields.setAdditionalProperty("name", value);
-		vendorVnfNameFields.setVendorName("testvendorname");
-		vendorVnfNameFields.setVfModuleName("vfModuleName");
-		vendorVnfNameFields.setVnfName("vnfName");
-		additionalProperties.put("name", value);
-		assertEquals(additionalProperties, vendorVnfNameFields.getAdditionalProperties());
-		assertEquals("testvendorname", vendorVnfNameFields.getVendorName());
-		assertEquals("vfModuleName", vendorVnfNameFields.getVfModuleName());
-		assertEquals("vnfName", vendorVnfNameFields.getVnfName());
-		
-		
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VesEventTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VesEventTest.java
deleted file mode 100644
index 97333ba..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VesEventTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class VesEventTest {
-
-    @Autowired
-    VesEvent vesEvent = new VesEvent();
-    @Mock
-    Event event = new Event();
-    Object value = new Object();
-    Map<String, Object> additionalProperties = new HashMap<String, Object>();
-    @Test
-    public void test() {
-       vesEvent.setAdditionalProperty("name", value);
-       vesEvent.setEvent(event);
-       additionalProperties.put("name", value);
-       assertEquals(vesEvent.getAdditionalProperties(), additionalProperties);
-       assertEquals(vesEvent.getEvent(), event);
-       assert (vesEvent.toString() != null);
-       assert (vesEvent.hashCode() != 0);
-       
-    }
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VoiceQualityFieldsTest.java b/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VoiceQualityFieldsTest.java
deleted file mode 100644
index 9a5711a..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/dcaegen2/ves/domain/VoiceQualityFieldsTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.onap.dcaegen2.ves.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.onap.dcaegen2.ves.domain.VoiceQualityFields;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class VoiceQualityFieldsTest {
-
-	@Autowired
-	VoiceQualityFields voiceQualityFields =new VoiceQualityFields();
-	@Mock
-	VendorVnfNameFields vendorVnfNameFields;
-	@Mock
-	EndOfCallVqmSummaries endOfCallVqmSummaries;
-	List<AdditionalInformation> additionalInformation;
-	Object value;
-	Map<String, Object> additionalProperties = new HashMap<String, Object>();
-	@Test
-	public void test() {
-		voiceQualityFields.setAdditionalInformation(additionalInformation);
-		voiceQualityFields.setAdditionalProperty("name", value);
-		voiceQualityFields.setCalleeSideCodec("test");
-		voiceQualityFields.setCallerSideCodec("test");
-		voiceQualityFields.setCorrelator("test");
-		voiceQualityFields.setEndOfCallVqmSummaries(endOfCallVqmSummaries);
-		voiceQualityFields.setMidCallRtcp("test");
-		voiceQualityFields.setPhoneNumber("test");
-		voiceQualityFields.setVendorVnfNameFields(vendorVnfNameFields);
-		voiceQualityFields.setVoiceQualityFieldsVersion(2.2);
-		additionalProperties.put("name", value);
-		
-		assertEquals("test", voiceQualityFields.getCalleeSideCodec());
-		assertEquals("test", voiceQualityFields.getCallerSideCodec());
-		assertEquals("test", voiceQualityFields.getCorrelator());
-		assertEquals("test", voiceQualityFields.getMidCallRtcp());
-		assertEquals("test", voiceQualityFields.getPhoneNumber());
-		assertEquals(additionalProperties, voiceQualityFields.getAdditionalProperties());
-		assertEquals(endOfCallVqmSummaries, voiceQualityFields.getEndOfCallVqmSummaries());
-		assertEquals(vendorVnfNameFields, voiceQualityFields.getVendorVnfNameFields());
-		assertEquals(additionalInformation, voiceQualityFields.getAdditionalInformation());
-		
-		
-		
-		
-	}
-
-}
diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/SmooksUtilsTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/SmooksUtilsTest.java
index 6add493..403356b 100644
--- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/SmooksUtilsTest.java
+++ b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/SmooksUtilsTest.java
@@ -16,7 +16,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 * ============LICENSE_END=========================================================
-*/
+
 package org.onap.universalvesadapter.utils;
 
 import static org.junit.Assert.assertEquals;
@@ -27,7 +27,7 @@ import java.nio.charset.StandardCharsets;
 
 import org.junit.Test;
 import org.milyn.Smooks;
-import org.onap.dcaegen2.ves.domain.VesEvent;
+import org.onap.dcaegen2.ves.domain.ves7_0.VesEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
@@ -109,9 +109,10 @@ public class SmooksUtilsTest {
         	errorLogger.error("Error occurred : ", exception );
         }
         
-        assertEquals(vesEvent.getEvent().getCommonEventHeader().getDomain(), "UCSNMP-HEARTBEAT");
+       // assertEquals(vesEvent.getEvent().getCommonEventHeader().getDomain(), "UCSNMP-HEARTBEAT");
         
         
     }
 
 }
+*/
\ No newline at end of file
diff --git a/snmpmapper/src/main/resources/templates/uploadForm.html b/snmpmapper/src/main/resources/templates/uploadForm.html
deleted file mode 100644
index 89ef4c2..0000000
--- a/snmpmapper/src/main/resources/templates/uploadForm.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>Mapping File</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js"></script>
-	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js"></script>
-</head>
- 
-<body>
-      <center>
-         <h2>Upload Mapping File</h2>
-         <form id="fileUploadForm" method="post" action="uploadFile" enctype="multipart/form-data">
-            <table id="fileUploadFormBeanTable" border="0" width="80%">
-               <tr>
-                  <td>Enterprise ID:</td>
-                  <td><input id="enterpriseid" type="text" name="eid" size="65" /></td>
-               </tr>
-               <tr>
-                  <td>Mapping file:</td>
-                  <td>
-                  		<input id="mappingfile" type="file" name="mapper" size="60" />
-                  		<span id="fileUploadErr">Please Upload A File!</span>
-                  </td>                  
-               </tr>
-               <tr>
-                  <td colspan="2" align="center"><input id="fileUploadBtn" type="submit" value="Upload" /></td>
-               </tr>
-            </table>
-         </form>
-      </center>
-   </body>
-</html>
\ No newline at end of file