vescollector standalone docker support

Issue-Id:DCAEGEN2-82
Change-Id: Id309d0af08c8beb9c18dce08dc51344e60f494a4
Signed-off-by: Vijay <vv770d@att.com>

9 files changed, 476 insertions, 2888 deletions

diff --git a/docker-build.sh b/docker-build.sh
deleted file mode 100644
index 6cb73bf7..00000000
--- a/docker-build.sh
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/bash
-###
-# ============LICENSE_START=======================================================
-# PROJECT
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-# 1 build the docker image for ves collector
-# 2 tag and then push to the remote repo if not verify
-#
-
-phase=$1
-
-VERSION=$(xpath -e '//project/version/text()' 'pom.xml')
-VERSION=${VERSION//\"/}
-EXT=$(echo "$VERSION" | rev | cut -s -f1 -d'-' | rev)
-if [ -z "$EXT" ]; then
-  EXT="STAGING"
-fi
-case $phase in
-  verify|merge)
-    if [ "$EXT" != 'SNAPSHOT' ]; then
-      echo "$phase job only takes SNAPSHOT version, got \"$EXT\" instead"
-      exit 1
-    fi
-    ;;
-  release)
-    if [ ! -z "$EXT" ] && [ "$EXT" != 'STAGING' ]; then
-      echo "$phase job only takes STAGING or pure numerical version, got \"$EXT\" instead"
-      exit 1
-    fi
-    ;;
-  *)
-    echo "Unknown phase \"$phase\""
-    exit 1
-esac
-echo "Running \"$phase\" job for version \"$VERSION\""
-
-# unarchive the service manager
-TARGET="${WORKSPACE}/target"
-STAGE="${TARGET}/stage"
-BASE_DIR="${STAGE}/opt/app"
-
-# unarchive the collector
-AR=${WORKSPACE}/target/VESCollector-${VERSION}-bundle.tar.gz
-APP_DIR=${STAGE}/opt/app/VESCollector
-
-[ -d "${STAGE}/opt/app/VESCollector-${VERSION}" ] && rm -rf "${STAGE}/opt/app/VESCollector-${VERSION}"
-
-[ ! -f "${APP_DIR}" ] && mkdir -p "${APP_DIR}"
-
-gunzip -c "${AR}" | tar xvf - -C "${APP_DIR}" --strip-components=1
-
-
-if [ ! -f "${APP_DIR}/bin/docker-entry.sh" ]
-then
-		echo "FATAL error cannot locate ${APP_DIR}/bin/docker-entry.sh"
-		exit 2
-fi
-cp -p ${APP_DIR}/bin/docker-entry.sh ${BASE_DIR}/docker-entry.sh
-chmod 755 "${BASE_DIR}/docker-entry.sh"
-
-
-
-
-#
-# generate docker file
-#
-if [ ! -f "${APP_DIR}/Dockerfile" ]
-then
-		echo "FATAL error cannot locate ${APP_DIR}/Dockerfile"
-		exit 2
-fi
-cp -p ${APP_DIR}/Dockerfile ${STAGE}/Dockerfile
-
-
-#
-# build the docker image. tag and then push to the remote repo
-#
-IMAGE='onap/dcaegen2.ves.collector'
-VERSION="${VERSION//[^0-9.]/}"
-VERSION2=$(echo "$VERSION" | cut -f1-2 -d'.')
-
-TIMESTAMP="-$(date +%C%y%m%dT%H%M%S)"
-LFQI="${IMAGE}:${VERSION}${TIMESTAMP}"
-BUILD_PATH="${WORKSPACE}/target/stage"
-# build a docker image
-echo docker build --rm -t "${LFQI}" "${BUILD_PATH}"
-docker build --rm -t "${LFQI}" "${BUILD_PATH}"
-
-case $phase in
-  verify)
-    exit 0
-  ;;
-esac
-
-#
-# push the image
-#
-# io registry  DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
-# release registry                   nexus3.openecomp.org:10002 \
-# snapshot registry                   nexus3.openecomp.org:10003"
-# staging registry                   nexus3.openecomp.org:10004"
-case $EXT in
-SNAPSHOT|snapshot)
-    REPO='nexus3.onap.org:10003'
-    EXT="-SNAPSHOT"
-    ;;
-STAGING|staging)
-    REPO='nexus3.onap.org:10003'
-    EXT="-STAGING"
-    ;;
-"")
-    REPO='nexus3.onap.org:10002'
-    EXT=""
-    echo "version has no extension, intended for release, in \"$phase\" phase. donot do release here"
-    exit 1
-    ;;
-*)
-    echo "Unknown extension \"$EXT\" in version"
-    exit 1
-    ;;
-esac
-
-#docker login "$REPO" -u "$IMAGE" -p "<password>"
-
-OLDTAG="${LFQI}"
-PUSHTAGS="${REPO}/${IMAGE}:${VERSION}${EXT}${TIMESTAMP} ${REPO}/${IMAGE}:latest ${REPO}/${IMAGE}:${VERSION2}${EXT}-latest"
-for NEWTAG in ${PUSHTAGS}
-do
-   echo "tagging ${OLDTAG} to ${NEWTAG}"
-   docker tag "${OLDTAG}" "${NEWTAG}"
-   echo "pushing ${NEWTAG}"
-   docker push "${NEWTAG}"
-   OLDTAG="${NEWTAG}"
-done
-
diff --git a/etc/CommonEventFormat_27.2.json b/etc/CommonEventFormat_27.2.json
index 34eefba3..76f87e2f 100644
--- a/etc/CommonEventFormat_27.2.json
+++ b/etc/CommonEventFormat_27.2.json
@@ -1,48 +1,57 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
-	
+	"$schema": "http://json-schema.org/draft-04/schema#",
 	"definitions": {
-				"attCopyrightNotice": {
-				"description": "Copyright (c) <2017>, AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the License)",
-				"type": "object",
-				"properties": {
-					"useAndRedistribution": {
-						"description": "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",
-						"type": "string"
-					},
-					"licenseLink": "http://www.apache.org/licenses/LICENSE-2.0",
-					"condition1": {
-						"description": "Unless required by applicable law or agreed to in writing, software 13 * distributed under the License is distributed on an AS IS BASIS,",
-						"type": "string"
-					},
-					"condition2": {
-						"description": "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.",
-						"type": "string"
-					},
-					"condition3": {
-						"description": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
-						"type": "string"
-					},
-					"condition4": {
-						"description": "See the License for the specific language governing permissions and limitations under the License.",
-						"type": "string"
-					},
-					"Trademarks": {
-						"description": "ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.",
-						"type": "string"
-					}
-				   }
+		"attCopyrightNotice": {
+			"description": "Copyright (c) <2017>, AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the License)",
+			"type": "object",
+			"properties": {
+				"useAndRedistribution": {
+					"description": "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",
+					"type": "string"
+				},
+				"licenseLink": {
+				 "description": "http://www.apache.org/licenses/LICENSE-2.0",
+				 "type":"string"
+				},
+				"condition1": {
+					"description": "Unless required by applicable law or agreed to in writing, software 13 * distributed under the License is distributed on an AS IS BASIS,",
+					"type": "string"
 				},
- 		"codecsInUse": {
+				"condition2": {
+					"description": "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.",
+					"type": "string"
+				},
+				"condition3": {
+					"description": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
+					"type": "string"
+				},
+				"condition4": {
+					"description": "See the License for the specific language governing permissions and limitations under the License.",
+					"type": "string"
+				},
+				"Trademarks": {
+					"description": "ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.",
+					"type": "string"
+				}
+			}
+		},
+		"codecsInUse": {
 			"description": "number of times an identified codec was used over the measurementInterval",
 			"type": "object",
 			"properties": {
-				"codecIdentifier": { "type": "string" },
-				"numberInUse": { "type": "number" }
+				"codecIdentifier": {
+					"type": "string"
+				},
+				"numberInUse": {
+					"type": "number"
+				}
 			},
-			"required": [ "codecIdentifier", "numberInUse" ]
+			"required": [
+				"codecIdentifier",
+				"numberInUse"
+			]
 		},
- 		"command": {
+		"command": {
 			"description": "command from an event collector toward an event source",
 			"type": "object",
 			"properties": {
@@ -55,26 +64,36 @@
 						"throttlingSpecification"
 					]
 				},
-				"eventDomainThrottleSpecification": { "$ref": "#/definitions/eventDomainThrottleSpecification" },
-				"measurementInterval": { "type": "number" }
+				"eventDomainThrottleSpecification": {
+					"$ref": "#/definitions/eventDomainThrottleSpecification"
+				},
+				"measurementInterval": {
+					"type": "number"
+				}
 			},
-			"required": [ "commandType" ]
+			"required": [
+				"commandType"
+			]
 		},
 		"commandList": {
 			"description": "array of commands from an event collector toward an event source",
 			"type": "array",
 			"items": {
-			    "$ref": "#/definitions/commandListEntry"
+				"$ref": "#/definitions/commandListEntry"
 			},
 			"minItems": 0
 		},
- 		"commandListEntry": {
+		"commandListEntry": {
 			"description": "reference to a command object",
 			"type": "object",
 			"properties": {
-				"command": {"$ref": "#/definitions/command"}
+				"command": {
+					"$ref": "#/definitions/command"
+				}
 			},
-			"required": [ "command" ]
+			"required": [
+				"command"
+			]
 		},
 		"commonEventHeader": {
 			"description": "fields common to all events",
@@ -106,7 +125,9 @@
 					"description": "function of the event source e.g., eNodeB, MME, PCRF",
 					"type": "string"
 				},
-				"internalHeaderFields": { "$ref": "#/definitions/internalHeaderFields" },
+				"internalHeaderFields": {
+					"$ref": "#/definitions/internalHeaderFields"
+				},
 				"lastEpochMicrosec": {
 					"description": "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",
 					"type": "number"
@@ -150,86 +171,151 @@
 					"type": "number"
 				}
 			},
-			"required": [ "domain", "eventId", "functionalRole", "lastEpochMicrosec",
-						  "priority", "reportingEntityName", "sequence",
-			              "sourceName", "startEpochMicrosec" ]
+			"required": [
+				"domain",
+				"eventId",
+				"functionalRole",
+				"lastEpochMicrosec",
+				"priority",
+				"reportingEntityName",
+				"sequence",
+				"sourceName",
+				"startEpochMicrosec"
+			]
 		},
 		"counter": {
 			"description": "performance counter",
 			"type": "object",
 			"properties": {
-				"criticality": { "type": "string", "enum": [ "CRIT", "MAJ" ] },
-				"name":  { "type": "string" },
-				"thresholdCrossed": { "type": "string" },
-				"value": { "type": "string"}
+				"criticality": {
+					"type": "string",
+					"enum": [
+						"CRIT",
+						"MAJ"
+					]
+				},
+				"name": {
+					"type": "string"
+				},
+				"thresholdCrossed": {
+					"type": "string"
+				},
+				"value": {
+					"type": "string"
+				}
 			},
-			"required": [ "criticality", "name", "thresholdCrossed", "value" ]
+			"required": [
+				"criticality",
+				"name",
+				"thresholdCrossed",
+				"value"
+			]
 		},
 		"cpuUsage": {
 			"description": "percent usage of an identified CPU",
 			"type": "object",
 			"properties": {
-				"cpuIdentifier": { "type": "string" },
-				"percentUsage": { "type": "number" }
+				"cpuIdentifier": {
+					"type": "string"
+				},
+				"percentUsage": {
+					"type": "number"
+				}
 			},
-			"required": [ "cpuIdentifier", "percentUsage" ]
+			"required": [
+				"cpuIdentifier",
+				"percentUsage"
+			]
 		},
 		"errors": {
 			"description": "receive and transmit errors for the measurements domain",
 			"type": "object",
 			"properties": {
-				"receiveDiscards": { "type": "number" },
-				"receiveErrors": { "type": "number" },
-				"transmitDiscards": { "type": "number" },
-				"transmitErrors": { "type": "number" }
+				"receiveDiscards": {
+					"type": "number"
+				},
+				"receiveErrors": {
+					"type": "number"
+				},
+				"transmitDiscards": {
+					"type": "number"
+				},
+				"transmitErrors": {
+					"type": "number"
+				}
 			},
-			"required": [ "receiveDiscards", "receiveErrors", "transmitDiscards", "transmitErrors" ]
+			"required": [
+				"receiveDiscards",
+				"receiveErrors",
+				"transmitDiscards",
+				"transmitErrors"
+			]
+		},
+		"event": {
+			"description": "the root level of the common event format",
+			"type": "object",
+			"properties": {
+				"commonEventHeader": {
+					"$ref": "#/definitions/commonEventHeader"
+				},
+				"faultFields": {
+					"$ref": "#/definitions/faultFields"
+				},
+				"measurementsForVfScalingFields": {
+					"$ref": "#/definitions/measurementsForVfScalingFields"
+				},
+				"mobileFlowFields": {
+					"$ref": "#/definitions/mobileFlowFields"
+				},
+				"otherFields": {
+					"$ref": "#/definitions/otherFields"
+				},
+				"stateChangeFields": {
+					"$ref": "#/definitions/stateChangeFields"
+				},
+				"syslogFields": {
+					"$ref": "#/definitions/syslogFields"
+				},
+				"thresholdCrossingAlertFields": {
+					"$ref": "#/definitions/thresholdCrossingAlertFields"
+				}
+			},
+			"required": [
+				"commonEventHeader"
+			]
 		},
-        "event": {
-            "description": "the root level of the common event format",
-	        "type": "object",
-	        "properties": {
-		        "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" },
-		        "faultFields": { "$ref": "#/definitions/faultFields" },
-		        "measurementsForVfScalingFields": { "$ref": "#/definitions/measurementsForVfScalingFields" },
-				"mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" },
-		        "otherFields": { "$ref": "#/definitions/otherFields" },
-		        "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" },
-				"syslogFields": { "$ref": "#/definitions/syslogFields" },
-		        "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" }
-        	},
-            "required": [ "commonEventHeader" ]
-        },
 		"eventDomainThrottleSpecification": {
 			"description": "specification of what information to suppress within an event domain",
 			"type": "object",
 			"properties": {
-		        "eventDomain": {
-			        "description": "Event domain enum from the commonEventHeader domain field",
-			        "type": "string"
-		        },
-		        "suppressedFieldNames": {
-			        "description": "List of optional field names in the event block that should not be sent to the Event Listener",
-			        "type": "array",
+				"eventDomain": {
+					"description": "Event domain enum from the commonEventHeader domain field",
+					"type": "string"
+				},
+				"suppressedFieldNames": {
+					"description": "List of optional field names in the event block that should not be sent to the Event Listener",
+					"type": "array",
 					"items": {
-					    "type": "string"
+						"type": "string"
 					}
-		        },
+				},
 				"suppressedNvPairsList": {
 					"description": "Optional list of specific NvPairsNames to suppress within a given Name-Value Field",
-			        "type": "array",
+					"type": "array",
 					"items": {
-					    "$ref": "#/definitions/suppressedNvPairs"
+						"$ref": "#/definitions/suppressedNvPairs"
 					}
-		        }
+				}
 			},
-			"required": [ "eventDomain" ]
+			"required": [
+				"eventDomain"
+			]
 		},
 		"eventDomainThrottleSpecificationList": {
 			"description": "array of eventDomainThrottleSpecifications",
 			"type": "array",
 			"items": {
-			    "$ref": "#/definitions/eventDomainThrottleSpecification"
+				"$ref": "#/definitions/eventDomainThrottleSpecification"
 			},
 			"minItems": 0
 		},
@@ -244,17 +330,21 @@
 			"description": "reports the throttling in force at the event source",
 			"type": "object",
 			"properties": {
-		        "eventThrottlingMode": {
-			        "description": "Mode the event manager is in",
-			        "type": "string",
+				"eventThrottlingMode": {
+					"description": "Mode the event manager is in",
+					"type": "string",
 					"enum": [
 						"normal",
 						"throttled"
 					]
-		        },
-				"eventDomainThrottleSpecificationList": { "$ref": "#/definitions/eventDomainThrottleSpecificationList" }
+				},
+				"eventDomainThrottleSpecificationList": {
+					"$ref": "#/definitions/eventDomainThrottleSpecificationList"
+				}
 			},
-			"required": [ "eventThrottlingMode" ]
+			"required": [
+				"eventThrottlingMode"
+			]
 		},
 		"faultFields": {
 			"description": "fields specific to fault events",
@@ -310,41 +400,81 @@
 					]
 				}
 			},
-			"required": [ "alarmCondition", "eventSeverity",
-			              "eventSourceType", "specificProblem", "vfStatus" ]
+			"required": [
+				"alarmCondition",
+				"eventSeverity",
+				"eventSourceType",
+				"specificProblem",
+				"vfStatus"
+			]
 		},
 		"featuresInUse": {
 			"description": "number of times an identified feature was used over the measurementInterval",
 			"type": "object",
 			"properties": {
-				"featureIdentifier": { "type": "string" },
-				"featureUtilization": { "type": "number" }
+				"featureIdentifier": {
+					"type": "string"
+				},
+				"featureUtilization": {
+					"type": "number"
+				}
 			},
-			"required": [ "featureIdentifier", "featureUtilization" ]
+			"required": [
+				"featureIdentifier",
+				"featureUtilization"
+			]
 		},
 		"field": {
 			"description": "name value pair",
 			"type": "object",
 			"properties": {
-				"name":  { "type": "string" },
-				"value": { "type": "string" }
+				"name": {
+					"type": "string"
+				},
+				"value": {
+					"type": "string"
+				}
 			},
-			"required": [ "name", "value" ]
+			"required": [
+				"name",
+				"value"
+			]
 		},
 		"filesystemUsage": {
 			"description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
 			"type": "object",
 			"properties": {
-				"blockConfigured": { "type": "number" },
-				"blockIops": { "type": "number" },
-				"blockUsed": { "type": "number" },
-				"ephemeralConfigured": { "type": "number" },
-				"ephemeralIops": { "type": "number" },
-				"ephemeralUsed": { "type": "number" },
-				"filesystemName": { "type": "string" }
+				"blockConfigured": {
+					"type": "number"
+				},
+				"blockIops": {
+					"type": "number"
+				},
+				"blockUsed": {
+					"type": "number"
+				},
+				"ephemeralConfigured": {
+					"type": "number"
+				},
+				"ephemeralIops": {
+					"type": "number"
+				},
+				"ephemeralUsed": {
+					"type": "number"
+				},
+				"filesystemName": {
+					"type": "string"
+				}
 			},
-			"required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured",
-			              "ephemeralIops", "ephemeralUsed", "filesystemName" ]
+			"required": [
+				"blockConfigured",
+				"blockIops",
+				"blockUsed",
+				"ephemeralConfigured",
+				"ephemeralIops",
+				"ephemeralUsed",
+				"filesystemName"
+			]
 		},
 		"gtpPerFlowMetrics": {
 			"description": "Mobility GTP Protocol per flow metrics",
@@ -424,12 +554,16 @@
 				},
 				"ipTosCountList": {
 					"description": "array of key: value pairs where the keys are drawn from the IP Type-of-Service identifiers which range from '0' to '255', and the values are the count of packets that had those ToS identifiers in the flow",
-                    "type": "array",
-                    "items": {
+					"type": "array",
+					"items": {
 						"type": "array",
 						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
+							{
+								"type": "string"
+							},
+							{
+								"type": "number"
+							}
 						]
 					}
 				},
@@ -462,12 +596,16 @@
 				},
 				"mobileQciCosCountList": {
 					"description": "array of key: value pairs where the keys are drawn from LTE QCI or UMTS class of service strings, and the values are the count of packets that had those strings in the flow",
-                    "type": "array",
-                    "items": {
+					"type": "array",
+					"items": {
 						"type": "array",
 						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
+							{
+								"type": "string"
+							},
+							{
+								"type": "number"
+							}
 						]
 					}
 				},
@@ -560,12 +698,16 @@
 				},
 				"tcpFlagCountList": {
 					"description": "array of key: value pairs where the keys are drawn from TCP Flags and the values are the count of packets that had that TCP Flag in the flow",
-                    "type": "array",
-                    "items": {
+					"type": "array",
+					"items": {
 						"type": "array",
 						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
+							{
+								"type": "string"
+							},
+							{
+								"type": "number"
+							}
 						]
 					}
 				},
@@ -581,21 +723,37 @@
 					"type": "number"
 				}
 			},
-			"required": [ "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"
+			"required": [
+				"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"
 			]
 		},
 		"internalHeaderFields": {
@@ -606,26 +764,39 @@
 			"description": "number of counts falling within a defined latency bucket",
 			"type": "object",
 			"properties": {
-				"countsInTheBucket": { "type": "number" },
-				"highEndOfLatencyBucket": { "type": "number" },
-				"lowEndOfLatencyBucket":  { "type": "number" }
+				"countsInTheBucket": {
+					"type": "number"
+				},
+				"highEndOfLatencyBucket": {
+					"type": "number"
+				},
+				"lowEndOfLatencyBucket": {
+					"type": "number"
+				}
 			},
-			"required": [ "countsInTheBucket" ]
+			"required": [
+				"countsInTheBucket"
+			]
 		},
 		"measurementGroup": {
 			"description": "measurement group",
 			"type": "object",
 			"properties": {
-				"name":  { "type": "string" },
+				"name": {
+					"type": "string"
+				},
 				"measurements": {
 					"description": "array of name value pair measurements",
 					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
+					"items": {
+						"$ref": "#/definitions/field"
 					}
 				}
 			},
-			"required": [ "name", "measurements" ]
+			"required": [
+				"name",
+				"measurements"
+			]
 		},
 		"measurementsForVfScalingFields": {
 			"description": "measurementsForVfScaling fields",
@@ -664,7 +835,9 @@
 						"$ref": "#/definitions/cpuUsage"
 					}
 				},
-				"errors": { "$ref": "#/definitions/errors" },
+				"errors": {
+					"$ref": "#/definitions/errors"
+				},
 				"featureUsageArray": {
 					"description": "array of features in use",
 					"type": "array",
@@ -726,7 +899,9 @@
 					}
 				}
 			},
-			"required": [ "measurementInterval" ]
+			"required": [
+				"measurementInterval"
+			]
 		},
 		"mobileFlowFields": {
 			"description": "mobileFlow fields",
@@ -767,7 +942,9 @@
 					"description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
 					"type": "string"
 				},
-				"gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" },
+				"gtpPerFlowMetrics": {
+					"$ref": "#/definitions/gtpPerFlowMetrics"
+				},
 				"gtpProtocolType": {
 					"description": "GTP protocol",
 					"type": "string"
@@ -808,10 +985,10 @@
 					"description": "mobile network code",
 					"type": "string"
 				},
-                "mobileFlowFieldsVersion": {
-                    "description": "version of the mobileFlowFields block",
-                    "type": "number"
-                },
+				"mobileFlowFieldsVersion": {
+					"description": "version of the mobileFlowFields block",
+					"type": "number"
+				},
 				"msisdn": {
 					"description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
 					"type": "string"
@@ -865,9 +1042,16 @@
 					"type": "string"
 				}
 			},
-			"required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType",
-			              "ipVersion", "otherEndpointIpAddress", "otherEndpointPort",
-			              "reportingEndpointIpAddr", "reportingEndpointPort" ]
+			"required": [
+				"flowDirection",
+				"gtpPerFlowMetrics",
+				"ipProtocolType",
+				"ipVersion",
+				"otherEndpointIpAddress",
+				"otherEndpointPort",
+				"reportingEndpointIpAddr",
+				"reportingEndpointPort"
+			]
 		},
 		"otherFields": {
 			"description": "additional fields not reported elsewhere",
@@ -880,7 +1064,7 @@
 			"description": "standard request error data structure",
 			"type": "object",
 			"properties": {
-			    "messageId": {
+				"messageId": {
 					"description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
 					"type": "string"
 				},
@@ -897,7 +1081,10 @@
 					"type": "string"
 				}
 			},
-			"required": [ "messageId", "text" ]
+			"required": [
+				"messageId",
+				"text"
+			]
 		},
 		"stateChangeFields": {
 			"description": "stateChange fields",
@@ -937,7 +1124,11 @@
 					"type": "string"
 				}
 			},
-			"required": [ "newState", "oldState", "stateInterface" ]
+			"required": [
+				"newState",
+				"oldState",
+				"stateInterface"
+			]
 		},
 		"suppressedNvPairs": {
 			"description": "List of specific NvPairsNames to suppress within a given Name-Value Field for event Throttling",
@@ -949,13 +1140,16 @@
 				},
 				"suppressedNvPairNames": {
 					"description": "Array of nvpair names to suppress within the nvpairFieldName",
-			        "type": "array",
+					"type": "array",
 					"items": {
-					    "type": "string"
+						"type": "string"
 					}
 				}
 			},
-			"required": [ "nvPairFieldName", "suppressedNvPairNames" ]
+			"required": [
+				"nvPairFieldName",
+				"suppressedNvPairNames"
+			]
 		},
 		"syslogFields": {
 			"description": "sysLog fields",
@@ -1021,7 +1215,11 @@
 					"type": "number"
 				}
 			},
-			"required": [ "eventSourceType", "syslogMsg", "syslogTag" ]
+			"required": [
+				"eventSourceType",
+				"syslogMsg",
+				"syslogTag"
+			]
 		},
 		"thresholdCrossingAlertFields": {
 			"description": "fields specific to threshold crossing alert events",
@@ -1030,8 +1228,8 @@
 				"additionalFields": {
 					"description": "additional threshold crossing alert fields if needed",
 					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
+					"items": {
+						"$ref": "#/definitions/field"
 					}
 				},
 				"additionalParameters": {
@@ -1071,7 +1269,9 @@
 				"associatedAlertIdList": {
 					"description": "List of eventIds associated with the event being reported",
 					"type": "array",
-					"items": { "type": "string" }
+					"items": {
+						"type": "string"
+					}
 				},
 				"collectionTimestamp": {
 					"description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
@@ -1131,24 +1331,54 @@
 			"description": "usage of identified virtual network interface card",
 			"type": "object",
 			"properties": {
-				"broadcastPacketsIn": { "type": "number" },
-				"broadcastPacketsOut": { "type": "number" },
-				"bytesIn": { "type": "number" },
-				"bytesOut": { "type": "number" },
-				"multicastPacketsIn": { "type": "number" },
-				"multicastPacketsOut": { "type": "number" },
-				"packetsIn": { "type": "number" },
-				"packetsOut": { "type": "number" },
-				"unicastPacketsIn": { "type": "number" },
-				"unicastPacketsOut": { "type": "number" },
-				"vNicIdentifier": { "type": "string" }
+				"broadcastPacketsIn": {
+					"type": "number"
+				},
+				"broadcastPacketsOut": {
+					"type": "number"
+				},
+				"bytesIn": {
+					"type": "number"
+				},
+				"bytesOut": {
+					"type": "number"
+				},
+				"multicastPacketsIn": {
+					"type": "number"
+				},
+				"multicastPacketsOut": {
+					"type": "number"
+				},
+				"packetsIn": {
+					"type": "number"
+				},
+				"packetsOut": {
+					"type": "number"
+				},
+				"unicastPacketsIn": {
+					"type": "number"
+				},
+				"unicastPacketsOut": {
+					"type": "number"
+				},
+				"vNicIdentifier": {
+					"type": "string"
+				}
 			},
-			"required": [ "bytesIn", "bytesOut", "packetsIn", "packetsOut", "vNicIdentifier"]
+			"required": [
+				"bytesIn",
+				"bytesOut",
+				"packetsIn",
+				"packetsOut",
+				"vNicIdentifier"
+			]
 		}
 	},
 	"title": "Event Listener",
 	"type": "object",
 	"properties": {
-        "event": {"$ref": "#/definitions/event"}
-    }
-}
\ No newline at end of file
+		"event": {
+			"$ref": "#/definitions/event"
+		}
+	}
+}
diff --git a/etc/CommonEventFormat_28.3.json b/etc/CommonEventFormat_28.3.json
index 967b8ed1..90f6d81a 100644
--- a/etc/CommonEventFormat_28.3.json
+++ b/etc/CommonEventFormat_28.3.json
@@ -2,37 +2,41 @@
     "$schema": "http://json-schema.org/draft-04/schema#",
 	
 	"definitions": {
-				"attCopyrightNotice": {
-				"description": "Copyright (c) <2017>, AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the License)",
-				"type": "object",
-				"properties": {
-					"useAndRedistribution": {
-						"description": "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",
-						"type": "string"
-					},
-					"licenseLink": "http://www.apache.org/licenses/LICENSE-2.0",
-					"condition1": {
-						"description": "Unless required by applicable law or agreed to in writing, software 13 * distributed under the License is distributed on an AS IS BASIS,",
-						"type": "string"
-					},
-					"condition2": {
-						"description": "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.",
-						"type": "string"
-					},
-					"condition3": {
-						"description": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
-						"type": "string"
-					},
-					"condition4": {
-						"description": "See the License for the specific language governing permissions and limitations under the License.",
-						"type": "string"
-					},
-					"Trademarks": {
-						"description": "ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.",
-						"type": "string"
-					}
-				   }
+	"attCopyrightNotice": {
+			"description": "Copyright (c) <2017>, AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the License)",
+			"type": "object",
+			"properties": {
+				"useAndRedistribution": {
+					"description": "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",
+					"type": "string"
+				},
+				"licenseLink": {
+				 "description": "http://www.apache.org/licenses/LICENSE-2.0",
+				 "type":"string"
+				},
+				"condition1": {
+					"description": "Unless required by applicable law or agreed to in writing, software 13 * distributed under the License is distributed on an AS IS BASIS,",
+					"type": "string"
+				},
+				"condition2": {
+					"description": "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.",
+					"type": "string"
+				},
+				"condition3": {
+					"description": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
+					"type": "string"
+				},
+				"condition4": {
+					"description": "See the License for the specific language governing permissions and limitations under the License.",
+					"type": "string"
 				},
+				"Trademarks": {
+					"description": "ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.",
+					"type": "string"
+				}
+			}
+		},
+	
  		"codecsInUse": {
 			"description": "number of times an identified codec was used over the measurementInterval",
 			"type": "object",
@@ -1415,7 +1419,7 @@
                     "type": "number"
                 },
                 "summarySip": {
-                    "description": "the SIP Method or Response (‘INVITE’, ‘200 OK’, ‘BYE’, etc)",
+                    "description": "the SIP Method or Response (‘INVITE’, ‘200 OK’, ‘BYE’, etc)",
                     "type": "string"
                 },
                 "vendorVnfNameFields": {
@@ -1488,7 +1492,7 @@
 			"type": "object",
 			"properties": {
 				"additionalFields": {
-					"description": "additional syslog fields if needed provided as name=value delimited by a pipe ‘|’ symbol, for example: 'name1=value1|name2=value2|…'",
+					"description": "additional syslog fields if needed provided as name=value delimited by a pipe ‘|’ symbol, for example: 'name1=value1|name2=value2|…'",
 					"type": "string"
 				},
 				"eventSourceHost": {
@@ -1859,4 +1863,4 @@
 	"properties": {
         "event": {"$ref": "#/definitions/event"}
     }
-}
\ No newline at end of file
+}
diff --git a/etc/CommonEventFormat_Vendors_v25.json b/etc/CommonEventFormat_Vendors_v25.json
deleted file mode 100644
index 37198f2a..00000000
--- a/etc/CommonEventFormat_Vendors_v25.json
+++ /dev/null
@@ -1,1117 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-	
-	"definitions": {
-			"attCopyrightNotice": {
-				"description": "Copyright (c) <2017>, AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the License)",
-				"type": "object",
-				"properties": {
-					"useAndRedistribution": {
-						"description": "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",
-						"type": "string"
-					},
-					"licenseLink": "http://www.apache.org/licenses/LICENSE-2.0",
-					"condition1": {
-						"description": "Unless required by applicable law or agreed to in writing, software 13 * distributed under the License is distributed on an AS IS BASIS,",
-						"type": "string"
-					},
-					"condition2": {
-						"description": "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.",
-						"type": "string"
-					},
-					"condition3": {
-						"description": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
-						"type": "string"
-					},
-					"condition4": {
-						"description": "See the License for the specific language governing permissions and limitations under the License.",
-						"type": "string"
-					},
-					"Trademarks": {
-						"description": "ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.",
-						"type": "string"
-					}
-				   }
-				},
- 		"codecsInUse": {
-			"description": "number of times an identified codec was used over the measurementInterval",
-			"type": "object",
-			"properties": {
-				"codecIdentifier": { "type": "string" },
-				"numberInUse": { "type": "number" }
-			},
-			"required": [ "codecIdentifier", "codecUtilization" ]
-		},
- 		"command": {
-			"description": "command from an event collector toward an event source",
-			"type": "object",
-			"properties": {
-				"commandType": { 
-					"type": "string", 
-					"enum": [
-						"measurementIntervalChange",
-						"provideThrottlingState",
-						"throttlingSpecification"
-					]
-				},
-				"eventDomainThrottleSpecification": { "$ref": "#/definitions/eventDomainThrottleSpecification" },
-				"measurementInterval": { "type": "number" }
-			},
-			"required": [ "commandType" ]
-		},
-		"commandList": {
-			"description": "array of commands from an event collector toward an event source",
-			"type": "array",
-			"items": { 
-			    "$ref": "#/definitions/command"
-			},
-			"minItems": 0
-		},
-		"commonEventHeader": {
-			"description": "fields common to all events",
-			"type": "object",
-			"properties": {
-				"domain": {
-					"description": "the eventing domain associated with the event",
-					"type": "string",
-					"enum": [
-						"fault",
-						"heartbeat",
-						"measurementsForVfScaling",
-						"mobileFlow",
-						"other",
-						"stateChange",
-						"syslog",
-						"thresholdCrossingAlert"
-					]
-				},
-				"eventId": {
-					"description": "event key that is unique to the event source",
-					"type": "string"
-				},
-				"eventType": {
-					"description": "unique event topic name",
-					"type": "string"
-				},
-				"functionalRole": {
-					"description": "function of the event source e.g., eNodeB, MME, PCRF",
-					"type": "string"
-				},
-				"lastEpochMicrosec": {
-					"description": "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",
-					"type": "number"
-				},
-				"priority": {
-					"description": "processing priority",
-					"type": "string",
-					"enum": [
-						"High",
-						"Medium",
-						"Normal",
-						"Low"
-					]
-				},
-				"reportingEntityId": {
-					"description": "UUID identifying the entity reporting the event, for example an OAM VM",
-					"type": "string"
-				},
-				"reportingEntityName": {
-					"description": "name of the entity reporting the event, for example, an OAM VM",
-					"type": "string"
-				},
-				"sequence": {
-					"description": "ordering of events communicated by an event source instance or 0 if not needed",
-					"type": "integer"
-				},
-				"sourceId": {
-					"description": "UUID identifying the entity experiencing the event issue",
-					"type": "string"
-				},
-				"sourceName": {
-					"description": "name of the entity experiencing the event issue",
-					"type": "string"
-				},
-				"startEpochMicrosec": {
-					"description": "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",
-					"type": "number"
-				},
-				"version": {
-					"description": "version of the event header",
-					"type": "number"
-				}
-			},
-			"required": [ "domain", "eventId", "functionalRole", "lastEpochMicrosec", 
-						  "priority", "reportingEntityName", "sequence",
-			              "sourceName", "startEpochMicrosec" ]
-		},
-		"counter": {
-			"description": "performance counter",
-			"type": "object",
-			"properties": {
-				"criticality": { "type": "string", "enum": [ "CRIT", "MAJ" ] },
-				"name":  { "type": "string" },
-				"thresholdCrossed": { "type": "string" },
-				"value": { "type": "string"}
-			},
-			"required": [ "criticality", "name", "thresholdCrossed", "value" ]
-		},
-		"cpuUsage": {
-			"description": "percent usage of an identified CPU",
-			"type": "object",
-			"properties": {
-				"cpuIdentifier": { "type": "string" },
-				"percentUsage": { "type": "number" }
-			},
-			"required": [ "cpuIdentifier", "percentUsage" ]
-		},
-		"errors": {
-			"description": "receive and transmit errors for the measurements domain",
-			"type": "object",
-			"properties": {
-				"receiveDiscards": { "type": "number" },
-				"receiveErrors": { "type": "number" },
-				"transmitDiscards": { "type": "number" },
-				"transmitErrors": { "type": "number" }
-			},
-			"required": [ "receiveDiscards", "receiveErrors", "transmitDiscards", "transmitErrors" ]
-		},
-        "event": {
-            "description": "generic event format",
-	        "type": "object",
-	        "properties": {
-		        "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" },
-		        "faultFields": { "$ref": "#/definitions/faultFields" },
-	 	        "measurementsForVfScalingFields": { "$ref": "#/definitions/measurementsForVfScalingFields" },
-				"mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" },
-		        "otherFields": { "$ref": "#/definitions/otherFields" },
-		        "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" },
-				"syslogFields": { "$ref": "#/definitions/syslogFields" },
-		        "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" }
-        	},
-            "required": [ "commonEventHeader" ]
-        },
-		"eventDomainThrottleSpecification": {
-			"description": "specification of what information to suppress within an event domain",
-			"type": "object",
-			"properties": { 
-		        "eventDomain": { 
-			        "description": "Event domain enum from the commonEventHeader domain field",
-			        "type": "string"
-		        },
-		        "suppressedFieldNames": { 
-			        "description": "List of optional field names in the event block that should not be sent to the Event Listener",
-			        "type": "array",
-					"items": {
-					    "type": "string"
-					}
-		        },
-				"suppressedNvPairsList": {
-					"description": "Optional list of specific NvPairsNames to suppress within a given Name-Value Field",
-			        "type": "array",
-					"items": {
-					    "$ref": "#/definitions/suppressedNvPairs"
-					}
-		        }
-			},
-			"required": [ "eventDomain" ]
-		},
-		"eventDomainThrottleSpecificationList": {
-			"description": "array of eventDomainThrottleSpecifications",
-			"type": "array",
-			"items": { 
-			    "$ref": "#/definitions/eventDomainThrottleSpecification"
-			},
-			"minItems": 0
-		},
-		"eventList": {
-			"description": "array of events",
-			"type": "array",
-			"items": {  
-				"$ref": "#/definitions/event" 
-			}
-		},
-		"eventThrottlingState": {
-			"description": "reports the throttling in force at the event source",
-			"type": "object",
-			"properties": { 
-		        "eventThrottlingMode": { 
-			        "description": "Mode the event manager is in",
-			        "type": "string",
-					"enum": [
-						"normal",
-						"throttled"
-					]
-		        },
-				"eventDomainThrottleSpecificationList": { "$ref": "#/definitions/eventDomainThrottleSpecificationList" }
-			},
-			"required": [ "eventThrottlingMode" ]
-		},
-		"faultFields": {
-			"description": "fields specific to fault events",
-			"type": "object",
-			"properties": {
-				"alarmAdditionalInformation": {
-					"description": "additional alarm information",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/field"
-					}
-				},
-				"alarmCondition": {
-					"description": "alarm condition reported by the device",
-					"type": "string"
-				},
-				"alarmInterfaceA": {
-					"description": "card, port, channel or interface name of the device generating the alarm",
-					"type": "string"
-				},
-				"eventSeverity": {
-					"description": "event severity or priority",
-					"type": "string",
-					"enum": [
-						"CRITICAL",
-						"MAJOR",
-						"MINOR",
-						"WARNING",
-						"NORMAL"
-					]
-				},
-				"eventSourceType": {
-					"description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction",
-					"type": "string"
-				},
-				"faultFieldsVersion": {
-					"description": "version of the faultFields block",
-					"type": "number"
-				},
-				"specificProblem": {
-					"description": "short description of the alarm or problem",
-					"type": "string"
-				},
-				"vfStatus": {
-					"description": "virtual function status enumeration",
-					"type": "string",
-					"enum": [
-						"Active",
-						"Idle",
-						"Preparing to terminate",
-						"Ready to terminate",
-						"Requesting termination"
-					]
-				}
-			},
-			"required": [ "alarmCondition", "eventSeverity",
-			              "eventSourceType", "specificProblem", "vfStatus" ]
-		},
-		"featuresInUse": {
-			"description": "number of times an identified feature was used over the measurementInterval",
-			"type": "object",
-			"properties": {
-				"featureIdentifier": { "type": "string" },
-				"featureUtilization": { "type": "number" }
-			},
-			"required": [ "featureIdentifier", "featureUtilization" ]
-		},
-		"field": {
-			"description": "name value pair",
-			"type": "object",
-			"properties": {
-				"name":  { "type": "string" },
-				"value": { "type": "string" }
-			},
-			"required": [ "name", "value" ]
-		},
-		"filesystemUsage": {
-			"description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
-			"type": "object",
-			"properties": {
-				"blockConfigured": { "type": "number" },
-				"blockIops": { "type": "number" },
-				"blockUsed": { "type": "number" },
-				"ephemeralConfigured": { "type": "number" },
-				"ephemeralIops": { "type": "number" },
-				"ephemeralUsed": { "type": "number" },
-				"filesystemName": { "type": "string" }
-			},
-			"required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured",
-			              "ephemeralIops", "ephemeralUsed", "filesystemName" ]
-		},
-		"gtpPerFlowMetrics": {
-			"description": "Mobility GTP Protocol per flow metrics",
-			"type": "object",
-			"properties": {
-				"avgBitErrorRate": {
-					"description": "average bit error rate",
-					"type": "number"
-				},
-				"avgPacketDelayVariation": {
-					"description": "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",
-					"type": "number"
-				},
-				"avgPacketLatency": {
-					"description": "average delivery latency",
-					"type": "number"
-				},
-				"avgReceiveThroughput": {
-					"description": "average receive throughput",
-					"type": "number"
-				},
-				"avgTransmitThroughput": {
-					"description": "average transmit throughput",
-					"type": "number"
-				},
-				"durConnectionFailedStatus": {
-					"description": "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",
-					"type": "number"
-				},
-				"durTunnelFailedStatus": {
-					"description": "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",
-					"type": "number"
-				},
-				"flowActivatedBy": {
-					"description": "Endpoint activating the flow",
-					"type": "string"
-				},
-				"flowActivationEpoch": {
-					"description": "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",
-					"type": "number"
-				},
-				"flowActivationMicrosec": {
-					"description": "Integer microseconds for the start of the flow connection",
-					"type": "number"
-				},
-				"flowActivationTime": {
-					"description": "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’",
-					"type": "string"
-				},
-				"flowDeactivatedBy": {
-					"description": "Endpoint deactivating the flow",
-					"type": "string"
-				},
-				"flowDeactivationEpoch": {
-					"description": "Time for the start of the flow connection, in integer UTC epoch time aka UNIX time",
-					"type": "number"
-				},
-				"flowDeactivationMicrosec": {
-					"description": "Integer microseconds for the start of the flow connection",
-					"type": "number"
-				},
-				"flowDeactivationTime": {
-					"description": "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’",
-					"type": "string"
-				},
-				"flowStatus": {
-					"description": "connection status at reporting time as a working / inactive / failed indicator value",
-					"type": "string"
-				},
-				"gtpConnectionStatus": {
-					"description": "Current connection state at reporting time",
-					"type": "string"
-				},
-				"gtpTunnelStatus": {
-					"description": "Current tunnel state  at reporting time",
-					"type": "string"
-				},
-				"ipTosCountList": {
-					"description": "array of key: value pairs where the keys are drawn from the IP Type-of-Service identifiers which range from '0' to '255', and the values are the count of packets that had those ToS identifiers in the flow",
-                    "type": "array", 
-                    "uniqueItems": true, 
-                    "items": { 
-						"type": "array", 
-						"items": [ 
-							{ "type": "string" }, 
-							{ "type": "number" } 
-						], 
-						"additionalItems": false 
-					} 
-				},
-				"ipTosList": {
-					"description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'",
-					"type": "array",
-					"items": {  
-						"type": "string" 
-					}
-				},
-				"largePacketRtt": {
-					"description": "large packet round trip time",
-					"type": "number"
-				},
-				"largePacketThreshold": {
-					"description": "large packet threshold being applied",
-					"type": "number"
-				},
-				"maxPacketDelayVariation": {
-					"description": "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",
-					"type": "number"
-				},
-				"maxReceiveBitRate": {
-					"description": "maximum receive bit rate",
-					"type": "number"
-				},
-				"maxTransmitBitRate": {
-					"description": "maximum transmit bit rate",
-					"type": "number"
-				},
-				"mobileQciCosCountList": {
-					"description": "array of key: value pairs where the keys are drawn from LTE QCI or UMTS class of service strings, and the values are the count of packets that had those strings in the flow",
-                    "type": "array", 
-                    "uniqueItems": true, 
-                    "items": { 
-						"type": "array", 
-						"items": [ 
-							{ "type": "string" }, 
-							{ "type": "number" } 
-						], 
-						"additionalItems": false 
-					} 
-				},
-				"mobileQciCosList": {
-					"description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow",
-					"type": "array",
-					"items": {  
-						"type": "string" 
-					}
-				},
-				"numActivationFailures": {
-					"description": "Number of failed activation requests, as observed by the reporting node",
-					"type": "number"
-				},
-				"numBitErrors": {
-					"description": "number of errored bits",
-					"type": "number"
-				},
-				"numBytesReceived": {
-					"description": "number of bytes received, including retransmissions",
-					"type": "number"
-				},
-				"numBytesTransmitted": {
-					"description": "number of bytes transmitted, including retransmissions",
-					"type": "number"
-				},
-				"numDroppedPackets": {
-					"description": "number of received packets dropped due to errors per virtual interface",
-					"type": "number"
-				},
-				"numGtpEchoFailures": {
-					"description": "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",
-					"type": "number"
-				},
-				"numGtpTunnelErrors": {
-					"description": "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",
-					"type": "number"
-				},
-				"numHttpErrors": {
-					"description": "Http error count",
-					"type": "number"
-				},
-				"numL7BytesReceived": {
-					"description": "number of tunneled layer 7 bytes received, including retransmissions",
-					"type": "number"
-				},
-				"numL7BytesTransmitted": {
-					"description": "number of tunneled layer 7 bytes transmitted, excluding retransmissions",
-					"type": "number"
-				},
-				"numLostPackets": {
-					"description": "number of lost packets",
-					"type": "number"
-				},
-				"numOutOfOrderPackets": {
-					"description": "number of out-of-order packets",
-					"type": "number"
-				},
-				"numPacketErrors": {
-					"description": "number of errored packets",
-					"type": "number"
-				},
-				"numPacketsReceivedExclRetrans": {
-					"description": "number of packets received, excluding retransmission",
-					"type": "number"
-				},
-				"numPacketsReceivedInclRetrans": {
-					"description": "number of packets received, including retransmission",
-					"type": "number"
-				},
-				"numPacketsTransmittedInclRetrans": {
-					"description": "number of packets transmitted, including retransmissions",
-					"type": "number"
-				},
-				"numRetries": {
-					"description": "number of packet retries",
-					"type": "number"
-				},
-				"numTimeouts": {
-					"description": "number of packet timeouts",
-					"type": "number"
-				},
-				"numTunneledL7BytesReceived": {
-					"description": "number of tunneled layer 7 bytes received, excluding retransmissions",
-					"type": "number"
-				},
-				"roundTripTime": {
-					"description": "round trip time",
-					"type": "number"
-				},
-				"tcpFlagCountList": {
-					"description": "array of key: value pairs where the keys are drawn from TCP Flags and the values are the count of packets that had that TCP Flag in the flow",
-                    "type": "array", 
-                    "uniqueItems": true, 
-                    "items": { 
-						"type": "array", 
-						"items": [ 
-							{ "type": "string" }, 
-							{ "type": "number" } 
-						], 
-						"additionalItems": false 
-					} 
-				},
-				"tcpFlagList": {
-					"description": "Array of unique TCP Flags observed in the flow",
-					"type": "array",
-					"items": {  
-						"type": "string" 
-					}
-				},
-				"timeToFirstByte": {
-					"description": "Time in milliseconds between the connection activation and first byte received",
-					"type": "number"
-				}
-			},
-			"required": [ "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"  
-			]
-		},
-		"latencyBucketMeasure": {
-			"description": "number of counts falling within a defined latency bucket",
-			"type": "object",
-			"properties": {
-				"countsInTheBucket": { "type": "number" },
-				"highEndOfLatencyBucket": { "type": "number" },
-				"lowEndOfLatencyBucket":  { "type": "number" }
-			},
-			"required": [ "countsInTheBucket" ]
-		},
-		"measurementGroup": {
-			"description": "measurement group",
-			"type": "object",
-			"properties": {
-				"name":  { "type": "string" },
-				"measurements": {
-					"description": "array of name value pair measurements",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
-					}
-				}
-			},
-			"required": [ "name", "measurements" ]
-		},
-		"measurementsForVfScalingFields": {
-			"description": "measurementsForVfScaling fields",
-			"type": "object",
-			"properties": {
-				"additionalMeasurements": {
-					"description": "additional measurement fields",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/measurementGroup" 
-					}
-				},
-				"aggregateCpuUsage": { 
-					"description": "aggregate CPU usage of the VM on which the VNFC reporting the event is running",
-					"type": "number" 
-				},
-				"codecUsageArray": {
-					"description": "array of codecs in use",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/codecsInUse" 
-					}
-				},
-				"concurrentSessions": { 
-					"description": "peak concurrent sessions for the VM or VNF over the measurementInterval",
-					"type": "number" 
-				},
-				"configuredEntities": { 
-					"description": "over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the VNF",
-					"type": "number" 
-				},
-				"cpuUsageArray": {
-					"description": "usage of an array of CPUs",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/cpuUsage"
-					}
-				},
-				"errors": { "$ref": "#/definitions/errors" },
-				"featureUsageArray": {
-					"description": "array of features in use",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/featuresInUse" 
-					}
-				},
-				"filesystemUsageArray": {
-					"description": "filesystem usage of the VM on which the VNFC reporting the event is running",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/filesystemUsage" 
-					}
-				},
-				"latencyDistribution": { 
-					"description": "array of integers representing counts of requests whose latency in milliseconds falls within per-VNF configured ranges",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/latencyBucketMeasure" 
-					}
-				},
-				"meanRequestLatency": { 
-					"description": "mean seconds required to respond to each request for the VM on which the VNFC reporting the event is running",
-					"type": "number" 
-				},
-				"measurementInterval": {
-					"description": "interval over which measurements are being reported in seconds",
-					"type": "number"
-				},
-				"measurementsForVfScalingVersion": {
-					"description": "version of the measurementsForVfScaling block",
-					"type": "number"
-				},
-				"memoryConfigured": { 
-					"description": "memory configured in the VM on which the VNFC reporting the event is running",
-					"type": "number"
-				},
-				"memoryUsed": {
-					"description": "memory usage of the VM on which the VNFC reporting the event is running",
-					"type": "number"
-				},
-				"numberOfMediaPortsInUse": {
-					"description": "number of media ports in use",
-					"type": "number"
-				},
-				"requestRate": { 
-					"description": "peak rate of service requests per second to the VNF over the measurementInterval",
-					"type": "number" 
-				},
-				"vnfcScalingMetric": {
-					"description": "represents busy-ness of the VNF from 0 to 100 as reported by the VNFC",
-					"type": "number"
-				},
-				"vNicUsageArray": {
-					"description": "usage of an array of virtual network interface cards",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/vNicUsage" 
-					}
-				}
-			},
-			"required": [ "measurementInterval" ]
-		},
-		"mobileFlowFields": {
-			"description": "mobileFlow fields",
-			"type": "object",
-			"properties": {
-				"applicationType": {
-					"description": "Application type inferred",
-					"type": "string"
-				},
-				"appProtocolType": {
-					"description": "application protocol",
-					"type": "string"
-				},
-				"appProtocolVersion": {
-					"description": "application protocol version",
-					"type": "string"
-				},
-				"cid": {
-					"description": "cell id",
-					"type": "string"
-				},
-				"connectionType": {
-					"description": "Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc",
-					"type": "string"
-				},
-				"ecgi": {
-					"description": "Evolved Cell Global Id",
-					"type": "string"
-				},
-				"flowDirection": {
-					"description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
-					"type": "string"
-				},
-				"gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" },
-				"gtpProtocolType": {
-					"description": "GTP protocol",
-					"type": "string"
-				},
-				"gtpVersion": {
-					"description": "GTP protocol version",
-					"type": "string"
-				},
-				"httpHeader": {
-					"description": "HTTP request header, if the flow connects to a node referenced by HTTP",
-					"type": "string"
-				},
-				"imei": {
-					"description": "IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-					"type": "string"
-				},
-				"imsi": {
-					"description": "IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-					"type": "string"
-				},
-				"ipProtocolType": {
-					"description": "IP protocol type e.g., TCP, UDP, RTP...",
-					"type": "string"
-				},
-				"ipVersion": {
-					"description": "IP protocol version e.g., IPv4, IPv6",
-					"type": "string"
-				},
-				"lac": {
-					"description": "location area code",
-					"type": "string"
-				},
-				"mcc": {
-					"description": "mobile country code",
-					"type": "string"
-				},
-				"mnc": {
-					"description": "mobile network code",
-					"type": "string"
-				},
-				"msisdn": {
-					"description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
-					"type": "string"
-				},
-				"otherEndpointIpAddress": {
-					"description": "IP address for the other endpoint, as used for the flow being reported on",
-					"type": "string"
-				},
-				"otherEndpointPort": {
-					"description": "IP Port for the reporting entity, as used for the flow being reported on",
-					"type": "number"
-				},
-				"otherFunctionalRole": {
-					"description": "Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...",
-					"type": "string"
-				},
-				"rac": {
-					"description": "routing area code",
-					"type": "string"
-				},
-				"radioAccessTechnology": {
-					"description": "Radio Access Technology e.g., 2G, 3G, LTE",
-					"type": "string"
-				},
-				"reportingEndpointIpAddr": {
-					"description": "IP address for the reporting entity, as used for the flow being reported on",
-					"type": "string"
-				},
-				"reportingEndpointPort": {
-					"description": "IP port for the reporting entity, as used for the flow being reported on",
-					"type": "number"
-				},
-				"sac": {
-					"description": "service area code",
-					"type": "string"
-				},
-				"samplingAlgorithm": {
-					"description": "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",
-					"type": "number"
-				},
-				"tac": {
-					"description": "transport area code",
-					"type": "string"
-				},
-				"tunnelId": {
-					"description": "tunnel identifier",
-					"type": "string"
-				},
-				"vlanId": {
-					"description": "VLAN identifier used by this flow",
-					"type": "string"
-				}
-			},
-			"required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType",
-			              "ipVersion", "otherEndpointIpAddress", "otherEndpointPort",
-			              "reportingEndpointIpAddr", "reportingEndpointPort" ]
-		},
-		"otherFields": {
-			"description": "additional fields not reported elsewhere",
-			"type": "array",
-			"items": {  
-				"$ref": "#/definitions/field" 
-			}
-		},
-		"requestError": {
-			"description": "standard request error data structure",
-			"type": "object",
-			"properties": { 
-			    "messageId": {
-					"description": "Unique message identifier of the format ‘ABCnnnn’ where ‘ABC’ is either ‘SVC’ for Service Exceptions or ‘POL’ for Policy Exception",
-					"type": "string"
-				},
-				"text": {
-					"description": "Message text, with replacement variables marked with %n, where n is an index into the list of <variables> elements, starting at 1",
-					"type": "string"
-				},
-				"url": {
-					"description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
-					"type": "string"
-				},
-				"variables": {
-					"description": "List of zero or more strings that represent the contents of the variables used by the message text",
-					"type": "string"
-				}
-			},
-			"required": [ "messageId", "text" ] 
-		},
-		"stateChangeFields": {
-			"description": "stateChange fields",
-			"type": "object",
-			"properties": {
-				"additionalFields": {
-					"description": "additional stateChange fields if needed",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
-					}
-				},
-				"newState": {
-					"description": "new state of the entity",
-					"type": "string",
-					"enum": [  
-						"inService",
-						"maintenance",
-						"outOfService"
-					]
-				},
-				"oldState": {
-					"description": "previous state of the entity",
-					"type": "string",
-					"enum": [  
-						"inService",
-						"maintenance",
-						"outOfService"
-					]
-				},
-				"stateChangeFieldsVersion": {
-					"description": "version of the stateChangeFields block",
-					"type": "number"
-				},
-				"stateInterface": {
-					"description": "card or port name of the entity that changed state",
-					"type": "string"
-				}
-			},
-			"required": [ "newState", "oldState", "stateInterface" ]
-		},
-		"suppressedNvPairs": {
-			"description": "List of specific NvPairsNames to suppress within a given Name-Value Field for event Throttling",
-			"type": "object",
-			"properties": {
-				"nvPairFieldName": {
-					"description": "Name of the field within which are the nvpair names to suppress",
-					"type": "string"
-				},
-				"suppressedNvPairNames": {
-					"description": "Array of nvpair names to suppress within the nvpairFieldName",
-			        "type": "array",
-					"items": {
-					    "type": "string"
-					}
-				}
-			},
-			"required": [ "nvPairFieldName", "suppressedNvPairNames" ]
-		},
-		"syslogFields": {
-			"description": "sysLog fields",
-			"type": "object",
-			"properties": {
-				"additionalFields": {
-					"description": "additional syslog fields if needed",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
-					}
-				},
-				"eventSourceHost": {
-					"description": "hostname of the device",
-					"type": "string"
-				},
-				"eventSourceType": {
-					"description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction",
-					"type": "string"
-				},
-				"syslogFacility": {
-					"description": "numeric code from 0 to 23 for facility--see table in documentation",
-					"type": "number"
-				},
-				"syslogFieldsVersion": {
-					"description": "version of the syslogFields block",
-					"type": "number"
-				},
-				"syslogMsg": {
-					"description": "syslog message",
-					"type": "string"
-				},
-				"syslogProc": {
-					"description": "identifies the application that originated the message",
-					"type": "string"
-				},
-				"syslogProcId": {
-					"description": "a change in the value of this field indicates a discontinuity in syslog reporting",
-					"type": "number"
-				},
-				"syslogSData": {
-					"description": "syslog structured data consisting of a structured data Id followed by a set of key value pairs",
-					"type": "string"
-				},
-				"syslogTag": {
-					"description": "msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided",
-					"type": "string"
-				},
-				"syslogVer": {
-					"description": "IANA assigned version of the syslog protocol specification - typically 1",
-					"type": "number"
-				}
-			},
-			"required": [ "eventSourceType", "syslogMsg", "syslogTag" ]
-		},
-		"thresholdCrossingAlertFields": {
-			"description": "fields specific to threshold crossing alert events",
-			"type": "object",
-			"properties": {
-				"additionalParameters": {
-					"description": "performance counters",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/counter" 
-					}
-				},
-				"alertAction": {
-					"description": "Event action",
-					"type": "string",
-					"enum": [
-						"CLEAR",
-						"CONT",
-						"SET"
-					]
-				},
-				"alertDescription": {
-					"description": "Unique short alert description such as IF-SHUB-ERRDROP",
-					"type": "string"
-				},
-				"alertType": {
-					"description": "Event type",
-					"type": "string",
-					"enum": [
-						"CARD-ANOMALY",
-						"ELEMENT-ANOMALY",
-						"INTERFACE-ANOMALY",
-						"SERVICE-ANOMALY"
-					]
-				},
-				"alertValue": {
-					"description": "Calculated API value (if applicable)",
-					"type": "string"
-				},
-				"associatedAlertIdList": {
-					"description": "List of eventIds associated with the event being reported",
-					"type": "array",
-					"items": { "type": "string" }
-				},
-				"collectionTimestamp": {
-					"description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: ‘Sat, 13 Mar 2010 11:29:05 -0800’",
-					"type": "string"
-				},
-				"dataCollector": {
-					"description": "Specific performance collector instance used",
-					"type": "string"
-				},
-				"elementType": {
-					"description": "type of network element - internal ATT field",
-					"type": "string"
-				},
-				"eventSeverity": {
-					"description": "event severity or priority",
-					"type": "string",
-					"enum": [
-						"CRITICAL",
-						"MAJOR",
-						"MINOR",
-						"WARNING",
-						"NORMAL"
-					]
-				},
-				"eventStartTimestamp": {
-					"description": "Time closest to when the measurement was made; with RFC 2822 compliant format: ‘Sat, 13 Mar 2010 11:29:05 -0800’",
-					"type": "string"
-				},
-				"interfaceName": {
-					"description": "Physical or logical port or card (if applicable)",
-					"type": "string"
-				},
-				"networkService": {
-					"description": "network name - internal ATT field",
-					"type": "string"
-				},
-				"possibleRootCause": {
-					"description": "Reserved for future use",
-					"type": "string"
-				},
-				"thresholdCrossingFieldsVersion": {
-					"description": "version of the thresholdCrossingAlertFields block",
-					"type": "number"
-				}
-			},	
-			"required": [
-				"additionalParameters",
-				"alertAction",
-				"alertDescription",
-				"alertType",
-				"collectionTimestamp",
-				"eventSeverity",
-				"eventStartTimestamp"
-			]
-		},
-		"vNicUsage": {
-			"description": "usage of identified virtual network interface card",
-			"type": "object",
-			"properties": {
-				"broadcastPacketsIn": { "type": "number" },
-				"broadcastPacketsOut": { "type": "number" },
-				"bytesIn": { "type": "number" },
-				"bytesOut": { "type": "number" },
-				"multicastPacketsIn": { "type": "number" },
-				"multicastPacketsOut": { "type": "number" },
-				"packetsIn": { "type": "number" },
-				"packetsOut": { "type": "number" },
-				"unicastPacketsIn": { "type": "number" },
-				"unicastPacketsOut": { "type": "number" },
-				"vNicIdentifier": { "type": "string" }
-			},
-			"required": [ "bytesIn", "bytesOut", "packetsIn", "packetsOut", "vNicIdentifier"]
-		}		
-	},
-	"title": "Event Listener",
-		"type": "object",
-			"properties": {
-                  "event": {"$ref": "#/definitions/event"}
-            },
-            "required": ["event"]
-}
\ No newline at end of file
diff --git a/etc/CommonEventFormat_Vendors_v26.0.json b/etc/CommonEventFormat_Vendors_v26.0.json
deleted file mode 100644
index b9cc786c..00000000
--- a/etc/CommonEventFormat_Vendors_v26.0.json
+++ /dev/null
@@ -1,1372 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-	
-	"definitions": {
-				"attCopyrightNotice": {
-				"description": "Copyright (c) <2017>, AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the License)",
-				"type": "object",
-				"properties": {
-					"useAndRedistribution": {
-						"description": "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",
-						"type": "string"
-					},
-					"licenseLink": "http://www.apache.org/licenses/LICENSE-2.0",
-					"condition1": {
-						"description": "Unless required by applicable law or agreed to in writing, software 13 * distributed under the License is distributed on an AS IS BASIS,",
-						"type": "string"
-					},
-					"condition2": {
-						"description": "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.",
-						"type": "string"
-					},
-					"condition3": {
-						"description": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
-						"type": "string"
-					},
-					"condition4": {
-						"description": "See the License for the specific language governing permissions and limitations under the License.",
-						"type": "string"
-					},
-					"Trademarks": {
-						"description": "ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.",
-						"type": "string"
-					}
-				   }
-				},
- 		"codecsInUse": {
-			"description": "number of times an identified codec was used over the measurementInterval",
-			"type": "object",
-			"properties": {
-				"codecIdentifier": { "type": "string" },
-				"numberInUse": { "type": "number" }
-			},
-			"required": [ "codecIdentifier", "numberInUse" ]
-		},
-        "codecSelected": {
-            "description": "codec selected for the call - 'PCMA', 'G729A', ...",
-			"type": "object",
-			"properties": {
-				"codec": { "type": "string" }
-			}
-        },
-        "codecSelectedTranscoding": {
-            "description": "codecs selected for the call, when transcoding is occurring",
-			"type": "object",
-			"properties": {
-				"calleeSideCodec": { "type": "string" },
-				"callerSideCodec": { "type": "string" }
-			}
-        },
- 		"command": {
-			"description": "command from an event collector toward an event source",
-			"type": "object",
-			"properties": {
-				"commandType": {
-					"type": "string",
-					"enum": [
-						"measurementIntervalChange",
-						"provideThrottlingState",
-						"throttlingSpecification"
-					]
-				},
-				"eventDomainThrottleSpecification": { "$ref": "#/definitions/eventDomainThrottleSpecification" },
-				"measurementInterval": { "type": "number" }
-			},
-			"required": [ "commandType" ]
-		},
-		"commandList": {
-			"description": "array of commands from an event collector toward an event source",
-			"type": "array",
-			"items": {
-			    "$ref": "#/definitions/commandListEntry"
-			},
-			"minItems": 0
-		},
- 		"commandListEntry": {
-			"description": "reference to a command object",
-			"type": "object",
-			"properties": {
-				"command": {"$ref": "#/definitions/command"}
-			},
-			"required": [ "command" ]
-		},
-		"commonEventHeader": {
-			"description": "fields common to all events",
-			"type": "object",
-			"properties": {
-				"domain": {
-					"description": "the eventing domain associated with the event",
-					"type": "string",
-					"enum": [
-						"fault",
-						"heartbeat",
-						"measurementsForVfScaling",
-						"mobileFlow",
-						"other",
-						"serviceEvents",
-						"signaling",						
-						"stateChange",
-						"syslog",
-						"thresholdCrossingAlert"
-					]
-				},
-				"eventId": {
-					"description": "event key that is unique to the event source",
-					"type": "string"
-				},
-				"eventType": {
-					"description": "unique event topic name",
-					"type": "string"
-				},
-				"functionalRole": {
-					"description": "function of the event source e.g., eNodeB, MME, PCRF",
-					"type": "string"
-				},
-				"lastEpochMicrosec": {
-					"description": "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",
-					"type": "number"
-				},
-				"priority": {
-					"description": "processing priority",
-					"type": "string",
-					"enum": [
-						"High",
-						"Medium",
-						"Normal",
-						"Low"
-					]
-				},
-				"reportingEntityId": {
-					"description": "UUID identifying the entity reporting the event, for example an OAM VM",
-					"type": "string"
-				},
-				"reportingEntityName": {
-					"description": "name of the entity reporting the event, for example, an OAM VM",
-					"type": "string"
-				},
-				"sequence": {
-					"description": "ordering of events communicated by an event source instance or 0 if not needed",
-					"type": "integer"
-				},
-				"sourceId": {
-					"description": "UUID identifying the entity experiencing the event issue",
-					"type": "string"
-				},
-				"sourceName": {
-					"description": "name of the entity experiencing the event issue",
-					"type": "string"
-				},
-				"startEpochMicrosec": {
-					"description": "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",
-					"type": "number"
-				},
-				"version": {
-					"description": "version of the event header",
-					"type": "number"
-				}
-			},
-			"required": [ "domain", "eventId", "functionalRole", "lastEpochMicrosec",
-						  "priority", "reportingEntityName", "sequence",
-			              "sourceName", "startEpochMicrosec" ]
-		},
-		"counter": {
-			"description": "performance counter",
-			"type": "object",
-			"properties": {
-				"criticality": { "type": "string", "enum": [ "CRIT", "MAJ" ] },
-				"name":  { "type": "string" },
-				"thresholdCrossed": { "type": "string" },
-				"value": { "type": "string"}
-			},
-			"required": [ "criticality", "name", "thresholdCrossed", "value" ]
-		},
-		"cpuUsage": {
-			"description": "percent usage of an identified CPU",
-			"type": "object",
-			"properties": {
-				"cpuIdentifier": { "type": "string" },
-				"percentUsage": { "type": "number" }
-			},
-			"required": [ "cpuIdentifier", "percentUsage" ]
-		},
-        "endOfCallVqmSummaries": {
-            "description": "",
-			"type": "object",
-			"properties": {
-                "adjacencyName": {
-                    "description": " adjacency name",
-                    "type": "string"
-                },
-                "endpointDescription": {
-                    "description": "‘Caller’, ‘Callee’",
-                    "type": "string",
-                    "enum": ["Caller", "Callee"]
-                },
-                "endpointJitter": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpOctetsDiscarded": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpOctetsReceived": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpOctetsSent": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpPacketsDiscarded": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpPacketsReceived": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpPacketsSent": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localJitter": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpOctetsDiscarded": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpOctetsReceived": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpOctetsSent": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpPacketsDiscarded": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpPacketsReceived": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpPacketsSent": {
-                    "description": "",
-                    "type": "number"
-                },
-                "mosCqe": {
-                    "description": "1-5 1dp",
-                    "type": "number"
-                },
-                "packetsLost": {
-                    "description": "",
-                    "type": "number"
-                },
-                "packetLossPercent": {
-                    "description" : "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)",
-                    "type": "number"
-                },
-                "rFactor": {
-                    "description": "0-100",
-                    "type": "number"
-                },
-                "roundTripDelay": {
-                    "description": "millisecs",
-                    "type": "number"
-                }
-            }
-        },
-		"errors": {
-			"description": "receive and transmit errors for the measurements domain",
-			"type": "object",
-			"properties": {
-				"receiveDiscards": { "type": "number" },
-				"receiveErrors": { "type": "number" },
-				"transmitDiscards": { "type": "number" },
-				"transmitErrors": { "type": "number" }
-			},
-			"required": [ "receiveDiscards", "receiveErrors", "transmitDiscards", "transmitErrors" ]
-		},
-        "event": {
-            "description": "generic event format",
-	        "type": "object",
-	        "properties": {
-		        "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" },
-		        "faultFields": { "$ref": "#/definitions/faultFields" },
-	 	        "measurementsForVfScalingFields": { "$ref": "#/definitions/measurementsForVfScalingFields" },
-				"mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" },
-		        "otherFields": { "$ref": "#/definitions/otherFields" },
-		        "serviceEventsFields": { "$ref": "#/definitions/serviceEventsFields" },
-		        "signalingFields": { "$ref": "#/definitions/signalingFields" },
-		        "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" },
-				"syslogFields": { "$ref": "#/definitions/syslogFields" },
-		        "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" }
-        	},
-            "required": [ "commonEventHeader" ]
-        },
-		"eventDomainThrottleSpecification": {
-			"description": "specification of what information to suppress within an event domain",
-			"type": "object",
-			"properties": {
-		        "eventDomain": {
-			        "description": "Event domain enum from the commonEventHeader domain field",
-			        "type": "string"
-		        },
-		        "suppressedFieldNames": {
-			        "description": "List of optional field names in the event block that should not be sent to the Event Listener",
-			        "type": "array",
-					"items": {
-					    "type": "string"
-					}
-		        },
-				"suppressedNvPairsList": {
-					"description": "Optional list of specific NvPairsNames to suppress within a given Name-Value Field",
-			        "type": "array",
-					"items": {
-					    "$ref": "#/definitions/suppressedNvPairs"
-					}
-		        }
-			},
-			"required": [ "eventDomain" ]
-		},
-		"eventDomainThrottleSpecificationList": {
-			"description": "array of eventDomainThrottleSpecifications",
-			"type": "array",
-			"items": {
-			    "$ref": "#/definitions/eventDomainThrottleSpecification"
-			},
-			"minItems": 0
-		},
-		"eventInstanceIdentifier": {
-			"description": "event instance identifiers",
-			"type": "object",
-			"properties": {
-				"eventId": {
-					"description": "event identifier",
-					"type": "string"
-				},
-				"vendorId": {
-					"description": "vendor identifier",
-					"type": "string"
-				},
-				"productId": {
-					"description": "product identifier",
-					"type": "string"
-				},
-				"subsystemId": {
-					"description": "subsystem identifier",
-					"type": "string"
-				},
-				"eventFriendlyName": {
-					"description": "event instance friendly name",
-					"type": "string"
-				}
-            },
-			"required": [ "eventId", "vendorId" ]
-        },
-		"eventList": {
-			"description": "array of events",
-			"type": "array",
-			"items": {
-				"$ref": "#/definitions/event"
-			}
-		},
-		"eventThrottlingState": {
-			"description": "reports the throttling in force at the event source",
-			"type": "object",
-			"properties": {
-		        "eventThrottlingMode": {
-			        "description": "Mode the event manager is in",
-			        "type": "string",
-					"enum": [
-						"normal",
-						"throttled"
-					]
-		        },
-				"eventDomainThrottleSpecificationList": { "$ref": "#/definitions/eventDomainThrottleSpecificationList" }
-			},
-			"required": [ "eventThrottlingMode" ]
-		},
-		"faultFields": {
-			"description": "fields specific to fault events",
-			"type": "object",
-			"properties": {
-				"alarmAdditionalInformation": {
-					"description": "additional alarm information",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/field"
-					}
-				},
-				"alarmCondition": {
-					"description": "alarm condition reported by the device",
-					"type": "string"
-				},
-				"alarmInterfaceA": {
-					"description": "card, port, channel or interface name of the device generating the alarm",
-					"type": "string"
-				},
-				"eventSeverity": {
-					"description": "event severity or priority",
-					"type": "string",
-					"enum": [
-						"CRITICAL",
-						"MAJOR",
-						"MINOR",
-						"WARNING",
-						"NORMAL"
-					]
-				},
-				"eventSourceType": {
-					"description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction",
-					"type": "string"
-				},
-				"faultFieldsVersion": {
-					"description": "version of the faultFields block",
-					"type": "number"
-				},
-				"specificProblem": {
-					"description": "short description of the alarm or problem",
-					"type": "string"
-				},
-				"vfStatus": {
-					"description": "virtual function status enumeration",
-					"type": "string",
-					"enum": [
-						"Active",
-						"Idle",
-						"Preparing to terminate",
-						"Ready to terminate",
-						"Requesting termination"
-					]
-				}
-			},
-			"required": [ "alarmCondition", "eventSeverity",
-			              "eventSourceType", "specificProblem", "vfStatus" ]
-		},
-		"featuresInUse": {
-			"description": "number of times an identified feature was used over the measurementInterval",
-			"type": "object",
-			"properties": {
-				"featureIdentifier": { "type": "string" },
-				"featureUtilization": { "type": "number" }
-			},
-			"required": [ "featureIdentifier", "featureUtilization" ]
-		},
-		"field": {
-			"description": "name value pair",
-			"type": "object",
-			"properties": {
-				"name":  { "type": "string" },
-				"value": { "type": "string" }
-			},
-			"required": [ "name", "value" ]
-		},
-		"filesystemUsage": {
-			"description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
-			"type": "object",
-			"properties": {
-				"blockConfigured": { "type": "number" },
-				"blockIops": { "type": "number" },
-				"blockUsed": { "type": "number" },
-				"ephemeralConfigured": { "type": "number" },
-				"ephemeralIops": { "type": "number" },
-				"ephemeralUsed": { "type": "number" },
-				"filesystemName": { "type": "string" }
-			},
-			"required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured",
-			              "ephemeralIops", "ephemeralUsed", "filesystemName" ]
-		},
-		"gtpPerFlowMetrics": {
-			"description": "Mobility GTP Protocol per flow metrics",
-			"type": "object",
-			"properties": {
-				"avgBitErrorRate": {
-					"description": "average bit error rate",
-					"type": "number"
-				},
-				"avgPacketDelayVariation": {
-					"description": "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",
-					"type": "number"
-				},
-				"avgPacketLatency": {
-					"description": "average delivery latency",
-					"type": "number"
-				},
-				"avgReceiveThroughput": {
-					"description": "average receive throughput",
-					"type": "number"
-				},
-				"avgTransmitThroughput": {
-					"description": "average transmit throughput",
-					"type": "number"
-				},
-				"durConnectionFailedStatus": {
-					"description": "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",
-					"type": "number"
-				},
-				"durTunnelFailedStatus": {
-					"description": "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",
-					"type": "number"
-				},
-				"flowActivatedBy": {
-					"description": "Endpoint activating the flow",
-					"type": "string"
-				},
-				"flowActivationEpoch": {
-					"description": "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",
-					"type": "number"
-				},
-				"flowActivationMicrosec": {
-					"description": "Integer microseconds for the start of the flow connection",
-					"type": "number"
-				},
-				"flowActivationTime": {
-					"description": "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’",
-					"type": "string"
-				},
-				"flowDeactivatedBy": {
-					"description": "Endpoint deactivating the flow",
-					"type": "string"
-				},
-				"flowDeactivationEpoch": {
-					"description": "Time for the start of the flow connection, in integer UTC epoch time aka UNIX time",
-					"type": "number"
-				},
-				"flowDeactivationMicrosec": {
-					"description": "Integer microseconds for the start of the flow connection",
-					"type": "number"
-				},
-				"flowDeactivationTime": {
-					"description": "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’",
-					"type": "string"
-				},
-				"flowStatus": {
-					"description": "connection status at reporting time as a working / inactive / failed indicator value",
-					"type": "string"
-				},
-				"gtpConnectionStatus": {
-					"description": "Current connection state at reporting time",
-					"type": "string"
-				},
-				"gtpTunnelStatus": {
-					"description": "Current tunnel state  at reporting time",
-					"type": "string"
-				},
-				"ipTosCountList": {
-					"description": "array of key: value pairs where the keys are drawn from the IP Type-of-Service identifiers which range from '0' to '255', and the values are the count of packets that had those ToS identifiers in the flow",
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-						"type": "array",
-						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
-						],
-						"additionalItems": false
-					}
-				},
-				"ipTosList": {
-					"description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'",
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"largePacketRtt": {
-					"description": "large packet round trip time",
-					"type": "number"
-				},
-				"largePacketThreshold": {
-					"description": "large packet threshold being applied",
-					"type": "number"
-				},
-				"maxPacketDelayVariation": {
-					"description": "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",
-					"type": "number"
-				},
-				"maxReceiveBitRate": {
-					"description": "maximum receive bit rate",
-					"type": "number"
-				},
-				"maxTransmitBitRate": {
-					"description": "maximum transmit bit rate",
-					"type": "number"
-				},
-				"mobileQciCosCountList": {
-					"description": "array of key: value pairs where the keys are drawn from LTE QCI or UMTS class of service strings, and the values are the count of packets that had those strings in the flow",
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-						"type": "array",
-						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
-						],
-						"additionalItems": false
-					}
-				},
-				"mobileQciCosList": {
-					"description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow",
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"numActivationFailures": {
-					"description": "Number of failed activation requests, as observed by the reporting node",
-					"type": "number"
-				},
-				"numBitErrors": {
-					"description": "number of errored bits",
-					"type": "number"
-				},
-				"numBytesReceived": {
-					"description": "number of bytes received, including retransmissions",
-					"type": "number"
-				},
-				"numBytesTransmitted": {
-					"description": "number of bytes transmitted, including retransmissions",
-					"type": "number"
-				},
-				"numDroppedPackets": {
-					"description": "number of received packets dropped due to errors per virtual interface",
-					"type": "number"
-				},
-				"numGtpEchoFailures": {
-					"description": "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",
-					"type": "number"
-				},
-				"numGtpTunnelErrors": {
-					"description": "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",
-					"type": "number"
-				},
-				"numHttpErrors": {
-					"description": "Http error count",
-					"type": "number"
-				},
-				"numL7BytesReceived": {
-					"description": "number of tunneled layer 7 bytes received, including retransmissions",
-					"type": "number"
-				},
-				"numL7BytesTransmitted": {
-					"description": "number of tunneled layer 7 bytes transmitted, excluding retransmissions",
-					"type": "number"
-				},
-				"numLostPackets": {
-					"description": "number of lost packets",
-					"type": "number"
-				},
-				"numOutOfOrderPackets": {
-					"description": "number of out-of-order packets",
-					"type": "number"
-				},
-				"numPacketErrors": {
-					"description": "number of errored packets",
-					"type": "number"
-				},
-				"numPacketsReceivedExclRetrans": {
-					"description": "number of packets received, excluding retransmission",
-					"type": "number"
-				},
-				"numPacketsReceivedInclRetrans": {
-					"description": "number of packets received, including retransmission",
-					"type": "number"
-				},
-				"numPacketsTransmittedInclRetrans": {
-					"description": "number of packets transmitted, including retransmissions",
-					"type": "number"
-				},
-				"numRetries": {
-					"description": "number of packet retries",
-					"type": "number"
-				},
-				"numTimeouts": {
-					"description": "number of packet timeouts",
-					"type": "number"
-				},
-				"numTunneledL7BytesReceived": {
-					"description": "number of tunneled layer 7 bytes received, excluding retransmissions",
-					"type": "number"
-				},
-				"roundTripTime": {
-					"description": "round trip time",
-					"type": "number"
-				},
-				"tcpFlagCountList": {
-					"description": "array of key: value pairs where the keys are drawn from TCP Flags and the values are the count of packets that had that TCP Flag in the flow",
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-						"type": "array",
-						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
-						],
-						"additionalItems": false
-					}
-				},
-				"tcpFlagList": {
-					"description": "Array of unique TCP Flags observed in the flow",
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"timeToFirstByte": {
-					"description": "Time in milliseconds between the connection activation and first byte received",
-					"type": "number"
-				}
-			},
-			"required": [ "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"
-			]
-		},
-		"latencyBucketMeasure": {
-			"description": "number of counts falling within a defined latency bucket",
-			"type": "object",
-			"properties": {
-				"countsInTheBucket": { "type": "number" },
-				"highEndOfLatencyBucket": { "type": "number" },
-				"lowEndOfLatencyBucket":  { "type": "number" }
-			},
-			"required": [ "countsInTheBucket" ]
-		},
-        "marker": {
-            "description": "",
-			"type": "object",
-			"properties": {
-				"phoneNumber": { "type": "string" }
-			}
-        },
-		"measurementGroup": {
-			"description": "measurement group",
-			"type": "object",
-			"properties": {
-				"name":  { "type": "string" },
-				"measurements": {
-					"description": "array of name value pair measurements",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
-					}
-				}
-			},
-			"required": [ "name", "measurements" ]
-		},
-		"measurementsForVfScalingFields": {
-			"description": "measurementsForVfScaling fields",
-			"type": "object",
-			"properties": {
-				"additionalMeasurements": {
-					"description": "additional measurement fields",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/measurementGroup"
-					}
-				},
-				"aggregateCpuUsage": {
-					"description": "aggregate CPU usage of the VM on which the VNFC reporting the event is running",
-					"type": "number"
-				},
-				"codecUsageArray": {
-					"description": "array of codecs in use",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/codecsInUse"
-					}
-				},
-				"concurrentSessions": {
-					"description": "peak concurrent sessions for the VM or VNF over the measurementInterval",
-					"type": "number"
-				},
-				"configuredEntities": {
-					"description": "over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the VNF",
-					"type": "number"
-				},
-				"cpuUsageArray": {
-					"description": "usage of an array of CPUs",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/cpuUsage"
-					}
-				},
-				"errors": { "$ref": "#/definitions/errors" },
-				"featureUsageArray": {
-					"description": "array of features in use",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/featuresInUse"
-					}
-				},
-				"filesystemUsageArray": {
-					"description": "filesystem usage of the VM on which the VNFC reporting the event is running",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/filesystemUsage"
-					}
-				},
-				"latencyDistribution": {
-					"description": "array of integers representing counts of requests whose latency in milliseconds falls within per-VNF configured ranges",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/latencyBucketMeasure"
-					}
-				},
-				"meanRequestLatency": {
-					"description": "mean seconds required to respond to each request for the VM on which the VNFC reporting the event is running",
-					"type": "number"
-				},
-				"measurementInterval": {
-					"description": "interval over which measurements are being reported in seconds",
-					"type": "number"
-				},
-				"measurementsForVfScalingVersion": {
-					"description": "version of the measurementsForVfScaling block",
-					"type": "number"
-				},
-				"memoryConfigured": {
-					"description": "memory configured in the VM on which the VNFC reporting the event is running",
-					"type": "number"
-				},
-				"memoryUsed": {
-					"description": "memory usage of the VM on which the VNFC reporting the event is running",
-					"type": "number"
-				},
-				"numberOfMediaPortsInUse": {
-					"description": "number of media ports in use",
-					"type": "number"
-				},
-				"requestRate": {
-					"description": "peak rate of service requests per second to the VNF over the measurementInterval",
-					"type": "number"
-				},
-				"vnfcScalingMetric": {
-					"description": "represents busy-ness of the VNF from 0 to 100 as reported by the VNFC",
-					"type": "number"
-				},
-				"vNicUsageArray": {
-					"description": "usage of an array of virtual network interface cards",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/vNicUsage"
-					}
-				}
-			},
-			"required": [ "measurementInterval" ]
-		},
-        "midCallRtcp": {
-            "description": "RTCP packet received ",
-			"type": "object",
-			"properties": {
-				"rtcpData": {
-                    "description": "Base64 encoding of the binary RTCP data (excluding Eth/IP/UDP headers) Base64 encoded array of bytes",
-                    "type": "string"
-                }
-			}
-        },
-		"mobileFlowFields": {
-			"description": "mobileFlow fields",
-			"type": "object",
-			"properties": {
-				"applicationType": {
-					"description": "Application type inferred",
-					"type": "string"
-				},
-				"appProtocolType": {
-					"description": "application protocol",
-					"type": "string"
-				},
-				"appProtocolVersion": {
-					"description": "application protocol version",
-					"type": "string"
-				},
-				"cid": {
-					"description": "cell id",
-					"type": "string"
-				},
-				"connectionType": {
-					"description": "Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc",
-					"type": "string"
-				},
-				"ecgi": {
-					"description": "Evolved Cell Global Id",
-					"type": "string"
-				},
-				"flowDirection": {
-					"description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
-					"type": "string"
-				},
-				"gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" },
-				"gtpProtocolType": {
-					"description": "GTP protocol",
-					"type": "string"
-				},
-				"gtpVersion": {
-					"description": "GTP protocol version",
-					"type": "string"
-				},
-				"httpHeader": {
-					"description": "HTTP request header, if the flow connects to a node referenced by HTTP",
-					"type": "string"
-				},
-				"imei": {
-					"description": "IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-					"type": "string"
-				},
-				"imsi": {
-					"description": "IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-					"type": "string"
-				},
-				"ipProtocolType": {
-					"description": "IP protocol type e.g., TCP, UDP, RTP...",
-					"type": "string"
-				},
-				"ipVersion": {
-					"description": "IP protocol version e.g., IPv4, IPv6",
-					"type": "string"
-				},
-				"lac": {
-					"description": "location area code",
-					"type": "string"
-				},
-				"mcc": {
-					"description": "mobile country code",
-					"type": "string"
-				},
-				"mnc": {
-					"description": "mobile network code",
-					"type": "string"
-				},
-                "mobileFlowFieldsVersion": {
-                    "description": "version of the mobileFlowFields block",
-                    "type": "number"
-                },
-				"msisdn": {
-					"description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
-					"type": "string"
-				},
-				"otherEndpointIpAddress": {
-					"description": "IP address for the other endpoint, as used for the flow being reported on",
-					"type": "string"
-				},
-				"otherEndpointPort": {
-					"description": "IP Port for the reporting entity, as used for the flow being reported on",
-					"type": "number"
-				},
-				"otherFunctionalRole": {
-					"description": "Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...",
-					"type": "string"
-				},
-				"rac": {
-					"description": "routing area code",
-					"type": "string"
-				},
-				"radioAccessTechnology": {
-					"description": "Radio Access Technology e.g., 2G, 3G, LTE",
-					"type": "string"
-				},
-				"reportingEndpointIpAddr": {
-					"description": "IP address for the reporting entity, as used for the flow being reported on",
-					"type": "string"
-				},
-				"reportingEndpointPort": {
-					"description": "IP port for the reporting entity, as used for the flow being reported on",
-					"type": "number"
-				},
-				"sac": {
-					"description": "service area code",
-					"type": "string"
-				},
-				"samplingAlgorithm": {
-					"description": "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",
-					"type": "number"
-				},
-				"tac": {
-					"description": "transport area code",
-					"type": "string"
-				},
-				"tunnelId": {
-					"description": "tunnel identifier",
-					"type": "string"
-				},
-				"vlanId": {
-					"description": "VLAN identifier used by this flow",
-					"type": "string"
-				}
-			},
-			"required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType",
-			              "ipVersion", "otherEndpointIpAddress", "otherEndpointPort",
-			              "reportingEndpointIpAddr", "reportingEndpointPort" ]
-		},
-		"otherFields": {
-			"description": "additional fields not reported elsewhere",
-			"type": "array",
-			"items": {
-				"$ref": "#/definitions/field"
-			}
-		},
-		"requestError": {
-			"description": "standard request error data structure",
-			"type": "object",
-			"properties": {
-			    "messageId": {
-					"description": "Unique message identifier of the format ‘ABCnnnn’ where ‘ABC’ is either ‘SVC’ for Service Exceptions or ‘POL’ for Policy Exception",
-					"type": "string"
-				},
-				"text": {
-					"description": "Message text, with replacement variables marked with %n, where n is an index into the list of <variables> elements, starting at 1",
-					"type": "string"
-				},
-				"url": {
-					"description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
-					"type": "string"
-				},
-				"variables": {
-					"description": "List of zero or more strings that represent the contents of the variables used by the message text",
-					"type": "string"
-				}
-			},
-			"required": [ "messageId", "text" ]
-		},
-        "serviceEventsFields": {
-            "description": "service events fields",
-            "type": "object",
-            "properties": {
-                "additionalFields": {
-					"description": "additional service event fields if needed",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
-					}
-                },
-                "codecSelected": {
-                    "$ref": "#/definitions/codecSelected"
-                },
-                "codecSelectedTranscoding": {
-                    "$ref": "#/definitions/codecSelectedTranscoding"
-                },
-                "correlator": {
-                    "description": "this is the same for all events on this call",
-                    "type": "string"
-                },
-                "endOfCallVqmSummaries": {
-                    "$ref": "#/definitions/endOfCallVqmSummaries"
-                },
-                "eventInstanceIdentifier": {
-                    "$ref": "#/definitions/eventInstanceIdentifier"
-                },
-                "marker": {
-                    "$ref": "#/definitions/marker"
-                },
-                "midCallRtcp": {
-                    "$ref": "#/definitions/midCallRtcp"
-                },
-                "serviceEventsFieldsVersion": {
-                    "description": "version of the serviceEventsFields block",
-                    "type": "number"
-                }
-            },
-            "required": [ "eventInstanceIdentifier" ]
-        },
-        "signalingFields": {
-            "description": "signaling fields",
-            "type": "object",
-            "properties": {
-                "compressedSip": {
-                    "description": "the full SIP request/response including headers and bodies",
-                    "type": "string"
-                },
-                "correlator": {
-                    "description": "this is the same for all events on this call",
-                    "type": "string"
-                },
-                "eventInstanceIdentifier": {
-                    "$ref": "#/definitions/eventInstanceIdentifier"
-                },
-                "localIpAddress": {
-                    "description": "IP address on VNF",
-                    "type": "string"
-                },
-                "localPort": {
-                    "description": "port on VNF",
-                    "type": "string"
-                },
-                "remoteIpAddress": {
-                    "description": "IP address of peer endpoint",
-                    "type": "string"
-                },
-                "remotePort": {
-                    "description": "port of peer endpoint",
-                    "type": "string"
-                },
-                "signalingFieldsVersion": {
-                    "description": "version of the signalingFields block",
-                    "type": "number"
-                },
-                "summarySip": {
-                    "description": "the SIP Method or Response (‘INVITE’, ‘200 OK’, ‘BYE’, etc)",
-                    "type": "string"
-                }
-            },
-            "required": [ "eventInstanceIdentifier" ]
-        },
-		"stateChangeFields": {
-			"description": "stateChange fields",
-			"type": "object",
-			"properties": {
-				"additionalFields": {
-					"description": "additional stateChange fields if needed",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/field"
-					}
-				},
-				"newState": {
-					"description": "new state of the entity",
-					"type": "string",
-					"enum": [
-						"inService",
-						"maintenance",
-						"outOfService"
-					]
-				},
-				"oldState": {
-					"description": "previous state of the entity",
-					"type": "string",
-					"enum": [
-						"inService",
-						"maintenance",
-						"outOfService"
-					]
-				},
-				"stateChangeFieldsVersion": {
-					"description": "version of the stateChangeFields block",
-					"type": "number"
-				},
-				"stateInterface": {
-					"description": "card or port name of the entity that changed state",
-					"type": "string"
-				}
-			},
-			"required": [ "newState", "oldState", "stateInterface" ]
-		},
-		"suppressedNvPairs": {
-			"description": "List of specific NvPairsNames to suppress within a given Name-Value Field for event Throttling",
-			"type": "object",
-			"properties": {
-				"nvPairFieldName": {
-					"description": "Name of the field within which are the nvpair names to suppress",
-					"type": "string"
-				},
-				"suppressedNvPairNames": {
-					"description": "Array of nvpair names to suppress within the nvpairFieldName",
-			        "type": "array",
-					"items": {
-					    "type": "string"
-					}
-				}
-			},
-			"required": [ "nvPairFieldName", "suppressedNvPairNames" ]
-		},
-		"syslogFields": {
-			"description": "sysLog fields",
-			"type": "object",
-			"properties": {
-				"additionalFields": {
-					"description": "additional syslog fields if needed",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/field"
-					}
-				},
-				"eventSourceHost": {
-					"description": "hostname of the device",
-					"type": "string"
-				},
-				"eventSourceType": {
-					"description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction",
-					"type": "string"
-				},
-				"syslogFacility": {
-					"description": "numeric code from 0 to 23 for facility--see table in documentation",
-					"type": "number"
-				},
-				"syslogFieldsVersion": {
-					"description": "version of the syslogFields block",
-					"type": "number"
-				},
-				"syslogMsg": {
-					"description": "syslog message",
-					"type": "string"
-				},
-				"syslogProc": {
-					"description": "identifies the application that originated the message",
-					"type": "string"
-				},
-				"syslogProcId": {
-					"description": "a change in the value of this field indicates a discontinuity in syslog reporting",
-					"type": "number"
-				},
-				"syslogSData": {
-					"description": "syslog structured data consisting of a structured data Id followed by a set of key value pairs",
-					"type": "string"
-				},
-				"syslogTag": {
-					"description": "msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided",
-					"type": "string"
-				},
-				"syslogVer": {
-					"description": "IANA assigned version of the syslog protocol specification - typically 1",
-					"type": "number"
-				}
-			},
-			"required": [ "eventSourceType", "syslogMsg", "syslogTag" ]
-		},
-		"thresholdCrossingAlertFields": {
-			"description": "fields specific to threshold crossing alert events",
-			"type": "object",
-			"properties": {
-				"additionalFields": {
-					"description": "additional threshold crossing alert fields if needed",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
-					}
-				},
-				"additionalParameters": {
-					"description": "performance counters",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/counter"
-					}
-				},
-				"alertAction": {
-					"description": "Event action",
-					"type": "string",
-					"enum": [
-						"CLEAR",
-						"CONT",
-						"SET"
-					]
-				},
-				"alertDescription": {
-					"description": "Unique short alert description such as IF-SHUB-ERRDROP",
-					"type": "string"
-				},
-				"alertType": {
-					"description": "Event type",
-					"type": "string",
-					"enum": [
-						"CARD-ANOMALY",
-						"ELEMENT-ANOMALY",
-						"INTERFACE-ANOMALY",
-						"SERVICE-ANOMALY"
-					]
-				},
-				"alertValue": {
-					"description": "Calculated API value (if applicable)",
-					"type": "string"
-				},
-				"associatedAlertIdList": {
-					"description": "List of eventIds associated with the event being reported",
-					"type": "array",
-					"items": { "type": "string" }
-				},
-				"collectionTimestamp": {
-					"description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: ‘Sat, 13 Mar 2010 11:29:05 -0800’",
-					"type": "string"
-				},
-				"dataCollector": {
-					"description": "Specific performance collector instance used",
-					"type": "string"
-				},
-				"elementType": {
-					"description": "type of network element - internal ATT field",
-					"type": "string"
-				},
-				"eventSeverity": {
-					"description": "event severity or priority",
-					"type": "string",
-					"enum": [
-						"CRITICAL",
-						"MAJOR",
-						"MINOR",
-						"WARNING",
-						"NORMAL"
-					]
-				},
-				"eventStartTimestamp": {
-					"description": "Time closest to when the measurement was made; with RFC 2822 compliant format: ‘Sat, 13 Mar 2010 11:29:05 -0800’",
-					"type": "string"
-				},
-				"interfaceName": {
-					"description": "Physical or logical port or card (if applicable)",
-					"type": "string"
-				},
-				"networkService": {
-					"description": "network name - internal ATT field",
-					"type": "string"
-				},
-				"possibleRootCause": {
-					"description": "Reserved for future use",
-					"type": "string"
-				},
-				"thresholdCrossingFieldsVersion": {
-					"description": "version of the thresholdCrossingAlertFields block",
-					"type": "number"
-				}
-			},
-			"required": [
-				"additionalParameters",
-				"alertAction",
-				"alertDescription",
-				"alertType",
-				"collectionTimestamp",
-				"eventSeverity",
-				"eventStartTimestamp"
-			]
-		},
-		"vNicUsage": {
-			"description": "usage of identified virtual network interface card",
-			"type": "object",
-			"properties": {
-				"broadcastPacketsIn": { "type": "number" },
-				"broadcastPacketsOut": { "type": "number" },
-				"bytesIn": { "type": "number" },
-				"bytesOut": { "type": "number" },
-				"multicastPacketsIn": { "type": "number" },
-				"multicastPacketsOut": { "type": "number" },
-				"packetsIn": { "type": "number" },
-				"packetsOut": { "type": "number" },
-				"unicastPacketsIn": { "type": "number" },
-				"unicastPacketsOut": { "type": "number" },
-				"vNicIdentifier": { "type": "string" }
-			},
-			"required": [ "bytesIn", "bytesOut", "packetsIn", "packetsOut", "vNicIdentifier"]
-		}
-	},
-	"title": "Event Listener",
-		"type": "object",
-			"properties": {
-                  "event": {"$ref": "#/definitions/event"}
-            },
-            "required": ["event"]
-}
diff --git a/etc/DmaapConfig.json b/etc/DmaapConfig.json
index 701bf583..69680fd3 100644
--- a/etc/DmaapConfig.json
+++ b/etc/DmaapConfig.json
@@ -7,8 +7,16 @@
 			"class": "HpCambriaOutputStream",
 			"stripHpId": "true",
 			"type": "out",
-			"cambria.hosts": "zldciad3vicoll00.dcae.simpledemo.openecomp.org"
-		}
+			"cambria.hosts": "onap.dmaap.org"
+		},
+                {
+                        "name": "sec_fault",
+                        "cambria.topic": "unauthenticated.SEC_FAULT_OUTPUT",
+                        "class": "HpCambriaOutputStream",
+                        "stripHpId": "true",
+                        "type": "out",
+                        "cambria.hosts": "onap.dmaap.org"
+                }
 		
 	]
 }
diff --git a/etc/collector.properties b/etc/collector.properties
index 310c85c3..8da81d7e 100644
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -43,7 +43,7 @@ collector.inputQueue.maxPending=8096
 ## default no validation checkflag (-1)
 ## If enabled (1) - schemafile location must be specified
 collector.schema.checkflag=1
-collector.schema.file={\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.3.json\"}
+collector.schema.file={\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.3.json\"}
 
 ## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile  
 collector.dmaap.streamid=fault=sec_fault|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling
@@ -56,15 +56,15 @@ exceptionConfig=./etc/ExceptionConfig.json
 ## If enabled (1) - then authlist has to be defined
 ## When authflag is enabled, only secure port will be supported
 ## To disable enter 0
-header.authflag=1
+header.authflag=0
 ## Combination of userid,base64 encoded pwd list to be supported
 ## userid and pwd comma separated; pipe delimitation between each pair
-header.authlist=secureid,IWRjYWVSb2FkbTEyMyEt|sample1,c2FtcGxlMQ==|vdnsagg,dmRuc2FnZw==
+header.authlist=sample1,c2FtcGxlMQ==|vdnsagg,dmRuc2FnZw==
 
 ## Event transformation Flag - when set expects configurable transformation
 ## defined under ./etc/eventTransform.json
 ## Enabled by default; to disable set to 0
-event.transform.flag=1
+event.transform.flag=0
 
 ###############################################################################
 ##
diff --git a/src/main/scripts/build.sh b/src/main/scripts/build.sh
deleted file mode 100644
index cc91edbb..00000000
--- a/src/main/scripts/build.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-
-###
-# ============LICENSE_START=======================================================
-# PROJECT
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-#docker build --force-rm --file Dockerfile -t dcae-controller-ves-collector:latest
-sudo docker build -t dcae-controller-ves-collector:1.1.3 .
diff --git a/src/main/scripts/docker-entry.sh b/src/main/scripts/docker-entry.sh
index 58f40b40..f5ddedb0 100644
--- a/src/main/scripts/docker-entry.sh
+++ b/src/main/scripts/docker-entry.sh
@@ -18,10 +18,19 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 ###
-#echo \$COLLECTOR_IP  \$(hostname).dcae.simpledemo.openecomp.org >> /etc/hosts
+
+if [ ! -z "$COLLECTOR_IP" ]; then
+        echo $COLLECTOR_IP  $(hostname).dcae.simpledemo.openecomp.org >> /etc/hosts
+fi
+
+if [ ! -z "$DMAAPHOST" ]; then
+        echo $DMAAPHOST  onap.dmaap.org >> /etc/hosts
+else
+	echo "DMAAPHOST ENV NOT SET!! PUBLISH WILL NOT BE SUPPORTED"
+fi
+
 if [ -z "$CONSUL_HOST" ] || [ -z "$CONFIG_BINDING_SERVICE" ] || [ -z "$HOSTNAME" ]; then
-                echo "INFO: USING STANDARD ALONE CONFIGURATION SETUP; DMAAP PUBLISH NOT SUPPORTED"
-               # /opt/app/manager/start-manager.sh
+                echo "INFO: USING STANDARD ALONE CONFIGURATION SETUP"
 else
                 echo "INFO: USING DCAEGEN2 CONTROLLER"
 fi