Rename dcae directory to dcaegen2

Change-Id: Icd930f1fe31e3db8cdf7715eca52495273e9b2b5
IssueId: DCAEGEN2-111
Signed-off-by: pswang <pshaobow@gmail.com>

17 files changed, 0 insertions, 6285 deletions

diff --git a/test/csit/tests/dcae/testcases/__init__.robot b/test/csit/tests/dcae/testcases/__init__.robot
deleted file mode 100644
index e69de29bb..000000000
--- a/test/csit/tests/dcae/testcases/__init__.robot
+++ /dev/null
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/CommonEventFormat_28.3.json b/test/csit/tests/dcae/testcases/assets/json_events/CommonEventFormat_28.3.json
deleted file mode 100644
index 90f6d81a5..000000000
--- a/test/csit/tests/dcae/testcases/assets/json_events/CommonEventFormat_28.3.json
+++ /dev/null
@@ -1,1866 +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": {
-				 "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",
-			"properties": {
-				"codecIdentifier": { "type": "string" },
-				"numberInUse": { "type": "integer" }
-			},
-			"required": [ "codecIdentifier", "numberInUse" ]
-		},
- 		"command": {
-			"description": "command from an event collector toward an event source",
-			"type": "object",
-			"properties": {
-				"commandType": {
-					"type": "string",
-					"enum": [
-						"heartbeatIntervalChange",
-						"measurementIntervalChange",
-						"provideThrottlingState",
-						"throttlingSpecification"
-					]
-				},
-				"eventDomainThrottleSpecification": { "$ref": "#/definitions/eventDomainThrottleSpecification" },
-				"heartbeatInterval": { "type": "integer" },
-				"measurementInterval": { "type": "integer" }
-			},
-			"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",
-						"sipSignaling",
-						"stateChange",
-						"syslog",
-						"thresholdCrossingAlert",
-						"voiceQuality"
-					]
-				},
-				"eventId": {
-					"description": "event key that is unique to the event source",
-					"type": "string"
-				},
-				"eventName": {
-					"description": "unique event name",
-					"type": "string"
-				},
-				"eventType": {
-					"description": "for example - applicationVnf, guestOS, hostOS, platform",
-					"type": "string"
-				},
-				"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"
-				},
-				"nfcNamingCode": {
-					"description": "3 character network function component type, aligned with vfc naming standards",
-					"type": "string"
-				},
-				"nfNamingCode": {
-					"description": "4 character network function type, aligned with vnf naming standards",
-					"type": "string"
-				},
-				"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; must be populated by the ATT enrichment process",
-					"type": "string"
-				},
-				"reportingEntityName": {
-					"description": "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName",
-					"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; must be populated by the ATT enrichment process",
-					"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", "eventName", "lastEpochMicrosec", 
-						  "priority", "reportingEntityName", "sequence", "sourceName",
-			              "startEpochMicrosec", "version" ]
-		},
-		"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": "usage of an identified CPU",
-			"type": "object",
-			"properties": {
-				"cpuIdentifier": { 
-                    "description": "cpu identifer",
-                    "type": "string" 
-                },
-				"cpuIdle": { 
-                    "description": "percentage of CPU time spent in the idle task",
-                    "type": "number" 
-                },
-				"cpuUsageInterrupt": { 
-                    "description": "percentage of time spent servicing interrupts",
-                    "type": "number" 
-                },
-				"cpuUsageNice": { 
-                    "description": "percentage of time spent running user space processes that have been niced",
-                    "type": "number" 
-                },
-				"cpuUsageSoftIrq": { 
-                    "description": "percentage of time spent handling soft irq interrupts",
-                    "type": "number" 
-                },
-				"cpuUsageSteal": { 
-                    "description": "percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing",
-                    "type": "number" 
-                },
-				"cpuUsageSystem": { 
-                    "description": "percentage of time spent on system tasks running the kernel",
-                    "type": "number" 
-                },
-				"cpuUsageUser": { 
-                    "description": "percentage of time spent running un-niced user space processes",
-                    "type": "number" 
-                },
-				"cpuWait": { 
-                    "description": "percentage of CPU time spent waiting for I/O operations to complete",
-                    "type": "number" 
-                },
-				"percentUsage": { 
-                    "description": "aggregate cpu usage of the virtual machine on which the VNFC reporting the event is running",
-                    "type": "number" 
-                }
-			},
-			"required": [ "cpuIdentifier", "percentUsage" ]
-		},
-		"diskUsage": {
-			"description": "usage of an identified disk",
-			"type": "object",
-			"properties": {
-				"diskIdentifier": { 
-                    "description": "disk identifier", 
-                    "type": "string" 
-                },
-                "diskIoTimeAvg": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval",
-                    "type": "number"
-                },
-                "diskIoTimeLast": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskIoTimeMax": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskIoTimeMin": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedReadAvg": {
-                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedReadLast": {
-                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedReadMax": {
-                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedReadMin": {
-                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedWriteAvg": {
-                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedWriteLast": {
-                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedWriteMax": {
-                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedWriteMin": {
-                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsReadAvg": {
-                    "description": "number of octets per second read from a disk or partition; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsReadLast": {
-                    "description": "number of octets per second read from a disk or partition; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsReadMax": {
-                    "description": "number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsReadMin": {
-                    "description": "number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsWriteAvg": {
-                    "description": "number of octets per second written to a disk or partition; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsWriteLast": {
-                    "description": "number of octets per second written to a disk or partition; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsWriteMax": {
-                    "description": "number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsWriteMin": {
-                    "description": "number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsReadAvg": {
-                    "description": "number of read operations per second issued to the disk; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsReadLast": {
-                    "description": "number of read operations per second issued to the disk; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsReadMax": {
-                    "description": "number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsReadMin": {
-                    "description": "number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsWriteAvg": {
-                    "description": "number of write operations per second issued to the disk; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsWriteLast": {
-                    "description": "number of write operations per second issued to the disk; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsWriteMax": {
-                    "description": "number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsWriteMin": {
-                    "description": "number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskPendingOperationsAvg": {
-                    "description": "queue size of pending I/O operations per second; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskPendingOperationsLast": {
-                    "description": "queue size of pending I/O operations per second; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskPendingOperationsMax": {
-                    "description": "queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskPendingOperationsMin": {
-                    "description": "queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeReadAvg": {
-                    "description": "milliseconds a read operation took to complete; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeReadLast": {
-                    "description": "milliseconds a read operation took to complete; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeReadMax": {
-                    "description": "milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeReadMin": {
-                    "description": "milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeWriteAvg": {
-                    "description": "milliseconds a write operation took to complete; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeWriteLast": {
-                    "description": "milliseconds a write operation took to complete; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeWriteMax": {
-                    "description": "milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeWriteMin": {
-                    "description": "milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                }
-			},
-			"required": [ "diskIdentifier" ]
-		},
-        "endOfCallVqmSummaries": {
-            "description": "provides end of call voice quality metrics",
-			"type": "object",
-			"properties": {
-                "adjacencyName": {
-                    "description": " adjacency name",
-                    "type": "string"
-                },
-                "endpointDescription": {
-                    "description": "Either Caller or 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"
-                }
-            },
-            "required": [ "adjacencyName", "endpointDescription" ]
-        },
-        "event": {
-            "description": "the root level of the common event format",
-	        "type": "object",
-	        "properties": {
-		        "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" },
-		        "faultFields": { "$ref": "#/definitions/faultFields" },
-		        "heartbeatFields": { "$ref": "#/definitions/heartbeatFields" },
-		        "measurementsForVfScalingFields": { "$ref": "#/definitions/measurementsForVfScalingFields" },
-				"mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" },
-		        "otherFields": { "$ref": "#/definitions/otherFields" },
-		        "sipSignalingFields": { "$ref": "#/definitions/sipSignalingFields" },
-		        "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" },
-				"syslogFields": { "$ref": "#/definitions/syslogFields" },
-		        "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" },
-		        "voiceQualityFields": { "$ref": "#/definitions/voiceQualityFields" }
-        	},
-            "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"
-				},
-				"eventCategory": {
-					"description": "Event category, for example: license, link, routing, security, signaling",
-					"type": "string"
-				},
-				"eventSeverity": {
-					"description": "event severity",
-					"type": "string",
-					"enum": [
-						"CRITICAL",
-						"MAJOR",
-						"MINOR",
-						"WARNING",
-						"NORMAL"
-					]
-				},
-				"eventSourceType": {
-					"description": "type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, 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",
-			              "faultFieldsVersion", "specificProblem", "vfStatus" ]
-		},
-		"featuresInUse": {
-			"description": "number of times an identified feature was used over the measurementInterval",
-			"type": "object",
-			"properties": {
-				"featureIdentifier": { "type": "string" },
-				"featureUtilization": { "type": "integer" }
-			},
-			"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",
-                    "items": {
-						"type": "array",
-						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
-						]
-					}
-				},
-				"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",
-                    "items": {
-						"type": "array",
-						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
-						]
-					}
-				},
-				"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",
-                    "items": {
-						"type": "array",
-						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
-						]
-					}
-				},
-				"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"
-			]
-		},
-		"heartbeatFields": {
-			"description": "optional field block for fields specific to heartbeat events",
-			"type": "object",
-			"properties": {
-				"additionalFields": {
-					"description": "additional heartbeat fields if needed",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/field"
-					}
-				},
-				"heartbeatFieldsVersion": {
-					"description": "version of the heartbeatFields block",
-					"type": "number"
-				},
-				"heartbeatInterval": {
-					"description": "current heartbeat interval in seconds",
-					"type": "integer"
-				}
-			},
-			"required": [ "heartbeatFieldsVersion", "heartbeatInterval" ]
-		},
-		"internalHeaderFields": {
-			"description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",
-			"type": "object"
-		},
-		"jsonObject": {
-			"description": "json object schema, name and other meta-information along with one or more object instances",
-			"type": "object",
-			"properties": {
-				"objectInstances":  {
-                    "description": "one or more instances of the jsonObject", 
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/jsonObjectInstance"	
-                    }					
-                },
-				"objectName":  {
-                    "description": "name of the JSON Object", 
-                    "type": "string" 
-                },
-				"objectSchema":  {
-                    "description": "json schema for the object", 
-                    "type": "string" 
-                },
-				"objectSchemaUrl":  {
-                    "description": "Url to the json schema for the object", 
-                    "type": "string" 
-                },
-				"nfSubscribedObjectName":  {
-                    "description": "name of the object associated with the nfSubscriptonId", 
-                    "type": "string" 
-                },
-				"nfSubscriptionId":  {
-                    "description": "identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject", 
-                    "type": "string" 
-                }
-			},
-			"required": [ "objectInstances", "objectName" ]
-		},
-		"jsonObjectInstance": {
-			"description": "meta-information about an instance of a jsonObject along with the actual object instance",
-			"type": "object",
-			"properties": {
-				"objectInstance":  {
-                    "description": "an instance conforming to the jsonObject schema", 
-                    "type": "object" 
-                },
-				"objectInstanceEpochMicrosec":  {
-                    "description": "the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds", 
-                    "type": "number" 
-                },
-				"objectKeys":  {
-                    "description": "an ordered set of keys that identifies this particular instance of jsonObject", 
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/key"
-                    }					
-                }
-			},
-			"required": [ "objectInstance" ]
-		},
-		"key": {
-			"description": "tuple which provides the name of a key along with its value and relative order",
-			"type": "object",
-			"properties": {
-				"keyName": { 
-                    "description": "name of the key", 
-				    "type": "string" 
-				},
-				"keyOrder": { 
-                    "description": "relative sequence or order of the key with respect to other keys", 
-				    "type": "integer" 
-				},
-				"keyValue": { 
-                    "description": "value of the key", 
-				    "type": "string" 
-				}
-			},
-			"required": [ "keyName" ]
-		},
-		"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" ]
-		},
-		"measurementsForVfScalingFields": {
-			"description": "measurementsForVfScaling fields",
-			"type": "object",
-			"properties": {
-				"additionalFields": {
-					"description": "additional name-value-pair fields",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/field"
-					}
-				},
-				"additionalMeasurements": {
-					"description": "array of named name-value-pair arrays",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/namedArrayOfFields"
-					}
-				},
-                "additionalObjects": {
-                    "description": "array of JSON objects described by name, schema and other meta-information",
-					"type": "array",
-					"items": {
-                        "$ref": "#/definitions/jsonObject"
-					}
-                },
-				"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": "integer"
-				},
-				"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": "integer"
-				},
-				"cpuUsageArray": {
-					"description": "usage of an array of CPUs",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/cpuUsage"
-					}
-				},
-                "diskUsageArray": {
-					"description": "usage of an array of disks",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/diskUsage"
-					}
-				},
-				"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"
-				},
-				"memoryUsageArray": {
-					"description": "memory usage of an array of VMs",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/memoryUsage"
-					}
-				},
-				"numberOfMediaPortsInUse": {
-					"description": "number of media ports in use",
-					"type": "integer"
-				},
-				"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": "integer"
-				},
-				"vNicPerformanceArray": {
-					"description": "usage of an array of virtual network interface cards",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/vNicPerformance"
-					}
-				}
-			},
-			"required": [ "measurementInterval", "measurementsForVfScalingVersion" ]
-		},
-		"memoryUsage": {
-			"description": "memory usage of an identified virtual machine",
-			"type": "object",
-			"properties": {
-				"memoryBuffered": { 
-                    "description": "kibibytes of temporary storage for raw disk blocks", 
-                    "type": "number" 
-                },
-				"memoryCached": { 
-                    "description": "kibibytes of memory used for cache", 
-                    "type": "number" 
-                },
-				"memoryConfigured": { 
-                    "description": "kibibytes of memory configured in the virtual machine on which the VNFC reporting the event is running", 
-                    "type": "number" 
-                },
-				"memoryFree": { 
-                    "description": "kibibytes of physical RAM left unused by the system", 
-                    "type": "number" 
-                },
-				"memorySlabRecl": { 
-                    "description": "the part of the slab that can be reclaimed such as caches measured in kibibytes", 
-                    "type": "number" 
-                },
-				"memorySlabUnrecl": { 
-                    "description": "the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes", 
-                    "type": "number" 
-                },
-				"memoryUsed": { 
-                    "description": "total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes", 
-                    "type": "number" 
-                },
-				"vmIdentifier": { 
-                    "description": "virtual machine identifier associated with the memory metrics", 
-                    "type": "string" 
-                }
-			},
-			"required": [ "memoryFree", "memoryUsed", "vmIdentifier" ]
-		},
-		"mobileFlowFields": {
-			"description": "mobileFlow fields",
-			"type": "object",
-			"properties": {
-				"additionalFields": {
-					"description": "additional mobileFlow fields if needed",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/field"
-					}
-				},
-				"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": "integer"
-				},
-				"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": "integer"
-				},
-				"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": "integer"
-				},
-				"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",
-			              "mobileFlowFieldsVersion", "otherEndpointIpAddress", "otherEndpointPort",
-			              "reportingEndpointIpAddr", "reportingEndpointPort" ]
-		},
-		"namedArrayOfFields": {
-			"description": "an array of name value pairs along with a name for the array",
-			"type": "object",
-			"properties": {
-				"name":  { "type": "string" },
-				"arrayOfFields": {
-					"description": "array of name value pairs",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
-					}
-				}
-			},
-			"required": [ "name", "arrayOfFields" ]
-		},
-		"otherFields": {
-			"description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
-			"type": "object",
-			"properties": {
-				"hashOfNameValuePairArrays": {
-					"description": "array of named name-value-pair arrays",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/namedArrayOfFields"
-					}
-				},
-                "jsonObjects": {
-                    "description": "array of JSON objects described by name, schema and other meta-information",
-					"type": "array",
-					"items": {
-                        "$ref": "#/definitions/jsonObject"
-					}
-                },
-				"nameValuePairs": {
-					"description": "array of name-value pairs",
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/field"
-					}
-				},				
-                "otherFieldsVersion": {
-                    "description": "version of the otherFields block",
-                    "type": "number"
-                }
-            },
-            "required": [ "otherFieldsVersion" ]
-		},
-		"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" ]
-		},
-        "sipSignalingFields": {
-            "description": "sip signaling fields",
-            "type": "object",
-            "properties": {
-                "additionalInformation": {
-					"description": "additional sip signaling fields if needed",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
-					}
-                },
-                "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"
-                },
-                "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"
-                },
-                "sipSignalingFieldsVersion": {
-                    "description": "version of the sipSignalingFields block",
-                    "type": "number"
-                },
-                "summarySip": {
-                    "description": "the SIP Method or Response (‘INVITE’, ‘200 OK’, ‘BYE’, etc)",
-                    "type": "string"
-                },
-                "vendorVnfNameFields": {
-                    "$ref": "#/definitions/vendorVnfNameFields"
-                }
-            },
-            "required": [ "correlator", "localIpAddress", "localPort", "remoteIpAddress", 
-			              "remotePort", "sipSignalingFieldsVersion", "vendorVnfNameFields" ]
-        },
-		"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", "stateChangeFieldsVersion", "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 provided as name=value delimited by a pipe ‘|’ symbol, for example: 'name1=value1|name2=value2|…'",
-					"type": "string"
-				},
-				"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": "integer"
-				},
-				"syslogFieldsVersion": {
-					"description": "version of the syslogFields block",
-					"type": "number"
-				},
-				"syslogMsg": {
-					"description": "syslog message",
-					"type": "string"
-				},
-				"syslogPri": {
-					"description": "0-192 combined severity and facility",
-					"type": "integer"
-				},
-				"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"
-				},
-				"syslogSdId": {
-					"description": "0-32 char in format name@number for example ourSDID@32473",
-					"type": "string"
-				},
-				"syslogSev": {
-					"description": "numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8",
-					"type": "string",
-					"enum": [
-						"Alert",
-						"Critical",
-						"Debug",
-						"Emergency",
-						"Error",
-						"Info",
-						"Notice",
-						"Warning"
-					]
-				},
-				"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", "syslogFieldsVersion", "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",
-				"thresholdCrossingFieldsVersion"
-			]
-		},
-		"vendorVnfNameFields": {
-			"description": "provides vendor, vnf and vfModule identifying information",
-			"type": "object",
-			"properties": {
-				"vendorName": {
-					"description": "VNF vendor name",
-					"type": "string"
-				},
-				"vfModuleName": {
-					"description": "ASDC vfModuleName for the vfModule generating the event",
-					"type": "string"
-				},
-				"vnfName": {
-					"description": "ASDC modelName for the VNF generating the event",
-					"type": "string"
-				}
-			},
-			"required": [ "vendorName" ]
-		},
-		"vNicPerformance": {
-			"description": "describes the performance and errors of an identified virtual network interface card",
-			"type": "object",
-			"properties": {
-				"receivedBroadcastPacketsAccumulated": {
-					"description": "Cumulative count of broadcast packets received as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"receivedBroadcastPacketsDelta": {
-					"description": "Count of broadcast packets received within the measurement interval",
-					"type": "number"
-				},
-				"receivedDiscardedPacketsAccumulated": {
-					"description": "Cumulative count of discarded packets received as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"receivedDiscardedPacketsDelta": {
-					"description": "Count of discarded packets received within the measurement interval",
-					"type": "number"
-				},
-				"receivedErrorPacketsAccumulated": {
-					"description": "Cumulative count of error packets received as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"receivedErrorPacketsDelta": {
-					"description": "Count of error packets received within the measurement interval",
-					"type": "number"
-				},
-				"receivedMulticastPacketsAccumulated": {
-					"description": "Cumulative count of multicast packets received as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"receivedMulticastPacketsDelta": {
-					"description": "Count of multicast packets received within the measurement interval",
-					"type": "number"
-				},
-				"receivedOctetsAccumulated": {
-					"description": "Cumulative count of octets received as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"receivedOctetsDelta": {
-					"description": "Count of octets received within the measurement interval",
-					"type": "number"
-				},
-				"receivedTotalPacketsAccumulated": {
-					"description": "Cumulative count of all packets received as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"receivedTotalPacketsDelta": {
-					"description": "Count of all packets received within the measurement interval",
-					"type": "number"
-				},
-				"receivedUnicastPacketsAccumulated": {
-					"description": "Cumulative count of unicast packets received as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"receivedUnicastPacketsDelta": {
-					"description": "Count of unicast packets received within the measurement interval",
-					"type": "number"
-				},
-				"transmittedBroadcastPacketsAccumulated": {
-					"description": "Cumulative count of broadcast packets transmitted as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"transmittedBroadcastPacketsDelta": {
-					"description": "Count of broadcast packets transmitted within the measurement interval",
-					"type": "number"
-				},
-				"transmittedDiscardedPacketsAccumulated": {
-					"description": "Cumulative count of discarded packets transmitted as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"transmittedDiscardedPacketsDelta": {
-					"description": "Count of discarded packets transmitted within the measurement interval",
-					"type": "number"
-				},
-				"transmittedErrorPacketsAccumulated": {
-					"description": "Cumulative count of error packets transmitted as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"transmittedErrorPacketsDelta": {
-					"description": "Count of error packets transmitted within the measurement interval",
-					"type": "number"
-				},
-				"transmittedMulticastPacketsAccumulated": {
-					"description": "Cumulative count of multicast packets transmitted as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"transmittedMulticastPacketsDelta": {
-					"description": "Count of multicast packets transmitted within the measurement interval",
-					"type": "number"
-				},
-				"transmittedOctetsAccumulated": {
-					"description": "Cumulative count of octets transmitted as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"transmittedOctetsDelta": {
-					"description": "Count of octets transmitted within the measurement interval",
-					"type": "number"
-				},
-				"transmittedTotalPacketsAccumulated": {
-					"description": "Cumulative count of all packets transmitted as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"transmittedTotalPacketsDelta": {
-					"description": "Count of all packets transmitted within the measurement interval",
-					"type": "number"
-				},
-				"transmittedUnicastPacketsAccumulated": {
-					"description": "Cumulative count of unicast packets transmitted as read at the end of the measurement interval",
-					"type": "number"
-				},
-				"transmittedUnicastPacketsDelta": {
-					"description": "Count of unicast packets transmitted within the measurement interval",
-					"type": "number"
-				},
-				"valuesAreSuspect": {
-					"description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions",
-					"type": "string",
-					"enum": [ "true", "false" ]
-				},
-				"vNicIdentifier": {
-					"description": "vNic identification",
-					"type": "string"
-				}
-			},
-			"required": [ "valuesAreSuspect", "vNicIdentifier" ]
-		},
-        "voiceQualityFields": {
-            "description": "provides statistics related to customer facing voice products",
-            "type": "object",
-            "properties": {
-                "additionalInformation": {
-					"description": "additional voice quality fields if needed",
-					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
-					}
-                },
-                "calleeSideCodec": {
-                    "description": "callee codec for the call",
-                    "type": "string"
-                },
-                "callerSideCodec": {
-                    "description": "caller codec for the call",
-                    "type": "string"
-                },
-                "correlator": {
-                    "description": "this is the same for all events on this call",
-                    "type": "string"
-                },
-                "endOfCallVqmSummaries": {
-                    "$ref": "#/definitions/endOfCallVqmSummaries"
-                },
-                "phoneNumber": {
-                    "description": "phone number associated with the correlator",
-                    "type": "string"
-                },
-                "midCallRtcp": {
-                    "description": "Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers",
-                    "type": "string"
-                },
-                "vendorVnfNameFields": {
-                    "$ref": "#/definitions/vendorVnfNameFields"
-                },
-                "voiceQualityFieldsVersion": {
-                    "description": "version of the voiceQualityFields block",
-                    "type": "number"
-                }
-            },
-            "required": [ "calleeSideCodec", "callerSideCodec", "correlator", "midCallRtcp",
-			              "vendorVnfNameFields", "voiceQualityFieldsVersion" ]
-        }
-	},
-	"title": "Event Listener",
-	"type": "object",
-	"properties": {
-        "event": {"$ref": "#/definitions/event"}
-    }
-}
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json b/test/csit/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json
deleted file mode 100644
index 1c8f2e7ce..000000000
--- a/test/csit/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{

-	"path": "/reports/dcae/service-instances",

-	"start": "-24hour",

-	"end": "now"

-}
\ No newline at end of file
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/ves_vfirewall_measurement.json b/test/csit/tests/dcae/testcases/assets/json_events/ves_vfirewall_measurement.json
deleted file mode 100644
index 5dbedd3c5..000000000
--- a/test/csit/tests/dcae/testcases/assets/json_events/ves_vfirewall_measurement.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{

-	"event": {

-		"commonEventHeader": {

-			"reportingEntityName": "VM name will be provided by ECOMP",

-			"startEpochMicrosec": 1506008587564787,

-			"lastEpochMicrosec": 1506008587564787,

-			"eventName": "Measurement_VFirewall_VNicStat",

-			"eventId": "0b2b5790-3673-480a-a4bd-5a00b88e5af6",

-			"sourceName": "Dummy VM name - No Metadata available",

-			"sequence": 18123,

-			"priority": "Normal",

-			"functionalRole": "vFirewall",

-			"domain": "measurementsForVfScaling",

-			"reportingEntityId": "VM UUID will be provided by ECOMP",

-			"sourceId": "Dummy VM UUID - No Metadata available",

-			"version": 1.1

-		},

-		"measurementsForVfScalingFields": {

-			"measurementInterval": 10,

-			"measurementsForVfScalingVersion": 1.1,

-			"vNicUsageArray": [{

-				"multicastPacketsIn": 0,

-				"bytesIn": 3896,

-				"unicastPacketsIn": 0,

-				"multicastPacketsOut": 0,

-				"broadcastPacketsOut": 0,

-				"packetsOut": 28,

-				"bytesOut": 12178,

-				"broadcastPacketsIn": 0,

-				"packetsIn": 58,

-				"unicastPacketsOut": 0,

-				"vNicIdentifier": "eth0"

-			}]

-		}

-	}

-}
\ No newline at end of file
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json b/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json
deleted file mode 100644
index 9a711507a..000000000
--- a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{

-   "eventList": [

-      {

-         "commonEventHeader": {

-            "version": 3.0,

-            "domain": "fault",

-            "eventName": "Fault_MobileCallRecording_PilotNumberPoolExhaustion",

-            "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546016",

-            "sequence": 0,

-            "priority": "High",

-            "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234",

-            "reportingEntityName": "EricssonOamVf",

-            "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014",

-            "sourceName": "scfx0001vm002cap001",

-            "nfNamingCode": "scfx",

-            "nfcNamingCode": "ssc",

-            "startEpochMicrosec": 1413378172000000,

-            "lastEpochMicrosec": 1413378172000000

-         },

-         "faultFields": {

-            "faultFieldsVersion": 2.0,

-            "alarmCondition": "PilotNumberPoolExhaustion",

-            "eventSourceType": "other",

-            "specificProblem": "Calls cannot complete - pilot numbers are unavailable",

-            "eventSeverity": "CRITICAL",

-            "vfStatus": "Active",

-            "alarmAdditionalInformation": [

-               {

-                  "name": "PilotNumberPoolSize",

-                  "value": "1000"

-               }

-            ]

-         }

-      },

-      {

-         "commonEventHeader": {

-            "version": 3.0,

-            "domain": "fault",

-            "eventName": "Fault_MobileCallRecording_RecordingServerUnreachable",

-            "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546025",

-            "sequence": 0,

-            "priority": "High",

-            "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234",

-            "reportingEntityName": "EricssonOamVf",

-            "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014",

-            "sourceName": "scfx0001vm002cap001",

-            "nfNamingCode": "scfx",

-            "nfcNamingCode": "ssc",

-            "startEpochMicrosec": 1413378172000010,

-            "lastEpochMicrosec": 1413378172000010

-         },

-         "faultFields": {

-            "faultFieldsVersion": 2.0,

-            "alarmCondition": "RecordingServerUnreachable",

-            "eventSourceType": "other",

-            "specificProblem": "Recording server unreachable",

-            "eventSeverity": "CRITICAL",

-            "vfStatus": "Active"

-         }

-      }

-   ]

-}

diff --git a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_provide_throttle_state.json b/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_provide_throttle_state.json
deleted file mode 100644
index d9893a7ae..000000000
--- a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_provide_throttle_state.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{

-   "eventThrottlingState": {

-      "eventThrottlingMode": "throttled",

-      "eventDomainThrottleSpecificationList": [

-         {

-            "eventDomain": "fault",

-            "suppressedFieldNames": [

-               "alarmInterfaceA",

-               "alarmAdditionalInformation" 

-            ]

-         },

-         {

-            "eventDomain": "thresholdCrossingAlert",

-            "suppressedFieldNames": [

-               "associatedAlertIdList",

-               "possibleRootCause" 

-            ],

-            "suppressedNvPairsList": [

-               {

-                  "nvPairFieldName": "additionalParameters",

-                  "suppressedNvPairNames": [

-                     "someCounterName",

-                     "someOtherCounterName"

-                  ]

-               }

-            ]

-         }

-      ]

-   }

-}

diff --git a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event.json b/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event.json
deleted file mode 100644
index a45c51dd9..000000000
--- a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{

-    "event": {

-        "commonEventHeader": {

-            "version": 3.0,

-            "domain": "fault",

-            "eventName": "Fault_MobileCallRecording_PilotNumberPoolExhaustion",

-            "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546015",

-            "sequence": 0,

-            "priority": "High",

-            "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234",

-            "reportingEntityName": "EricssonOamVf",

-            "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014",

-            "sourceName": "scfx0001vm002cap001",

-            "nfNamingCode": "scfx",

-            "nfcNamingCode": "ssc",

-            "startEpochMicrosec": 1413378172000000,

-            "lastEpochMicrosec": 1413378172000000

-        },

-        "faultFields": {

-            "faultFieldsVersion": 2.0,

-            "alarmCondition": "PilotNumberPoolExhaustion",

-            "eventSourceType": "other",

-            "specificProblem": "Calls cannot complete - pilot numbers are unavailable",

-            "eventSeverity": "CRITICAL",

-            "vfStatus": "Active",

-            "alarmAdditionalInformation": [

-                {

-                    "name": "PilotNumberPoolSize",

-                    "value": "1000"

-                }

-            ]

-        }

-    }

-}

diff --git a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event_bad.json b/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event_bad.json
deleted file mode 100644
index fd831cee2..000000000
--- a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event_bad.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{

-    "event": {

-        "commonEventHeader": {

-            "version": 3.0

-            "domain": "fault",

-            "eventName": "Fault_MobileCallRecording_PilotNumberPoolExhaustion",

-            "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546015",

-            "sequence": 0,

-            "priority": "High",

-            "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234",

-            "reportingEntityName": "EricssonOamVf",

-            "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014",

-            "sourceName": "scfx0001vm002cap001",

-            "nfNamingCode": "scfx",

-            "nfcNamingCode": "ssc",

-            "startEpochMicrosec": 1413378172000000,

-            "lastEpochMicrosec": 1413378172000000

-        },

-        "faultFields": {

-            "faultFieldsVersion": 2.0,

-            "alarmCondition": "PilotNumberPoolExhaustion",

-            "eventSourceType": "other",

-            "specificProblem": "Calls cannot complete - pilot numbers are unavailable",

-            "eventSeverity": "CRITICAL",

-            "vfStatus": "Active",

-            "alarmAdditionalInformation": [

-                {

-                    "name": "PilotNumberPoolSize",

-                    "value": "1000"

-                }

-            ]

-        }

-    }

-}
\ No newline at end of file
diff --git a/test/csit/tests/dcae/testcases/dcae_ves.robot b/test/csit/tests/dcae/testcases/dcae_ves.robot
deleted file mode 100644
index 1df67ae6f..000000000
--- a/test/csit/tests/dcae/testcases/dcae_ves.robot
+++ /dev/null
@@ -1,188 +0,0 @@
-*** Settings ***

-Documentation	  Testing DCAE VES Listener with various event feeds from VoLTE, vDNS, vFW and cCPE use scenarios

-

-Library 	      RequestsLibrary   

-Library           OperatingSystem

-Library           Collections

-Library           DcaeLibrary

-Resource          resources/dcae_keywords.robot

-Test Setup        Cleanup VES Events

-Suite Setup       VES Collector Suite Setup DMaaP

-Suite Teardown    VES Collector Suite Shutdown DMaaP    

-

-

-

-

-*** Variables ***

-${VESC_URL_HTTPS}                        https://%{VESC_IP}:8443

-${VESC_URL}                              http://%{VESC_IP}:8080

-${VES_ANY_EVENT_PATH}                    /eventListener/v5

-${VES_BATCH_EVENT_PATH}             	 /eventListener/v5/eventBatch

-${VES_THROTTLE_STATE_EVENT_PATH}         /eventListener/v5/clientThrottlingState

-${HEADER_STRING}                         content-type=application/json

-${EVENT_DATA_FILE}                       %{WORKSPACE}/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event.json

-${EVENT_MEASURE_FILE}                    %{WORKSPACE}/test/csit/tests/dcae/testcases/assets/json_events/ves_vfirewall_measurement.json

-${EVENT_DATA_FILE_BAD}                   %{WORKSPACE}/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event_bad.json

-${EVENT_BATCH_DATA_FILE}                 %{WORKSPACE}/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json

-${EVENT_THROTTLING_STATE_DATA_FILE}      %{WORKSPACE}/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_provide_throttle_state.json

-

-

-#DCAE Health Check

-${CONFIG_BINDING_URL}                    http://localhost:8443

-${CB_HEALTHCHECK_PATH}                   /healthcheck

-${CB_SERVICE_COMPONENT_PATH}             /service_component/

-${VES_Service_Name1}                     dcae-controller-ves-collector

-${VES_Service_Name2}                     ves-collector-not-exist

-

-*** Comment out from R1 release ***

-DCAE Health Check

-    [Tags]    DCAE-HealthCheck

-    [Documentation]   Get DCAE Overall Status

-    ${auth}=  Create List  ${GLOBAL_DCAE_USERNAME}  ${GLOBAL_DCAE_PASSWORD}

-    ${session}=    Create Session 	dcae-health-check 	${CONFIG_BINDING_URL}    auth=${auth}

-    ${resp}= 	Get Request 	dcae-health-check 	${CB_HEALTHCHECK_PATH}

-    Should Be Equal As Strings 	${resp.status_code} 	200

-

-

-Get VES Collector Service Status

-    [Tags]    DCAE-HealthCheck

-    [Documentation]   Get the status of a VES Collector Service Component based on service name

-    ${urlpath}=    Catenate  SEPARATOR= ${CB_SERVICE_COMPONENT_PATH} ${VES_Service_Name1}

-    Log   Service component name for status query: ${urlpath}

-    ${resp}=  Get DCAE Service Component Status   ${CONFIG_BINDING_URL}  ${CB_SERVICE_COMPONENT_PATH}  ${GLOBAL_DCAE_USERNAME}  ${GLOBAL_DCAE_PASSWORD}

-    Log    Receive HTTP Status code ${resp.status_code}

-    Should Be Equal As Strings 	${resp.status_code} 	200

-    ${isEmpty}=   Is Json Empty    ${resp}

-    Run Keyword If   '${isEmpty}' == False   Log  ${resp.json()}

-    

-    

-    

-#*** Comment out from R1 release ***

-Publish VES VoLTE Fault Provide Throttling State

-    [Tags]    DCAE-D1

-    ${evtdata}=   Get Event Data From File   ${EVENT_THROTTLING_STATE_DATA_FILE}

-    ${headers}=   Create Header From String    ${HEADER_STRING}

-    ${resp}=  Publish Event To VES Collector    ${VES_VOLTE_URL}  ${VES_THROTTLE_STATE_EVENT_PATH}  ${headers}  ${evtdata}  ${GLOBAL_DCAE_USERNAME}  ${GLOBAL_DCAE_PASSWORD}

-    Should Be Equal As Strings 	${resp.status_code} 	204

-    

-Publish VES Event With Invalid Method

-    [Tags]    DCAE-D1

-    [Documentation]    Use invalid Put instead of Post method to expect 405 response

-    ${evtdata}=   Get Event Data From File   ${EVENT_DATA_FILE}

-    ${headers}=   Create Header From String    ${HEADER_STRING}

-    Log   Send HTTP Request with invalid method Put instead of Post

-    ${resp}=  Publish Event To VES Collector With Put Method   ${VES_VOLTE_URL}  ${VES_ANY_EVENT_PATH}  ${headers}  ${evtdata}  ${GLOBAL_DCAE_USERNAME}  ${GLOBAL_DCAE_PASSWORD}

-    Log    Receive HTTP Status code ${resp.status_code}

-    Should Be Equal As Strings 	${resp.status_code} 	405

-    

-    

-Publish VES Event With Invalid URL Path

-    [Tags]    DCAE-D1

-    [Documentation]    Use invalid url path to expect 404 response

-    ${evtdata}=   Get Event Data From File   ${EVENT_DATA_FILE}

-    ${headers}=   Create Header From String    ${HEADER_STRING}

-    Log   Send HTTP Request with invalid /listener/v5/ instead of /eventlistener/v5 path

-    ${resp}=  Publish Event To VES Collector    ${VES_VOLTE_URL}  /listener/v5/  ${headers}  ${evtdata}  ${GLOBAL_DCAE_USERNAME}  ${GLOBAL_DCAE_PASSWORD}

-    Log    Receive HTTP Status code ${resp.status_code}

-    Should Be Equal As Strings 	${resp.status_code} 	404

-

-Publish VES Event With Invalid Login

-    [Tags]    DCAE-D1

-    [Documentation]    Use invalid user or password to expect 401 response

-    ${evtdata}=   Get Event Data From File   ${EVENT_DATA_FILE}

-    ${headers}=   Create Header From String    ${HEADER_STRING}

-    Log   Send HTTP Request with invalid User: BadUserName

-    ${resp}=  Publish Event To VES Collector    ${VES_VOLTE_URL}  ${VES_ANY_EVENT_PATH}  ${headers}  ${evtdata}  BadUserName  ${GLOBAL_DCAE_PASSWORD}

-    Log    Receive HTTP Status code ${resp.status_code}

-    Should Be Equal As Strings 	${resp.status_code} 	401

-    

-*** Test Cases ***

-VES Collector Health Check

-    [Tags]    DCAE-VESC-R1

-    [Documentation]   Ves Collector Health Check

-    ${uuid}=    Generate UUID

-    ${session}=    Create Session 	dcae 	${VESC_URL}

-    ${headers}=  Create Dictionary     Accept=*/*     X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}

-    ${resp}= 	Get Request 	dcae 	/healthcheck        headers=${headers}

-    Should Be Equal As Strings 	${resp.status_code} 	200

-    

-

-Publish Single VES VoLTE Fault Event

-    [Tags]    DCAE-VESC-R1

-    [Documentation]   Post single event and expect 200 Response 

-    ${evtdata}=   Get Event Data From File   ${EVENT_DATA_FILE}

-    ${headers}=   Create Header From String    ${HEADER_STRING}

-    ${resp}=  Publish Event To VES Collector No Auth    ${VESC_URL}  ${VES_ANY_EVENT_PATH}  ${headers}  ${evtdata}

-    Log    Receive HTTP Status code ${resp.status_code}

-    Should Be Equal As Strings 	${resp.status_code} 	200

-    ${isEmpty}=   Is Json Empty    ${resp}

-    Run Keyword If   '${isEmpty}' == False   Log  ${resp.json()}

-    ${ret}=  DMaaP Message Receive    ab305d54-85b4-a31b-7db2-fb6b9e546015

-    Should Be Equal As Strings    ${ret}    true

-

-Publish Single VES VNF Measurement Event

-    [Tags]    DCAE-VESC-R1

-    [Documentation]   Post single event and expect 200 Response 

-    ${evtdata}=   Get Event Data From File   ${EVENT_MEASURE_FILE}

-    ${headers}=   Create Header From String    ${HEADER_STRING}

-    ${resp}=  Publish Event To VES Collector No Auth    ${VESC_URL}   ${VES_ANY_EVENT_PATH}  ${headers}  ${evtdata}

-    Log    Receive HTTP Status code ${resp.status_code}

-    Should Be Equal As Strings 	${resp.status_code} 	200

-    ${isEmpty}=   Is Json Empty    ${resp}

-    Run Keyword If   '${isEmpty}' == False   Log  ${resp.json()}

-    ${ret}=  DMaaP Message Receive    0b2b5790-3673-480a-a4bd-5a00b88e5af6

-    Should Be Equal As Strings    ${ret}    true

-

-Publish VES VoLTE Fault Batch Events

-    [Tags]    DCAE-VESC-R1

-    [Documentation]   Post batched events and expect 202 Response 

-    ${evtdata}=   Get Event Data From File   ${EVENT_BATCH_DATA_FILE}

-    ${headers}=   Create Header From String    ${HEADER_STRING}

-    ${resp}=  Publish Event To VES Collector No Auth    ${VESC_URL}  ${VES_BATCH_EVENT_PATH}  ${headers}  ${evtdata}

-    Should Be Equal As Strings 	${resp.status_code} 	200

-    ${ret}=  DMaaP Message Receive    ab305d54-85b4-a31b-7db2-fb6b9e546016

-    Should Be Equal As Strings    ${ret}    true    

-    

-    

-Publish Single VES VoLTE Fault Event With Bad Data

-    [Tags]    DCAE-VESC-R1

-    [Documentation]    Run with JSON Envent with missing comma to expect 400 response

-    ${evtdata}=   Get Event Data From File   ${EVENT_DATA_FILE_BAD}

-    ${headers}=   Create Header From String    ${HEADER_STRING}  

-    Log   Send HTTP Request with invalid Json Event Data

-    ${resp}=  Publish Event To VES Collector No Auth    ${VESC_URL}  ${VES_ANY_EVENT_PATH}  ${headers}  ${evtdata}

-    Log    Receive HTTP Status code ${resp.status_code}

-    Should Be Equal As Strings 	${resp.status_code} 	400

-    ${isEmpty}=   Is Json Empty    ${resp}

-    Run Keyword If   '${isEmpty}' == False   Log  ${resp.json()}

-    

-Publish VES Event With Invalid Method

-    [Tags]    DCAE-VESC-R1

-    [Documentation]    Use invalid Put instead of Post method to expect 405 response

-    ${evtdata}=   Get Event Data From File   ${EVENT_DATA_FILE}

-    ${headers}=   Create Header From String    ${HEADER_STRING}

-    Log   Send HTTP Request with invalid method Put instead of Post

-    ${resp}=  Publish Event To VES Collector With Put Method No Auth  ${VESC_URL}  ${VES_ANY_EVENT_PATH}  ${headers}  ${evtdata}

-    Log    Receive HTTP Status code ${resp.status_code}

-    Should Be Equal As Strings 	${resp.status_code} 	404

-    

-    

-Publish VES Event With Invalid URL Path

-    [Tags]    DCAE-VESC-R1

-    [Documentation]    Use invalid url path to expect 404 response

-    ${evtdata}=   Get Event Data From File   ${EVENT_DATA_FILE}

-    ${headers}=   Create Header From String    ${HEADER_STRING}

-    Log   Send HTTP Request with invalid /listener/v5/ instead of /eventListener/v5 path

-    ${resp}=  Publish Event To VES Collector No Auth    ${VESC_URL}  /listener/v5/  ${headers}  ${evtdata}

-    Log    Receive HTTP Status code ${resp.status_code}

-    Should Be Equal As Strings 	${resp.status_code} 	404

-    

-

-    

-        

-    

-  

-    

-  

-

-

diff --git a/test/csit/tests/dcae/testcases/resources/DMaaP.py b/test/csit/tests/dcae/testcases/resources/DMaaP.py
deleted file mode 100644
index 63e4e8c6b..000000000
--- a/test/csit/tests/dcae/testcases/resources/DMaaP.py
+++ /dev/null
@@ -1,423 +0,0 @@
-'''

-Created on Aug 15, 2017

-

-@author: sw6830

-'''

-import os

-import posixpath

-import BaseHTTPServer

-import urllib

-import urlparse

-import cgi, sys, shutil, mimetypes

-from jsonschema import validate

-import jsonschema, json

-import DcaeVariables

-import SimpleHTTPServer

-from robot.api import logger

-

-

-try:

-    from cStringIO import StringIO

-except ImportError:

-    from StringIO import StringIO

-

-EvtSchema = None

-DMaaPHttpd = None

-

-

-def cleanUpEvent():

-    sz = DcaeVariables.VESEventQ.qsize()

-    for i in range(sz):

-        try:

-            self.evtQueue.get_nowait()

-        except:

-            pass

-

-def enqueEvent(evt):

-    if DcaeVariables.VESEventQ != None:

-        try:

-            DcaeVariables.VESEventQ.put(evt)

-            if DcaeVariables.IsRobotRun:

-                logger.console("DMaaP Event enqued - size=" + str(len(evt)))

-            else:

-                print ("DMaaP Event enqueued - size=" + str(len(evt)))

-            return True

-        except Exception as e:

-            print (str(e))

-            return False

-    return False

-            

-def dequeEvent(waitSec=25):

-    if DcaeVariables.IsRobotRun:

-        logger.console("Enter DequeEvent")

-    try:

-        evt = DcaeVariables.VESEventQ.get(True, waitSec)

-        if DcaeVariables.IsRobotRun:

-            logger.console("DMaaP Event dequeued - size=" + str(len(evt)))

-        else:

-            print("DMaaP Event dequeued - size=" + str(len(evt)))

-        return evt

-    except Exception as e:

-        if DcaeVariables.IsRobotRun:

-            logger.console(str(e))

-            logger.console("DMaaP Event dequeue timeout")

-        else:

-            print("DMaaP Event dequeue timeout")

-        return None

- 

-class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler):

-      

-    def do_PUT(self):

-        self.send_response(405)

-        return

-        

-    def do_POST(self):

-        

-        respCode = 0

-        # Parse the form data posted

-        '''

-        form = cgi.FieldStorage(

-            fp=self.rfile, 

-            headers=self.headers,

-            environ={'REQUEST_METHOD':'POST',

-                     'CONTENT_TYPE':self.headers['Content-Type'],

-                     })

-        

-        

-        form = cgi.FieldStorage(

-        fp=self.rfile,

-        headers=self.headers,

-        environ={"REQUEST_METHOD": "POST"})

-

-        for item in form.list:

-            print "%s=%s" % (item.name, item.value)

-            

-        '''

-        

-        if 'POST' not in self.requestline:

-            respCode = 405

-            

-        '''

-        if respCode == 0:

-            if '/eventlistener/v5' not in self.requestline and '/eventlistener/v5/eventBatch' not in self.requestline and \

-                        '/eventlistener/v5/clientThrottlingState' not in self.requestline:

-                respCode = 404

-         

-        

-        if respCode == 0:

-            if 'Y29uc29sZTpaakprWWpsbE1qbGpNVEkyTTJJeg==' not in str(self.headers):

-                respCode = 401

-        '''  

-        

-        if respCode == 0:

-            content_len = int(self.headers.getheader('content-length', 0))

-            post_body = self.rfile.read(content_len)

-            

-            if DcaeVariables.IsRobotRun:

-                logger.console("\n" + "DMaaP Receive Event:\n" + post_body)

-            else:

-                print("\n" + "DMaaP Receive Event:")

-                print (post_body)

-            

-            indx = post_body.index("{")

-            if indx != 0:

-                post_body = post_body[indx:]

-            

-            if enqueEvent(post_body) == False:

-                print "enque event fails"

-                   

-            global EvtSchema

-            try:

-                if EvtSchema == None:

-                    with open(DcaeVariables.CommonEventSchemaV5) as file:

-                        EvtSchema = json.load(file)

-                decoded_body = json.loads(post_body)

-                jsonschema.validate(decoded_body, EvtSchema)

-            except:

-                respCode = 400

-        

-        # Begin the response

-        if DcaeVariables.IsRobotRun == False:

-            print ("Response Message:")

-        

-        '''

-        {

-          "200" : {

-            "description" : "Success",

-            "schema" : {

-              "$ref" : "#/definitions/DR_Pub"

-            }

-        }

-        

-        rspStr = "{'responses' : {'200' : {'description' : 'Success'}}}"

-        rspStr1 = "{'count': 1, 'serverTimeMs': 3}"

-

-        '''

-        

-        if respCode == 0:

-            if 'clientThrottlingState' in self.requestline:

-                self.send_response(204)

-            else:

-                self.send_response(200)

-                self.send_header('Content-Type', 'application/json')

-                self.end_headers()

-                #self.wfile.write("{'responses' : {'200' : {'description' : 'Success'}}}")

-                self.wfile.write("{'count': 1, 'serverTimeMs': 3}")

-                self.wfile.close()

-        else:

-            self.send_response(respCode)

-        

-        '''

-        self.end_headers()

-        self.wfile.write('Client: %s\n' % str(self.client_address))

-        self.wfile.write('User-agent: %s\n' % str(self.headers['user-agent']))

-        self.wfile.write('Path: %s\n' % self.path)

-        self.wfile.write('Form data:\n')

-        self.wfile.close()

-

-        # Echo back information about what was posted in the form

-        for field in form.keys():

-            field_item = form[field]

-            if field_item.filename:

-                # The field contains an uploaded file

-                file_data = field_item.file.read()

-                file_len = len(file_data)

-                del file_data

-                self.wfile.write('\tUploaded %s as "%s" (%d bytes)\n' % \

-                        (field, field_item.filename, file_len))

-            else:

-                # Regular form value

-                self.wfile.write('\t%s=%s\n' % (field, form[field].value))

-        '''

-        return

-    

-    

-    def do_GET(self):

-        """Serve a GET request."""

-        f = self.send_head()

-        if f:

-            try:

-                self.copyfile(f, self.wfile)

-            finally:

-                f.close()

-

-    def do_HEAD(self):

-        """Serve a HEAD request."""

-        f = self.send_head()

-        if f:

-            f.close()

-

-    def send_head(self):

-        """Common code for GET and HEAD commands.

-

-        This sends the response code and MIME headers.

-

-        Return value is either a file object (which has to be copied

-        to the outputfile by the caller unless the command was HEAD,

-        and must be closed by the caller under all circumstances), or

-        None, in which case the caller has nothing further to do.

-

-        """

-        path = self.translate_path(self.path)

-        f = None

-        if os.path.isdir(path):

-            parts = urlparse.urlsplit(self.path)

-            if not parts.path.endswith('/'):

-                # redirect browser - doing basically what apache does

-                self.send_response(301)

-                new_parts = (parts[0], parts[1], parts[2] + '/',

-                             parts[3], parts[4])

-                new_url = urlparse.urlunsplit(new_parts)

-                self.send_header("Location", new_url)

-                self.end_headers()

-                return None

-            for index in "index.html", "index.htm":

-                index = os.path.join(path, index)

-                if os.path.exists(index):

-                    path = index

-                    break

-            else:

-                return self.list_directory(path)

-        ctype = self.guess_type(path)

-        try:

-            # Always read in binary mode. Opening files in text mode may cause

-            # newline translations, making the actual size of the content

-            # transmitted *less* than the content-length!

-            f = open(path, 'rb')

-        except IOError:

-            self.send_error(404, "File not found")

-            return None

-        try:

-            self.send_response(200)

-            self.send_header("Content-type", ctype)

-            fs = os.fstat(f.fileno())

-            self.send_header("Content-Length", str(fs[6]))

-            self.send_header("Last-Modified", self.date_time_string(fs.st_mtime))

-            self.end_headers()

-            return f

-        except:

-            f.close()

-            raise

-

-    def list_directory(self, path):

-        """Helper to produce a directory listing (absent index.html).

-

-        Return value is either a file object, or None (indicating an

-        error).  In either case, the headers are sent, making the

-        interface the same as for send_head().

-

-        """

-        try:

-            list = os.listdir(path)

-        except os.error:

-            self.send_error(404, "No permission to list directory")

-            return None

-        list.sort(key=lambda a: a.lower())

-        f = StringIO()

-        displaypath = cgi.escape(urllib.unquote(self.path))

-        f.write('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">')

-        f.write("<html>\n<title>Directory listing for %s</title>\n" % displaypath)

-        f.write("<body>\n<h2>Directory listing for %s</h2>\n" % displaypath)

-        f.write("<hr>\n<ul>\n")

-        for name in list:

-            fullname = os.path.join(path, name)

-            displayname = linkname = name

-            # Append / for directories or @ for symbolic links

-            if os.path.isdir(fullname):

-                displayname = name + "/"

-                linkname = name + "/"

-            if os.path.islink(fullname):

-                displayname = name + "@"

-                # Note: a link to a directory displays with @ and links with /

-            f.write('<li><a href="%s">%s</a>\n'

-                    % (urllib.quote(linkname), cgi.escape(displayname)))

-        f.write("</ul>\n<hr>\n</body>\n</html>\n")

-        length = f.tell()

-        f.seek(0)

-        self.send_response(200)

-        encoding = sys.getfilesystemencoding()

-        self.send_header("Content-type", "text/html; charset=%s" % encoding)

-        self.send_header("Content-Length", str(length))

-        self.end_headers()

-        return f

-

-    def translate_path(self, path):

-        """Translate a /-separated PATH to the local filename syntax.

-

-        Components that mean special things to the local file system

-        (e.g. drive or directory names) are ignored.  (XXX They should

-        probably be diagnosed.)

-

-        """

-        # abandon query parameters

-        path = path.split('?',1)[0]

-        path = path.split('#',1)[0]

-        # Don't forget explicit trailing slash when normalizing. Issue17324

-        trailing_slash = path.rstrip().endswith('/')

-        path = posixpath.normpath(urllib.unquote(path))

-        words = path.split('/')

-        words = filter(None, words)

-        path = os.getcwd()

-        for word in words:

-            if os.path.dirname(word) or word in (os.curdir, os.pardir):

-                # Ignore components that are not a simple file/directory name

-                continue

-            path = os.path.join(path, word)

-        if trailing_slash:

-            path += '/'

-        return path

-

-    def copyfile(self, source, outputfile):

-        """Copy all data between two file objects.

-

-        The SOURCE argument is a file object open for reading

-        (or anything with a read() method) and the DESTINATION

-        argument is a file object open for writing (or

-        anything with a write() method).

-

-        The only reason for overriding this would be to change

-        the block size or perhaps to replace newlines by CRLF

-        -- note however that this the default server uses this

-        to copy binary data as well.

-

-        """

-        shutil.copyfileobj(source, outputfile)

-

-    def guess_type(self, path):

-        """Guess the type of a file.

-

-        Argument is a PATH (a filename).

-

-        Return value is a string of the form type/subtype,

-        usable for a MIME Content-type header.

-

-        The default implementation looks the file's extension

-        up in the table self.extensions_map, using application/octet-stream

-        as a default; however it would be permissible (if

-        slow) to look inside the data to make a better guess.

-

-        """

-

-        base, ext = posixpath.splitext(path)

-        if ext in self.extensions_map:

-            return self.extensions_map[ext]

-        ext = ext.lower()

-        if ext in self.extensions_map:

-            return self.extensions_map[ext]

-        else:

-            return self.extensions_map['']

-

-    if not mimetypes.inited:

-        mimetypes.init() # try to read system mime.types

-    extensions_map = mimetypes.types_map.copy()

-    extensions_map.update({

-        '': 'application/octet-stream', # Default

-        '.py': 'text/plain',

-        '.c': 'text/plain',

-        '.h': 'text/plain',

-        })

-

-def test(HandlerClass = DMaaPHandler,

-         ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0", port=3904):

-    print "Load event schema file: " + DcaeVariables.CommonEventSchemaV5

-    with open(DcaeVariables.CommonEventSchemaV5) as file:

-        global EvtSchema

-        EvtSchema = json.load(file)

-        

-    server_address = ('', port)

-

-    HandlerClass.protocol_version = protocol

-    httpd = ServerClass(server_address, HandlerClass)

-    

-    global DMaaPHttpd

-    DMaaPHttpd = httpd

-    DcaeVariables.HTTPD = httpd

-

-    sa = httpd.socket.getsockname()

-    print "Serving HTTP on", sa[0], "port", sa[1], "..."

-    #httpd.serve_forever()

-

-def _main_ (HandlerClass = DMaaPHandler,

-         ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"):

-    

-    if sys.argv[1:]:

-        port = int(sys.argv[1])

-    else:

-        port = 3904

-    

-    print "Load event schema file: " + DcaeVariables.CommonEventSchemaV5

-    with open(DcaeVariables.CommonEventSchemaV5) as file:

-        global EvtSchema

-        EvtSchema = json.load(file)

-        

-    server_address = ('', port)

-

-    HandlerClass.protocol_version = protocol

-    httpd = ServerClass(server_address, HandlerClass)

-

-    sa = httpd.socket.getsockname()

-    print "Serving HTTP on", sa[0], "port", sa[1], "..."

-    httpd.serve_forever()

-    

-if __name__ == '__main__':

-    _main_()
\ No newline at end of file
diff --git a/test/csit/tests/dcae/testcases/resources/DcaeLibrary.py b/test/csit/tests/dcae/testcases/resources/DcaeLibrary.py
deleted file mode 100644
index 650f8fef8..000000000
--- a/test/csit/tests/dcae/testcases/resources/DcaeLibrary.py
+++ /dev/null
@@ -1,135 +0,0 @@
-'''

-Created on Aug 18, 2017

-

-@author: sw6830

-'''

-from robot.api import logger

-from Queue import Queue

-import uuid, time, datetime,json, threading

-import DcaeVariables

-import DMaaP

-

-class DcaeLibrary(object):

-    

-    def __init__(self):

-        pass

-    

-    def setup_dmaap_server(self, portNum=3904):

-        if DcaeVariables.HttpServerThread != None:

-            DMaaP.cleanUpEvent()

-            logger.console("Clean up event from event queue before test")

-            logger.info("DMaaP Server already started")

-            return "true"

-        

-        DcaeVariables.IsRobotRun = True

-        DMaaP.test(port=portNum)

-        try:

-            DcaeVariables.VESEventQ = Queue()

-            DcaeVariables.HttpServerThread = threading.Thread(name='DMAAP_HTTPServer', target=DMaaP.DMaaPHttpd.serve_forever)

-            DcaeVariables.HttpServerThread.start()

-            logger.console("DMaaP Mockup Sever started")

-            time.sleep(2)

-            return "true"

-        except Exception as e:

-            print (str(e))

-            return "false"

-            

-    def shutdown_dmaap(self):

-        if DcaeVariables.HTTPD != None:

-            DcaeVariables.HTTPD.shutdown()

-            logger.console("DMaaP Server shut down")

-            time.sleep(3)

-            return "true"

-        else:

-            return "false"

-            

-    def cleanup_ves_events(self):

-        if DcaeVariables.HttpServerThread != None:

-            DMaaP.cleanUpEvent()

-            logger.console("DMaaP event queue is cleaned up")

-            return "true"

-        logger.console("DMaaP server not started yet")

-        return "false"

-                   

-    def dmaap_message_receive(self, evtobj, action='contain'):

-        

-        evtStr = DMaaP.dequeEvent()

-        while evtStr != None:

-            logger.console("DMaaP receive VES Event:\n" + evtStr)

-            if action == 'contain':

-                if evtobj in evtStr:

-                    logger.info("DMaaP Receive Expected Publish Event:\n" + evtStr)

-                    return 'true'

-            if action == 'sizematch':

-                if len(evtobj) == len(evtStr):

-                    return 'true'

-            if action == 'dictmatch':

-                evtDict = json.loads(evtStr)

-                if cmp(evtobj, evtDict) == 0:

-                    return 'true'

-            evtStr = DMaaP.dequeEvent()

-        return 'false'

-    

-    def create_header_from_string(self, dictStr):

-        logger.info("Enter create_header_from_string: dictStr")

-        return dict(u.split("=") for u in dictStr.split(","))

-    

-    def is_json_empty(self, resp):

-        logger.info("Enter is_json_empty: resp.text: " + resp.text)

-        if resp.text == None or len(resp.text) < 2:

-            return 'True'

-        return 'False'

-    

-    def Generate_UUID(self):

-        """generate a uuid"""

-        return uuid.uuid4()

-    

-    def get_json_value_list(self, jsonstr, keyval):

-        logger.info("Enter Get_Json_Key_Value_List")

-        if jsonstr == None or len(jsonstr) < 2:

-            logger.info("No Json data found")

-            return []

-        try:

-            data = json.loads(jsonstr)   

-            nodelist = []

-            for item in data:

-                nodelist.append(item[keyval])

-            return nodelist

-        except Exception as e:

-            logger.info("Json data parsing fails")

-            print str(e)

-            return []

-        

-    def generate_MilliTimestamp_UUID(self):

-        """generate a millisecond timestamp uuid"""

-        then = datetime.datetime.now()

-        return int(time.mktime(then.timetuple())*1e3 + then.microsecond/1e3)

-    

-    def test (self):

-        import json

-        from pprint import pprint

-

-        with open('robot/assets/dcae/ves_volte_single_fault_event.json') as data_file:    

-            data = json.load(data_file)

-

-        data['event']['commonEventHeader']['version'] = '5.0'

-        pprint(data)

-

-

-

-if __name__ == '__main__':

-    '''

-    dictStr = "action=getTable,Accept=application/json,Content-Type=application/json,X-FromAppId=1234908903284"

-    cls = DcaeLibrary()

-    #dict = cls.create_header_from_string(dictStr)

-    #print str(dict)

-    jsonStr = "[{'Node': 'onapfcnsl00', 'CheckID': 'serfHealth', 'Name': 'Serf Health Status', 'ServiceName': '', 'Notes': '', 'ModifyIndex': 6, 'Status': 'passing', 'ServiceID': '', 'ServiceTags': [], 'Output': 'Agent alive and reachable', 'CreateIndex': 6}]"

-    lsObj = cls.get_json_value_list(jsonStr, 'Status')

-    print lsObj

-    '''

-    

-    lib = DcaeLibrary()

-    ret = lib.setup_dmaap_server()

-    print ret

-    time.sleep(10000000000)

-    
\ No newline at end of file
diff --git a/test/csit/tests/dcae/testcases/resources/DcaeVariables.py b/test/csit/tests/dcae/testcases/resources/DcaeVariables.py
deleted file mode 100644
index e2f1867e1..000000000
--- a/test/csit/tests/dcae/testcases/resources/DcaeVariables.py
+++ /dev/null
@@ -1,16 +0,0 @@
-
-import os, time
-
-def GetEnvironmentVariable(envVarstr):
-    return os.environ.get(envVarstr)
-
-DCAE_HEALTH_CHECK_URL = "http://135.205.228.129:8500"
-DCAE_HEALTH_CHECK_URL1 = "http://135.205.228.170:8500"
-
-CommonEventSchemaV5  = GetEnvironmentVariable('WORKSPACE') + "/test/csit/tests/dcae/testcases/assets/json_events/CommonEventFormat_28.3.json"
-
-HttpServerThread = None
-HTTPD = None
-VESEventQ = None
-IsRobotRun = False
-
diff --git a/test/csit/tests/dcae/testcases/resources/VES-4.27.2-dataformat.json b/test/csit/tests/dcae/testcases/resources/VES-4.27.2-dataformat.json
deleted file mode 100644
index d4e3e4944..000000000
--- a/test/csit/tests/dcae/testcases/resources/VES-4.27.2-dataformat.json
+++ /dev/null
@@ -1,1176 +0,0 @@
-{

-       "self": {

-                "name": "VES_specification",

-                "version": "4.27.2",

-                "description": "VES spec from v4.1 and 27.2 spec"

-

-        },

-	"dataformatversion": "1.0.0",

-	"jsonschema":

-		{

-		    "$schema": "http://json-schema.org/draft-04/schema#",

-

-			"definitions": {

-				"attCopyrightNotice": {

-					"description": "Copyright (c) <2016>, AT&T Intellectual Property.  All other rights reserved",

-					"type": "object",

-					"properties": {

-						"useAndRedistribution": {

-							"description": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:",

-							"type": "string"

-						},

-						"condition1": {

-							"description": "Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.",

-							"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": "All advertising materials mentioning features or use of this software must display the following acknowledgement:  This product includes software developed by the AT&T.",

-							"type": "string"

-						},

-						"condition4": {

-							"description": "Neither the name of AT&T nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.",

-							"type": "string"

-						},

-						"disclaimerLine1": {

-							"description": "THIS SOFTWARE IS PROVIDED BY AT&T INTELLECTUAL PROPERTY AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS",

-							"type": "string"

-						},

-						"disclaimerLine2": {

-							"description": "FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AT&T INTELLECTUAL PROPERTY BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES",

-							"type": "string"

-						},

-						"disclaimerLine3": {

-							"description": "(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,",

-							"type": "string"

-						},

-						"disclaimerLine4": {

-							"description": "WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",

-							"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" ]

-				},

-				"command": {

-					"description": "command from an event collector toward an event source",

-					"type": "object",

-					"properties": {

-						"commandType": {

-							"type": "string",

-							"enum": [

-								"heartbeatIntervalChange",

-								"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",

-								"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"

-						},

-						"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"

-						},

-						"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; must be populated by the ATT enrichment process",

-							"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; must be populated by the ATT enrichment process",

-							"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": "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",

-							"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",

-				    "items": {

-								"type": "array",

-								"items": [

-									{ "type": "string" },

-									{ "type": "number" }

-								]

-							}

-						},

-						"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",

-				    "items": {

-								"type": "array",

-								"items": [

-									{ "type": "string" },

-									{ "type": "number" }

-								]

-							}

-						},

-						"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",

-				    "items": {

-								"type": "array",

-								"items": [

-									{ "type": "string" },

-									{ "type": "number" }

-								]

-							}

-						},

-						"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"

-					]

-				},

-				"internalHeaderFields": {

-					"description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",

-					"type": "object"

-				},

-				"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 in MB configured in the VM on which the VNFC reporting the event is running",

-							"type": "number"

-						},

-						"memoryUsed": {

-							"description": "memory usage in MB 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": {

-						"additionalFields": {

-							"description": "additional mobileFlow fields if needed",

-							"type": "array",

-							"items": {

-								"$ref": "#/definitions/field"

-							}

-						},

-						"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" ]

-				},

-				"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"

-						},

-						"syslogPri": {

-							"description": "0-192 combined severity and facility",

-							"type": "number"

-						},

-						"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"

-						},

-						"syslogSdId": {

-							"description": "0-32 char in format name@number for example ourSDID@32473",

-							"type": "string"

-						},

-						"syslogSev": {

-							"description": "numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8",

-							"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"}

-		    }

-		}

-	

-}
\ No newline at end of file
diff --git a/test/csit/tests/dcae/testcases/resources/VES-5.28.3-dataformat.json b/test/csit/tests/dcae/testcases/resources/VES-5.28.3-dataformat.json
deleted file mode 100644
index 766323368..000000000
--- a/test/csit/tests/dcae/testcases/resources/VES-5.28.3-dataformat.json
+++ /dev/null
@@ -1,2105 +0,0 @@
-{
-	"self": {
-		"name": "VES_specification",
-		"version": "5.28.3",
-		"description": "VES spec for 5.3"
-	},
-	"dataformatversion": "1.0.0",
-	"jsonschema": {
-		"$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": "integer"
-					}
-				},
-				"required": [
-					"codecIdentifier",
-					"numberInUse"
-				]
-			},
-			"command": {
-				"description": "command from an event collector toward an event source",
-				"type": "object",
-				"properties": {
-					"commandType": {
-						"type": "string",
-						"enum": [
-							"heartbeatIntervalChange",
-							"measurementIntervalChange",
-							"provideThrottlingState",
-							"throttlingSpecification"
-						]
-					},
-					"eventDomainThrottleSpecification": {
-						"$ref": "#/definitions/eventDomainThrottleSpecification"
-					},
-					"heartbeatInterval": {
-						"type": "integer"
-					},
-					"measurementInterval": {
-						"type": "integer"
-					}
-				},
-				"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",
-							"sipSignaling",
-							"stateChange",
-							"syslog",
-							"thresholdCrossingAlert",
-							"voiceQuality"
-						]
-					},
-					"eventId": {
-						"description": "event key that is unique to the event source",
-						"type": "string"
-					},
-					"eventName": {
-						"description": "unique event name",
-						"type": "string"
-					},
-					"eventType": {
-						"description": "for example - applicationVnf, guestOS, hostOS, platform",
-						"type": "string"
-					},
-					"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"
-					},
-					"nfcNamingCode": {
-						"description": "3 character network function component type, aligned with vfc naming standards",
-						"type": "string"
-					},
-					"nfNamingCode": {
-						"description": "4 character network function type, aligned with vnf naming standards",
-						"type": "string"
-					},
-					"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; must be populated by the ATT enrichment process",
-						"type": "string"
-					},
-					"reportingEntityName": {
-						"description": "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName",
-						"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; must be populated by the ATT enrichment process",
-						"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",
-					"eventName",
-					"lastEpochMicrosec",
-					"priority",
-					"reportingEntityName",
-					"sequence",
-					"sourceName",
-					"startEpochMicrosec",
-					"version"
-				]
-			},
-			"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": "usage of an identified CPU",
-				"type": "object",
-				"properties": {
-					"cpuIdentifier": {
-						"description": "cpu identifer",
-						"type": "string"
-					},
-					"cpuIdle": {
-						"description": "percentage of CPU time spent in the idle task",
-						"type": "number"
-					},
-					"cpuUsageInterrupt": {
-						"description": "percentage of time spent servicing interrupts",
-						"type": "number"
-					},
-					"cpuUsageNice": {
-						"description": "percentage of time spent running user space processes that have been niced",
-						"type": "number"
-					},
-					"cpuUsageSoftIrq": {
-						"description": "percentage of time spent handling soft irq interrupts",
-						"type": "number"
-					},
-					"cpuUsageSteal": {
-						"description": "percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing",
-						"type": "number"
-					},
-					"cpuUsageSystem": {
-						"description": "percentage of time spent on system tasks running the kernel",
-						"type": "number"
-					},
-					"cpuUsageUser": {
-						"description": "percentage of time spent running un-niced user space processes",
-						"type": "number"
-					},
-					"cpuWait": {
-						"description": "percentage of CPU time spent waiting for I/O operations to complete",
-						"type": "number"
-					},
-					"percentUsage": {
-						"description": "aggregate cpu usage of the virtual machine on which the VNFC reporting the event is running",
-						"type": "number"
-					}
-				},
-				"required": [
-					"cpuIdentifier",
-					"percentUsage"
-				]
-			},
-			"diskUsage": {
-				"description": "usage of an identified disk",
-				"type": "object",
-				"properties": {
-					"diskIdentifier": {
-						"description": "disk identifier",
-						"type": "string"
-					},
-					"diskIoTimeAvg": {
-						"description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval",
-						"type": "number"
-					},
-					"diskIoTimeLast": {
-						"description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskIoTimeMax": {
-						"description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskIoTimeMin": {
-						"description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskMergedReadAvg": {
-						"description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskMergedReadLast": {
-						"description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskMergedReadMax": {
-						"description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskMergedReadMin": {
-						"description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskMergedWriteAvg": {
-						"description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskMergedWriteLast": {
-						"description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskMergedWriteMax": {
-						"description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskMergedWriteMin": {
-						"description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOctetsReadAvg": {
-						"description": "number of octets per second read from a disk or partition; provide the average measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOctetsReadLast": {
-						"description": "number of octets per second read from a disk or partition; provide the last measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOctetsReadMax": {
-						"description": "number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOctetsReadMin": {
-						"description": "number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOctetsWriteAvg": {
-						"description": "number of octets per second written to a disk or partition; provide the average measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOctetsWriteLast": {
-						"description": "number of octets per second written to a disk or partition; provide the last measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOctetsWriteMax": {
-						"description": "number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOctetsWriteMin": {
-						"description": "number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOpsReadAvg": {
-						"description": "number of read operations per second issued to the disk; provide the average measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOpsReadLast": {
-						"description": "number of read operations per second issued to the disk; provide the last measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOpsReadMax": {
-						"description": "number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOpsReadMin": {
-						"description": "number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOpsWriteAvg": {
-						"description": "number of write operations per second issued to the disk; provide the average measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOpsWriteLast": {
-						"description": "number of write operations per second issued to the disk; provide the last measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOpsWriteMax": {
-						"description": "number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskOpsWriteMin": {
-						"description": "number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskPendingOperationsAvg": {
-						"description": "queue size of pending I/O operations per second; provide the average measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskPendingOperationsLast": {
-						"description": "queue size of pending I/O operations per second; provide the last measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskPendingOperationsMax": {
-						"description": "queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskPendingOperationsMin": {
-						"description": "queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskTimeReadAvg": {
-						"description": "milliseconds a read operation took to complete; provide the average measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskTimeReadLast": {
-						"description": "milliseconds a read operation took to complete; provide the last measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskTimeReadMax": {
-						"description": "milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskTimeReadMin": {
-						"description": "milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskTimeWriteAvg": {
-						"description": "milliseconds a write operation took to complete; provide the average measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskTimeWriteLast": {
-						"description": "milliseconds a write operation took to complete; provide the last measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskTimeWriteMax": {
-						"description": "milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval",
-						"type": "number"
-					},
-					"diskTimeWriteMin": {
-						"description": "milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval",
-						"type": "number"
-					}
-				},
-				"required": [
-					"diskIdentifier"
-				]
-			},
-			"endOfCallVqmSummaries": {
-				"description": "provides end of call voice quality metrics",
-				"type": "object",
-				"properties": {
-					"adjacencyName": {
-						"description": " adjacency name",
-						"type": "string"
-					},
-					"endpointDescription": {
-						"description": "Either Caller or 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"
-					}
-				},
-				"required": [
-					"adjacencyName",
-					"endpointDescription"
-				]
-			},
-			"event": {
-				"description": "the root level of the common event format",
-				"type": "object",
-				"properties": {
-					"commonEventHeader": {
-						"$ref": "#/definitions/commonEventHeader"
-					},
-					"faultFields": {
-						"$ref": "#/definitions/faultFields"
-					},
-					"heartbeatFields": {
-						"$ref": "#/definitions/heartbeatFields"
-					},
-					"measurementsForVfScalingFields": {
-						"$ref": "#/definitions/measurementsForVfScalingFields"
-					},
-					"mobileFlowFields": {
-						"$ref": "#/definitions/mobileFlowFields"
-					},
-					"otherFields": {
-						"$ref": "#/definitions/otherFields"
-					},
-					"sipSignalingFields": {
-						"$ref": "#/definitions/sipSignalingFields"
-					},
-					"stateChangeFields": {
-						"$ref": "#/definitions/stateChangeFields"
-					},
-					"syslogFields": {
-						"$ref": "#/definitions/syslogFields"
-					},
-					"thresholdCrossingAlertFields": {
-						"$ref": "#/definitions/thresholdCrossingAlertFields"
-					},
-					"voiceQualityFields": {
-						"$ref": "#/definitions/voiceQualityFields"
-					}
-				},
-				"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"
-					},
-					"eventCategory": {
-						"description": "Event category, for example: license, link, routing, security, signaling",
-						"type": "string"
-					},
-					"eventSeverity": {
-						"description": "event severity",
-						"type": "string",
-						"enum": [
-							"CRITICAL",
-							"MAJOR",
-							"MINOR",
-							"WARNING",
-							"NORMAL"
-						]
-					},
-					"eventSourceType": {
-						"description": "type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, 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",
-					"faultFieldsVersion",
-					"specificProblem",
-					"vfStatus"
-				]
-			},
-			"featuresInUse": {
-				"description": "number of times an identified feature was used over the measurementInterval",
-				"type": "object",
-				"properties": {
-					"featureIdentifier": {
-						"type": "string"
-					},
-					"featureUtilization": {
-						"type": "integer"
-					}
-				},
-				"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",
-						"items": {
-							"type": "array",
-							"items": [
-								{
-									"type": "string"
-								},
-								{
-									"type": "number"
-								}
-							]
-						}
-					},
-					"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",
-						"items": {
-							"type": "array",
-							"items": [
-								{
-									"type": "string"
-								},
-								{
-									"type": "number"
-								}
-							]
-						}
-					},
-					"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",
-						"items": {
-							"type": "array",
-							"items": [
-								{
-									"type": "string"
-								},
-								{
-									"type": "number"
-								}
-							]
-						}
-					},
-					"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"
-				]
-			},
-			"heartbeatFields": {
-				"description": "optional field block for fields specific to heartbeat events",
-				"type": "object",
-				"properties": {
-					"additionalFields": {
-						"description": "additional heartbeat fields if needed",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/field"
-						}
-					},
-					"heartbeatFieldsVersion": {
-						"description": "version of the heartbeatFields block",
-						"type": "number"
-					},
-					"heartbeatInterval": {
-						"description": "current heartbeat interval in seconds",
-						"type": "integer"
-					}
-				},
-				"required": [
-					"heartbeatFieldsVersion",
-					"heartbeatInterval"
-				]
-			},
-			"internalHeaderFields": {
-				"description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",
-				"type": "object"
-			},
-			"jsonObject": {
-				"description": "json object schema, name and other meta-information along with one or more object instances",
-				"type": "object",
-				"properties": {
-					"objectInstances": {
-						"description": "one or more instances of the jsonObject",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/jsonObjectInstance"
-						}
-					},
-					"objectName": {
-						"description": "name of the JSON Object",
-						"type": "string"
-					},
-					"objectSchema": {
-						"description": "json schema for the object",
-						"type": "string"
-					},
-					"objectSchemaUrl": {
-						"description": "Url to the json schema for the object",
-						"type": "string"
-					},
-					"nfSubscribedObjectName": {
-						"description": "name of the object associated with the nfSubscriptonId",
-						"type": "string"
-					},
-					"nfSubscriptionId": {
-						"description": "identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject",
-						"type": "string"
-					}
-				},
-				"required": [
-					"objectInstances",
-					"objectName"
-				]
-			},
-			"jsonObjectInstance": {
-				"description": "meta-information about an instance of a jsonObject along with the actual object instance",
-				"type": "object",
-				"properties": {
-					"objectInstance": {
-						"description": "an instance conforming to the jsonObject schema",
-						"type": "object"
-					},
-					"objectInstanceEpochMicrosec": {
-						"description": "the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
-						"type": "number"
-					},
-					"objectKeys": {
-						"description": "an ordered set of keys that identifies this particular instance of jsonObject",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/key"
-						}
-					}
-				},
-				"required": [
-					"objectInstance"
-				]
-			},
-			"key": {
-				"description": "tuple which provides the name of a key along with its value and relative order",
-				"type": "object",
-				"properties": {
-					"keyName": {
-						"description": "name of the key",
-						"type": "string"
-					},
-					"keyOrder": {
-						"description": "relative sequence or order of the key with respect to other keys",
-						"type": "integer"
-					},
-					"keyValue": {
-						"description": "value of the key",
-						"type": "string"
-					}
-				},
-				"required": [
-					"keyName"
-				]
-			},
-			"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"
-				]
-			},
-			"measurementsForVfScalingFields": {
-				"description": "measurementsForVfScaling fields",
-				"type": "object",
-				"properties": {
-					"additionalFields": {
-						"description": "additional name-value-pair fields",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/field"
-						}
-					},
-					"additionalMeasurements": {
-						"description": "array of named name-value-pair arrays",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/namedArrayOfFields"
-						}
-					},
-					"additionalObjects": {
-						"description": "array of JSON objects described by name, schema and other meta-information",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/jsonObject"
-						}
-					},
-					"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": "integer"
-					},
-					"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": "integer"
-					},
-					"cpuUsageArray": {
-						"description": "usage of an array of CPUs",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/cpuUsage"
-						}
-					},
-					"diskUsageArray": {
-						"description": "usage of an array of disks",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/diskUsage"
-						}
-					},
-					"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"
-					},
-					"memoryUsageArray": {
-						"description": "memory usage of an array of VMs",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/memoryUsage"
-						}
-					},
-					"numberOfMediaPortsInUse": {
-						"description": "number of media ports in use",
-						"type": "integer"
-					},
-					"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": "integer"
-					},
-					"vNicPerformanceArray": {
-						"description": "usage of an array of virtual network interface cards",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/vNicPerformance"
-						}
-					}
-				},
-				"required": [
-					"measurementInterval",
-					"measurementsForVfScalingVersion"
-				]
-			},
-			"memoryUsage": {
-				"description": "memory usage of an identified virtual machine",
-				"type": "object",
-				"properties": {
-					"memoryBuffered": {
-						"description": "kibibytes of temporary storage for raw disk blocks",
-						"type": "number"
-					},
-					"memoryCached": {
-						"description": "kibibytes of memory used for cache",
-						"type": "number"
-					},
-					"memoryConfigured": {
-						"description": "kibibytes of memory configured in the virtual machine on which the VNFC reporting the event is running",
-						"type": "number"
-					},
-					"memoryFree": {
-						"description": "kibibytes of physical RAM left unused by the system",
-						"type": "number"
-					},
-					"memorySlabRecl": {
-						"description": "the part of the slab that can be reclaimed such as caches measured in kibibytes",
-						"type": "number"
-					},
-					"memorySlabUnrecl": {
-						"description": "the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes",
-						"type": "number"
-					},
-					"memoryUsed": {
-						"description": "total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes",
-						"type": "number"
-					},
-					"vmIdentifier": {
-						"description": "virtual machine identifier associated with the memory metrics",
-						"type": "string"
-					}
-				},
-				"required": [
-					"memoryFree",
-					"memoryUsed",
-					"vmIdentifier"
-				]
-			},
-			"mobileFlowFields": {
-				"description": "mobileFlow fields",
-				"type": "object",
-				"properties": {
-					"additionalFields": {
-						"description": "additional mobileFlow fields if needed",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/field"
-						}
-					},
-					"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": "integer"
-					},
-					"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": "integer"
-					},
-					"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": "integer"
-					},
-					"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",
-					"mobileFlowFieldsVersion",
-					"otherEndpointIpAddress",
-					"otherEndpointPort",
-					"reportingEndpointIpAddr",
-					"reportingEndpointPort"
-				]
-			},
-			"namedArrayOfFields": {
-				"description": "an array of name value pairs along with a name for the array",
-				"type": "object",
-				"properties": {
-					"name": {
-						"type": "string"
-					},
-					"arrayOfFields": {
-						"description": "array of name value pairs",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/field"
-						}
-					}
-				},
-				"required": [
-					"name",
-					"arrayOfFields"
-				]
-			},
-			"otherFields": {
-				"description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
-				"type": "object",
-				"properties": {
-					"hashOfNameValuePairArrays": {
-						"description": "array of named name-value-pair arrays",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/namedArrayOfFields"
-						}
-					},
-					"jsonObjects": {
-						"description": "array of JSON objects described by name, schema and other meta-information",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/jsonObject"
-						}
-					},
-					"nameValuePairs": {
-						"description": "array of name-value pairs",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/field"
-						}
-					},
-					"otherFieldsVersion": {
-						"description": "version of the otherFields block",
-						"type": "number"
-					}
-				},
-				"required": [
-					"otherFieldsVersion"
-				]
-			},
-			"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"
-				]
-			},
-			"sipSignalingFields": {
-				"description": "sip signaling fields",
-				"type": "object",
-				"properties": {
-					"additionalInformation": {
-						"description": "additional sip signaling fields if needed",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/field"
-						}
-					},
-					"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"
-					},
-					"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"
-					},
-					"sipSignalingFieldsVersion": {
-						"description": "version of the sipSignalingFields block",
-						"type": "number"
-					},
-					"summarySip": {
-						"description": "the SIP Method or Response (‘INVITE’, ‘200 OK’, ‘BYE’, etc)",
-						"type": "string"
-					},
-					"vendorVnfNameFields": {
-						"$ref": "#/definitions/vendorVnfNameFields"
-					}
-				},
-				"required": [
-					"correlator",
-					"localIpAddress",
-					"localPort",
-					"remoteIpAddress",
-					"remotePort",
-					"sipSignalingFieldsVersion",
-					"vendorVnfNameFields"
-				]
-			},
-			"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",
-					"stateChangeFieldsVersion",
-					"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 provided as name=value delimited by a pipe ‘|’ symbol, for example: 'name1=value1|name2=value2|…'",
-						"type": "string"
-					},
-					"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": "integer"
-					},
-					"syslogFieldsVersion": {
-						"description": "version of the syslogFields block",
-						"type": "number"
-					},
-					"syslogMsg": {
-						"description": "syslog message",
-						"type": "string"
-					},
-					"syslogPri": {
-						"description": "0-192 combined severity and facility",
-						"type": "integer"
-					},
-					"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"
-					},
-					"syslogSdId": {
-						"description": "0-32 char in format name@number for example ourSDID@32473",
-						"type": "string"
-					},
-					"syslogSev": {
-						"description": "numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8",
-						"type": "string",
-						"enum": [
-							"Alert",
-							"Critical",
-							"Debug",
-							"Emergency",
-							"Error",
-							"Info",
-							"Notice",
-							"Warning"
-						]
-					},
-					"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",
-					"syslogFieldsVersion",
-					"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",
-					"thresholdCrossingFieldsVersion"
-				]
-			},
-			"vendorVnfNameFields": {
-				"description": "provides vendor, vnf and vfModule identifying information",
-				"type": "object",
-				"properties": {
-					"vendorName": {
-						"description": "VNF vendor name",
-						"type": "string"
-					},
-					"vfModuleName": {
-						"description": "ASDC vfModuleName for the vfModule generating the event",
-						"type": "string"
-					},
-					"vnfName": {
-						"description": "ASDC modelName for the VNF generating the event",
-						"type": "string"
-					}
-				},
-				"required": [
-					"vendorName"
-				]
-			},
-			"vNicPerformance": {
-				"description": "describes the performance and errors of an identified virtual network interface card",
-				"type": "object",
-				"properties": {
-					"receivedBroadcastPacketsAccumulated": {
-						"description": "Cumulative count of broadcast packets received as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"receivedBroadcastPacketsDelta": {
-						"description": "Count of broadcast packets received within the measurement interval",
-						"type": "number"
-					},
-					"receivedDiscardedPacketsAccumulated": {
-						"description": "Cumulative count of discarded packets received as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"receivedDiscardedPacketsDelta": {
-						"description": "Count of discarded packets received within the measurement interval",
-						"type": "number"
-					},
-					"receivedErrorPacketsAccumulated": {
-						"description": "Cumulative count of error packets received as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"receivedErrorPacketsDelta": {
-						"description": "Count of error packets received within the measurement interval",
-						"type": "number"
-					},
-					"receivedMulticastPacketsAccumulated": {
-						"description": "Cumulative count of multicast packets received as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"receivedMulticastPacketsDelta": {
-						"description": "Count of multicast packets received within the measurement interval",
-						"type": "number"
-					},
-					"receivedOctetsAccumulated": {
-						"description": "Cumulative count of octets received as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"receivedOctetsDelta": {
-						"description": "Count of octets received within the measurement interval",
-						"type": "number"
-					},
-					"receivedTotalPacketsAccumulated": {
-						"description": "Cumulative count of all packets received as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"receivedTotalPacketsDelta": {
-						"description": "Count of all packets received within the measurement interval",
-						"type": "number"
-					},
-					"receivedUnicastPacketsAccumulated": {
-						"description": "Cumulative count of unicast packets received as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"receivedUnicastPacketsDelta": {
-						"description": "Count of unicast packets received within the measurement interval",
-						"type": "number"
-					},
-					"transmittedBroadcastPacketsAccumulated": {
-						"description": "Cumulative count of broadcast packets transmitted as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"transmittedBroadcastPacketsDelta": {
-						"description": "Count of broadcast packets transmitted within the measurement interval",
-						"type": "number"
-					},
-					"transmittedDiscardedPacketsAccumulated": {
-						"description": "Cumulative count of discarded packets transmitted as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"transmittedDiscardedPacketsDelta": {
-						"description": "Count of discarded packets transmitted within the measurement interval",
-						"type": "number"
-					},
-					"transmittedErrorPacketsAccumulated": {
-						"description": "Cumulative count of error packets transmitted as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"transmittedErrorPacketsDelta": {
-						"description": "Count of error packets transmitted within the measurement interval",
-						"type": "number"
-					},
-					"transmittedMulticastPacketsAccumulated": {
-						"description": "Cumulative count of multicast packets transmitted as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"transmittedMulticastPacketsDelta": {
-						"description": "Count of multicast packets transmitted within the measurement interval",
-						"type": "number"
-					},
-					"transmittedOctetsAccumulated": {
-						"description": "Cumulative count of octets transmitted as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"transmittedOctetsDelta": {
-						"description": "Count of octets transmitted within the measurement interval",
-						"type": "number"
-					},
-					"transmittedTotalPacketsAccumulated": {
-						"description": "Cumulative count of all packets transmitted as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"transmittedTotalPacketsDelta": {
-						"description": "Count of all packets transmitted within the measurement interval",
-						"type": "number"
-					},
-					"transmittedUnicastPacketsAccumulated": {
-						"description": "Cumulative count of unicast packets transmitted as read at the end of the measurement interval",
-						"type": "number"
-					},
-					"transmittedUnicastPacketsDelta": {
-						"description": "Count of unicast packets transmitted within the measurement interval",
-						"type": "number"
-					},
-					"valuesAreSuspect": {
-						"description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions",
-						"type": "string",
-						"enum": [
-							"true",
-							"false"
-						]
-					},
-					"vNicIdentifier": {
-						"description": "vNic identification",
-						"type": "string"
-					}
-				},
-				"required": [
-					"valuesAreSuspect",
-					"vNicIdentifier"
-				]
-			},
-			"voiceQualityFields": {
-				"description": "provides statistics related to customer facing voice products",
-				"type": "object",
-				"properties": {
-					"additionalInformation": {
-						"description": "additional voice quality fields if needed",
-						"type": "array",
-						"items": {
-							"$ref": "#/definitions/field"
-						}
-					},
-					"calleeSideCodec": {
-						"description": "callee codec for the call",
-						"type": "string"
-					},
-					"callerSideCodec": {
-						"description": "caller codec for the call",
-						"type": "string"
-					},
-					"correlator": {
-						"description": "this is the same for all events on this call",
-						"type": "string"
-					},
-					"endOfCallVqmSummaries": {
-						"$ref": "#/definitions/endOfCallVqmSummaries"
-					},
-					"phoneNumber": {
-						"description": "phone number associated with the correlator",
-						"type": "string"
-					},
-					"midCallRtcp": {
-						"description": "Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers",
-						"type": "string"
-					},
-					"vendorVnfNameFields": {
-						"$ref": "#/definitions/vendorVnfNameFields"
-					},
-					"voiceQualityFieldsVersion": {
-						"description": "version of the voiceQualityFields block",
-						"type": "number"
-					}
-				},
-				"required": [
-					"calleeSideCodec",
-					"callerSideCodec",
-					"correlator",
-					"midCallRtcp",
-					"vendorVnfNameFields",
-					"voiceQualityFieldsVersion"
-				]
-			}
-		},
-		"title": "Event Listener",
-		"type": "object",
-		"properties": {
-			"event": {
-				"$ref": "#/definitions/event"
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/csit/tests/dcae/testcases/resources/dcae_keywords.robot b/test/csit/tests/dcae/testcases/resources/dcae_keywords.robot
deleted file mode 100644
index a30a1ba01..000000000
--- a/test/csit/tests/dcae/testcases/resources/dcae_keywords.robot
+++ /dev/null
@@ -1,161 +0,0 @@
- *** Settings ***

-Documentation     The main interface for interacting with DCAE. It handles low level stuff like managing the http request library and DCAE required fields

-Library 	      RequestsLibrary

-Library	          DcaeLibrary.py   

-Library           OperatingSystem

-Library           Collections

-Variables         ../resources/DcaeVariables.py

-Resource          ../resources/dcae_properties.robot

-

-

-*** Variables ***

-${DCAE_HEALTH_CHECK_BODY}    %{WORKSPACE}/test/csit/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json

-

-*** Keywords ***

-Get DCAE Nodes

-    [Documentation]    Get DCAE Nodes from Consul Catalog

-    #Log    Creating session   ${GLOBAL_DCAE_CONSUL_URL}

-    ${session}=    Create Session 	dcae 	${GLOBAL_DCAE_CONSUL_URL}

-    ${uuid}=    Generate UUID

-    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json  X-Consul-Token=abcd1234  X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}

-    ${resp}= 	Get Request 	dcae 	/v1/catalog/nodes        headers=${headers}

-    Log    Received response from dcae consul: ${resp.json()}

-    Should Be Equal As Strings 	${resp.status_code} 	200

-    ${NodeList}=   Get Json Value List   ${resp.text}   Node

-    ${NodeListLength}=  Get Length  ${NodeList}  

-    ${len}=  Get Length   ${NodeList}   

-    Should Not Be Equal As Integers   ${len}   0

-    [return]    ${NodeList}

-

-

-DCAE Node Health Check

-    [Documentation]    Perform DCAE Node Health Check

-    [Arguments]    ${NodeName}

-    ${session}=    Create Session 	dcae-${NodeName} 	${GLOBAL_DCAE_CONSUL_URL}

-    ${uuid}=    Generate UUID

-    ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json  X-Consul-Token=abcd1234  X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}

-    ${hcpath}=   Catenate  SEPARATOR=    /v1/health/node/    ${NodeName}

-    ${resp}= 	Get Request 	dcae-${NodeName} 	${hcpath}        headers=${headers}

-    Log    Received response from dcae consul: ${resp.json()}

-    Should Be Equal As Strings 	${resp.status_code} 	200

-    ${StatusList}=  Get Json Value List   ${resp.text}    Status

-    ${len}=  Get Length  ${StatusList}

-    Should Not Be Equal As Integers   ${len}   0

-    DCAE Check Health Status    ${NodeName}   ${StatusList[0]}    Serf Health Status

-    #Run Keyword if  ${len} > 1  DCAE Check Health Status  ${NodeName}  ${StatusList[1]}  Serf Health Status

-    

-    

-DCAE Check Health Status

-    [Arguments]    ${NodeName}    ${ItemStatus}   ${CheckType}

-    Should Be Equal As Strings    ${ItemStatus}    passing   

-    Log   Node: ${NodeName} ${CheckType} check pass ok

-    

-VES Collector Suite Setup DMaaP

-    [Documentation]   Start DMaaP Mockup Server

-    ${ret}=  Setup DMaaP Server

-    Should Be Equal As Strings     ${ret}    true

-    

-VES Collector Suite Shutdown DMaaP

-    [Documentation]   Shutdown DMaaP Mockup Server

-    ${ret}=  Shutdown DMaap

-    Should Be Equal As Strings     ${ret}    true

-

-    

-

-    

-Check DCAE Results

-    [Documentation]    Parse DCAE JSON response and make sure all rows have healthTestStatus=GREEN

-    [Arguments]    ${json}

-    @{rows}=    Get From Dictionary    ${json['returns']}    rows

-    @{headers}=    Get From Dictionary    ${json['returns']}    columns

-    

-    # Retrieve column names from headers

-    ${columns}=    Create List

-    :for    ${header}    in    @{headers}

-    \    ${colName}=    Get From Dictionary    ${header}    colName 

-    \    Append To List    ${columns}    ${colName}

-    

-    # Process each row making sure status=GREEN          

-    :for    ${row}    in    @{rows}

-    \    ${cells}=    Get From Dictionary    ${row}    cells

-    \    ${dict}=    Make A Dictionary    ${cells}    ${columns} 

-    \    Dictionary Should Contain Item    ${dict}    healthTestStatus    GREEN

-

-        

-Make A Dictionary

-    [Documentation]    Given a list of column names and a list of dictionaries, map columname=value

-    [Arguments]     ${columns}    ${names}    ${valuename}=value

-    ${dict}=    Create Dictionary

-    ${collength}=    Get Length    ${columns} 

-    ${namelength}=    Get Length    ${names} 

-    :for    ${index}    in range    0   ${collength}

-    \    ${name}=    Evaluate     ${names}[${index}]

-    \    ${valued}=    Evaluate     ${columns}[${index}]

-    \    ${value}=    Get From Dictionary    ${valued}    ${valueName}

-    \    Set To Dictionary    ${dict}   ${name}    ${value}     

-    [Return]     ${dict}

-    

-

-Get Event Data From File

-    [Arguments]    ${jsonfile}

-    ${data}=    OperatingSystem.Get File    ${jsonfile}

-    #Should Not Be_Equal    ${data}    None

-    [return]    ${data}

-

-Json String To Dictionary

-    [Arguments]  ${json_string}   

-    ${json_dict}=  evaluate    json.loads('''${json_string}''')    json

-    [return]   ${json_dict}

-

-Dictionary To Json String

-    [Arguments]  ${json_dict}

-    ${json_string}=    evaluate    json.dumps(${json_dict})    json

-    [return]    ${json_string}

-

-

-Get DCAE Service Component Status

-    [Documentation]   Get the status of a DCAE Service Component

-    [Arguments]    ${url}    ${urlpath}     ${usr}    ${passwd}    

-    ${auth}=  Create List  ${usr}  ${passwd}

-    ${session}=    Create Session 	dcae-service-component 	${url}    auth=${auth}

-    ${resp}= 	Get Request 	dcae-service-component 	${urlpath}

-    [return]    ${resp}

-    

-Publish Event To VES Collector No Auth

-    [Documentation]    Send an event to VES Collector

-    [Arguments]     ${url}  ${evtpath}   ${httpheaders}    ${evtdata}

-    Log    Creating session ${url}

-    ${session}=    Create Session 	dcae-d1 	${url}

-    ${resp}= 	Post Request 	dcae-d1 	${evtpath}     data=${evtdata}   headers=${httpheaders}

-    #Log    Received response from dcae ${resp.json()}

-    [return] 	${resp}

-

-Publish Event To VES Collector

-    [Documentation]    Send an event to VES Collector

-    [Arguments]     ${url}  ${evtpath}   ${httpheaders}    ${evtdata}   ${user}  ${pd}

-    ${auth}=  Create List  ${user}   ${pd}

-    Log    Creating session ${url}

-    ${session}=    Create Session 	dcae-d1 	${url}    auth=${auth}

-    ${resp}= 	Post Request 	dcae-d1 	${evtpath}     data=${evtdata}   headers=${httpheaders}

-    #Log    Received response from dcae ${resp.json()}

-    [return] 	${resp}

-    

-Publish Event To VES Collector With Put Method

-    [Documentation]    Send an event to VES Collector

-    [Arguments]     ${url}  ${evtpath}   ${httpheaders}    ${evtdata}   ${user}  ${pd}

-    ${auth}=  Create List  ${user}   ${pd}

-    Log    Creating session ${url}

-    ${session}=    Create Session 	dcae-d1 	${url}    auth=${auth}

-    ${resp}= 	Put Request 	dcae-d1 	${evtpath}     data=${evtdata}   headers=${httpheaders}

-    #Log    Received response from dcae ${resp.json()}

-    [return] 	${resp}

-

-Publish Event To VES Collector With Put Method No Auth

-    [Documentation]    Send an event to VES Collector

-    [Arguments]     ${url}  ${evtpath}   ${httpheaders}    ${evtdata}

-    Log    Creating session ${url}

-    ${session}=    Create Session 	dcae-d1 	${url}

-    ${resp}= 	Put Request 	dcae-d1 	${evtpath}     data=${evtdata}   headers=${httpheaders}

-    #Log    Received response from dcae ${resp.json()}

-    [return] 	${resp}

-            
\ No newline at end of file
diff --git a/test/csit/tests/dcae/testcases/resources/dcae_properties.robot b/test/csit/tests/dcae/testcases/resources/dcae_properties.robot
deleted file mode 100644
index be182d4aa..000000000
--- a/test/csit/tests/dcae/testcases/resources/dcae_properties.robot
+++ /dev/null
@@ -1,13 +0,0 @@
-Documentation        store all properties that can change or are used in multiple places here

-...                    format is all caps with underscores between words and prepended with GLOBAL

-...                   make sure you prepend them with GLOBAL so that other files can easily see it is from this file.

-

-

-

-*** Variables ***

-${GLOBAL_APPLICATION_ID}           robot-dcae

-${GLOBAL_DCAE_CONSUL_URL}         http://135.205.228.129:8500

-${GLOBAL_DCAE_CONSUL_URL1}          http://135.205.228.170:8500

-${GLOBAL_DCAE_VES_URL}             http://localhost:8443/eventlistener/v5

-${GLOBAL_DCAE_USERNAME}            console

-${GLOBAL_DCAE_PASSWORD}            ZjJkYjllMjljMTI2M2Iz

diff --git a/test/csit/tests/dcae/testcases/resources/index.htm b/test/csit/tests/dcae/testcases/resources/index.htm
deleted file mode 100644
index 5ab2f8a43..000000000
--- a/test/csit/tests/dcae/testcases/resources/index.htm
+++ /dev/null
@@ -1 +0,0 @@
-Hello
\ No newline at end of file