code sync-up updates

Issue-ID: DCAEGEN2-212
Change-Id: Id72d2b1851ff4457295088609c355e19d19e3d73
Signed-off-by: VENKATESH KUMAR <vv770d@att.com>

1 files changed, 862 insertions, 628 deletions

diff --git a/etc/CommonEventFormat_28.3.json b/etc/CommonEventFormat_28.3.json
index 90f6d81a..82d5c978 100644
--- a/etc/CommonEventFormat_28.3.json
+++ b/etc/CommonEventFormat_28.3.json
@@ -1,8 +1,7 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
-	
+	"$schema": "http://json-schema.org/draft-04/schema#",
 	"definitions": {
-	"attCopyrightNotice": {
+		"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": {
@@ -11,8 +10,8 @@
 					"type": "string"
 				},
 				"licenseLink": {
-				 "description": "http://www.apache.org/licenses/LICENSE-2.0",
-				 "type":"string"
+					"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,",
@@ -36,17 +35,23 @@
 				}
 			}
 		},
-	
- 		"codecsInUse": {
+		"codecsInUse": {
 			"description": "number of times an identified codec was used over the measurementInterval",
 			"type": "object",
 			"properties": {
-				"codecIdentifier": { "type": "string" },
-				"numberInUse": { "type": "integer" }
+				"codecIdentifier": {
+					"type": "string"
+				},
+				"numberInUse": {
+					"type": "integer"
+				}
 			},
-			"required": [ "codecIdentifier", "numberInUse" ]
+			"required": [
+				"codecIdentifier",
+				"numberInUse"
+			]
 		},
- 		"command": {
+		"command": {
 			"description": "command from an event collector toward an event source",
 			"type": "object",
 			"properties": {
@@ -59,17 +64,25 @@
 						"throttlingSpecification"
 					]
 				},
-				"eventDomainThrottleSpecification": { "$ref": "#/definitions/eventDomainThrottleSpecification" },
-				"heartbeatInterval": { "type": "integer" },
-				"measurementInterval": { "type": "integer" }
+				"eventDomainThrottleSpecification": {
+					"$ref": "#/definitions/eventDomainThrottleSpecification"
+				},
+				"heartbeatInterval": {
+					"type": "integer"
+				},
+				"measurementInterval": {
+					"type": "integer"
+				}
 			},
-			"required": [ "commandType" ]
+			"required": [
+				"commandType"
+			]
 		},
 		"commandList": {
 			"description": "array of commands from an event collector toward an event source",
 			"type": "array",
 			"items": {
-			    "$ref": "#/definitions/command"
+				"$ref": "#/definitions/command"
 			},
 			"minItems": 0
 		},
@@ -105,7 +118,9 @@
 					"description": "for example - applicationVnf, guestOS, hostOS, platform",
 					"type": "string"
 				},
-				"internalHeaderFields": { "$ref": "#/definitions/internalHeaderFields" },
+				"internalHeaderFields": {
+					"$ref": "#/definitions/internalHeaderFields"
+				},
 				"lastEpochMicrosec": {
 					"description": "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
 					"type": "number"
@@ -157,379 +172,442 @@
 					"type": "number"
 				}
 			},
-			"required": [ "domain", "eventId", "eventName", "lastEpochMicrosec", 
-						  "priority", "reportingEntityName", "sequence", "sourceName",
-			              "startEpochMicrosec", "version" ]
+			"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"}
+				"criticality": {
+					"type": "string",
+					"enum": [
+						"CRIT",
+						"MAJ"
+					]
+				},
+				"name": {
+					"type": "string"
+				},
+				"thresholdCrossed": {
+					"type": "string"
+				},
+				"value": {
+					"type": "string"
+				}
 			},
-			"required": [ "criticality", "name", "thresholdCrossed", "value" ]
+			"required": [
+				"criticality",
+				"name",
+				"thresholdCrossed",
+				"value"
+			]
 		},
 		"cpuUsage": {
 			"description": "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" 
-                }
+				"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" ]
+			"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"
-                }
+				"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": [ "diskIdentifier" ]
+			"required": [
+				"adjacencyName",
+				"endpointDescription"
+			]
 		},
-        "endOfCallVqmSummaries": {
-            "description": "provides end of call voice quality metrics",
+		"event": {
+			"description": "the root level of the common event format",
 			"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" ]
-        },
+				"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",
+				"eventDomain": {
+					"description": "Event domain enum from the commonEventHeader domain field",
+					"type": "string"
+				},
+				"suppressedFieldNames": {
+					"description": "List of optional field names in the event block that should not be sent to the Event Listener",
+					"type": "array",
 					"items": {
-					    "type": "string"
+						"type": "string"
 					}
-		        },
+				},
 				"suppressedNvPairsList": {
 					"description": "Optional list of specific NvPairsNames to suppress within a given Name-Value Field",
-			        "type": "array",
+					"type": "array",
 					"items": {
-					    "$ref": "#/definitions/suppressedNvPairs"
+						"$ref": "#/definitions/suppressedNvPairs"
 					}
-		        }
+				}
 			},
-			"required": [ "eventDomain" ]
+			"required": [
+				"eventDomain"
+			]
 		},
 		"eventDomainThrottleSpecificationList": {
 			"description": "array of eventDomainThrottleSpecifications",
 			"type": "array",
 			"items": {
-			    "$ref": "#/definitions/eventDomainThrottleSpecification"
+				"$ref": "#/definitions/eventDomainThrottleSpecification"
 			},
 			"minItems": 0
 		},
@@ -544,17 +622,21 @@
 			"description": "reports the throttling in force at the event source",
 			"type": "object",
 			"properties": {
-		        "eventThrottlingMode": {
-			        "description": "Mode the event manager is in",
-			        "type": "string",
+				"eventThrottlingMode": {
+					"description": "Mode the event manager is in",
+					"type": "string",
 					"enum": [
 						"normal",
 						"throttled"
 					]
-		        },
-				"eventDomainThrottleSpecificationList": { "$ref": "#/definitions/eventDomainThrottleSpecificationList" }
+				},
+				"eventDomainThrottleSpecificationList": {
+					"$ref": "#/definitions/eventDomainThrottleSpecificationList"
+				}
 			},
-			"required": [ "eventThrottlingMode" ]
+			"required": [
+				"eventThrottlingMode"
+			]
 		},
 		"faultFields": {
 			"description": "fields specific to fault events",
@@ -614,41 +696,82 @@
 					]
 				}
 			},
-			"required": [ "alarmCondition", "eventSeverity", "eventSourceType",
-			              "faultFieldsVersion", "specificProblem", "vfStatus" ]
+			"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" }
+				"featureIdentifier": {
+					"type": "string"
+				},
+				"featureUtilization": {
+					"type": "integer"
+				}
 			},
-			"required": [ "featureIdentifier", "featureUtilization" ]
+			"required": [
+				"featureIdentifier",
+				"featureUtilization"
+			]
 		},
 		"field": {
 			"description": "name value pair",
 			"type": "object",
 			"properties": {
-				"name":  { "type": "string" },
-				"value": { "type": "string" }
+				"name": {
+					"type": "string"
+				},
+				"value": {
+					"type": "string"
+				}
 			},
-			"required": [ "name", "value" ]
+			"required": [
+				"name",
+				"value"
+			]
 		},
 		"filesystemUsage": {
 			"description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
 			"type": "object",
 			"properties": {
-				"blockConfigured": { "type": "number" },
-				"blockIops": { "type": "number" },
-				"blockUsed": { "type": "number" },
-				"ephemeralConfigured": { "type": "number" },
-				"ephemeralIops": { "type": "number" },
-				"ephemeralUsed": { "type": "number" },
-				"filesystemName": { "type": "string" }
+				"blockConfigured": {
+					"type": "number"
+				},
+				"blockIops": {
+					"type": "number"
+				},
+				"blockUsed": {
+					"type": "number"
+				},
+				"ephemeralConfigured": {
+					"type": "number"
+				},
+				"ephemeralIops": {
+					"type": "number"
+				},
+				"ephemeralUsed": {
+					"type": "number"
+				},
+				"filesystemName": {
+					"type": "string"
+				}
 			},
-			"required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured",
-			              "ephemeralIops", "ephemeralUsed", "filesystemName" ]
+			"required": [
+				"blockConfigured",
+				"blockIops",
+				"blockUsed",
+				"ephemeralConfigured",
+				"ephemeralIops",
+				"ephemeralUsed",
+				"filesystemName"
+			]
 		},
 		"gtpPerFlowMetrics": {
 			"description": "Mobility GTP Protocol per flow metrics",
@@ -728,12 +851,16 @@
 				},
 				"ipTosCountList": {
 					"description": "array of key: value pairs where the keys are drawn from the IP Type-of-Service identifiers which range from '0' to '255', and the values are the count of packets that had those ToS identifiers in the flow",
-                    "type": "array",
-                    "items": {
+					"type": "array",
+					"items": {
 						"type": "array",
 						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
+							{
+								"type": "string"
+							},
+							{
+								"type": "number"
+							}
 						]
 					}
 				},
@@ -766,12 +893,16 @@
 				},
 				"mobileQciCosCountList": {
 					"description": "array of key: value pairs where the keys are drawn from LTE QCI or UMTS class of service strings, and the values are the count of packets that had those strings in the flow",
-                    "type": "array",
-                    "items": {
+					"type": "array",
+					"items": {
 						"type": "array",
 						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
+							{
+								"type": "string"
+							},
+							{
+								"type": "number"
+							}
 						]
 					}
 				},
@@ -864,12 +995,16 @@
 				},
 				"tcpFlagCountList": {
 					"description": "array of key: value pairs where the keys are drawn from TCP Flags and the values are the count of packets that had that TCP Flag in the flow",
-                    "type": "array",
-                    "items": {
+					"type": "array",
+					"items": {
 						"type": "array",
 						"items": [
-							{ "type": "string" },
-							{ "type": "number" }
+							{
+								"type": "string"
+							},
+							{
+								"type": "number"
+							}
 						]
 					}
 				},
@@ -885,21 +1020,37 @@
 					"type": "number"
 				}
 			},
-			"required": [ "avgBitErrorRate", "avgPacketDelayVariation", "avgPacketLatency",
-                          "avgReceiveThroughput", "avgTransmitThroughput",
-						  "flowActivationEpoch", "flowActivationMicrosec",
- 						  "flowDeactivationEpoch", "flowDeactivationMicrosec",
-                          "flowDeactivationTime", "flowStatus",
-						  "maxPacketDelayVariation", "numActivationFailures",
- 						  "numBitErrors", "numBytesReceived", "numBytesTransmitted",
-						  "numDroppedPackets", "numL7BytesReceived",
-						  "numL7BytesTransmitted", "numLostPackets",
-						  "numOutOfOrderPackets", "numPacketErrors",
-						  "numPacketsReceivedExclRetrans",
-						  "numPacketsReceivedInclRetrans",
-						  "numPacketsTransmittedInclRetrans",
-						  "numRetries", "numTimeouts", "numTunneledL7BytesReceived",
-						  "roundTripTime", "timeToFirstByte"
+			"required": [
+				"avgBitErrorRate",
+				"avgPacketDelayVariation",
+				"avgPacketLatency",
+				"avgReceiveThroughput",
+				"avgTransmitThroughput",
+				"flowActivationEpoch",
+				"flowActivationMicrosec",
+				"flowDeactivationEpoch",
+				"flowDeactivationMicrosec",
+				"flowDeactivationTime",
+				"flowStatus",
+				"maxPacketDelayVariation",
+				"numActivationFailures",
+				"numBitErrors",
+				"numBytesReceived",
+				"numBytesTransmitted",
+				"numDroppedPackets",
+				"numL7BytesReceived",
+				"numL7BytesTransmitted",
+				"numLostPackets",
+				"numOutOfOrderPackets",
+				"numPacketErrors",
+				"numPacketsReceivedExclRetrans",
+				"numPacketsReceivedInclRetrans",
+				"numPacketsTransmittedInclRetrans",
+				"numRetries",
+				"numTimeouts",
+				"numTunneledL7BytesReceived",
+				"roundTripTime",
+				"timeToFirstByte"
 			]
 		},
 		"heartbeatFields": {
@@ -922,7 +1073,10 @@
 					"type": "integer"
 				}
 			},
-			"required": [ "heartbeatFieldsVersion", "heartbeatInterval" ]
+			"required": [
+				"heartbeatFieldsVersion",
+				"heartbeatInterval"
+			]
 		},
 		"internalHeaderFields": {
 			"description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",
@@ -932,86 +1086,101 @@
 			"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" 
-                }
+				"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" ]
+			"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"
-                    }					
-                }
+				"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" ]
+			"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" 
+				"keyName": {
+					"description": "name of the key",
+					"type": "string"
 				},
-				"keyOrder": { 
-                    "description": "relative sequence or order of the key with respect to other keys", 
-				    "type": "integer" 
+				"keyOrder": {
+					"description": "relative sequence or order of the key with respect to other keys",
+					"type": "integer"
 				},
-				"keyValue": { 
-                    "description": "value of the key", 
-				    "type": "string" 
+				"keyValue": {
+					"description": "value of the key",
+					"type": "string"
 				}
 			},
-			"required": [ "keyName" ]
+			"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" }
+				"countsInTheBucket": {
+					"type": "number"
+				},
+				"highEndOfLatencyBucket": {
+					"type": "number"
+				},
+				"lowEndOfLatencyBucket": {
+					"type": "number"
+				}
 			},
-			"required": [ "countsInTheBucket" ]
+			"required": [
+				"countsInTheBucket"
+			]
 		},
 		"measurementsForVfScalingFields": {
 			"description": "measurementsForVfScaling fields",
@@ -1031,13 +1200,13 @@
 						"$ref": "#/definitions/namedArrayOfFields"
 					}
 				},
-                "additionalObjects": {
-                    "description": "array of JSON objects described by name, schema and other meta-information",
+				"additionalObjects": {
+					"description": "array of JSON objects described by name, schema and other meta-information",
 					"type": "array",
 					"items": {
-                        "$ref": "#/definitions/jsonObject"
+						"$ref": "#/definitions/jsonObject"
 					}
-                },
+				},
 				"codecUsageArray": {
 					"description": "array of codecs in use",
 					"type": "array",
@@ -1060,7 +1229,7 @@
 						"$ref": "#/definitions/cpuUsage"
 					}
 				},
-                "diskUsageArray": {
+				"diskUsageArray": {
 					"description": "usage of an array of disks",
 					"type": "array",
 					"items": {
@@ -1127,46 +1296,53 @@
 					}
 				}
 			},
-			"required": [ "measurementInterval", "measurementsForVfScalingVersion" ]
+			"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" 
-                }
+				"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" ]
+			"required": [
+				"memoryFree",
+				"memoryUsed",
+				"vmIdentifier"
+			]
 		},
 		"mobileFlowFields": {
 			"description": "mobileFlow fields",
@@ -1207,7 +1383,9 @@
 					"description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
 					"type": "string"
 				},
-				"gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" },
+				"gtpPerFlowMetrics": {
+					"$ref": "#/definitions/gtpPerFlowMetrics"
+				},
 				"gtpProtocolType": {
 					"description": "GTP protocol",
 					"type": "string"
@@ -1248,10 +1426,10 @@
 					"description": "mobile network code",
 					"type": "string"
 				},
-                "mobileFlowFieldsVersion": {
-                    "description": "version of the mobileFlowFields block",
-                    "type": "number"
-                },
+				"mobileFlowFieldsVersion": {
+					"description": "version of the mobileFlowFields block",
+					"type": "number"
+				},
 				"msisdn": {
 					"description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
 					"type": "string"
@@ -1305,24 +1483,37 @@
 					"type": "string"
 				}
 			},
-			"required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType", "ipVersion",
-			              "mobileFlowFieldsVersion", "otherEndpointIpAddress", "otherEndpointPort",
-			              "reportingEndpointIpAddr", "reportingEndpointPort" ]
+			"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" },
+				"name": {
+					"type": "string"
+				},
 				"arrayOfFields": {
 					"description": "array of name value pairs",
 					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
+					"items": {
+						"$ref": "#/definitions/field"
 					}
 				}
 			},
-			"required": [ "name", "arrayOfFields" ]
+			"required": [
+				"name",
+				"arrayOfFields"
+			]
 		},
 		"otherFields": {
 			"description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
@@ -1335,32 +1526,34 @@
 						"$ref": "#/definitions/namedArrayOfFields"
 					}
 				},
-                "jsonObjects": {
-                    "description": "array of JSON objects described by name, schema and other meta-information",
+				"jsonObjects": {
+					"description": "array of JSON objects described by name, schema and other meta-information",
 					"type": "array",
 					"items": {
-                        "$ref": "#/definitions/jsonObject"
+						"$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" ]
+				},
+				"otherFieldsVersion": {
+					"description": "version of the otherFields block",
+					"type": "number"
+				}
+			},
+			"required": [
+				"otherFieldsVersion"
+			]
 		},
 		"requestError": {
 			"description": "standard request error data structure",
 			"type": "object",
 			"properties": {
-			    "messageId": {
+				"messageId": {
 					"description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
 					"type": "string"
 				},
@@ -1377,58 +1570,68 @@
 					"type": "string"
 				}
 			},
-			"required": [ "messageId", "text" ]
+			"required": [
+				"messageId",
+				"text"
+			]
 		},
-        "sipSignalingFields": {
-            "description": "sip signaling fields",
-            "type": "object",
-            "properties": {
-                "additionalInformation": {
+		"sipSignalingFields": {
+			"description": "sip signaling fields",
+			"type": "object",
+			"properties": {
+				"additionalInformation": {
 					"description": "additional sip signaling fields if needed",
 					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
+					"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" ]
-        },
+				},
+				"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",
@@ -1467,7 +1670,12 @@
 					"type": "string"
 				}
 			},
-			"required": [ "newState", "oldState", "stateChangeFieldsVersion", "stateInterface" ]
+			"required": [
+				"newState",
+				"oldState",
+				"stateChangeFieldsVersion",
+				"stateInterface"
+			]
 		},
 		"suppressedNvPairs": {
 			"description": "List of specific NvPairsNames to suppress within a given Name-Value Field for event Throttling",
@@ -1479,13 +1687,16 @@
 				},
 				"suppressedNvPairNames": {
 					"description": "Array of nvpair names to suppress within the nvpairFieldName",
-			        "type": "array",
+					"type": "array",
 					"items": {
-					    "type": "string"
+						"type": "string"
 					}
 				}
 			},
-			"required": [ "nvPairFieldName", "suppressedNvPairNames" ]
+			"required": [
+				"nvPairFieldName",
+				"suppressedNvPairNames"
+			]
 		},
 		"syslogFields": {
 			"description": "sysLog fields",
@@ -1558,7 +1769,12 @@
 					"type": "number"
 				}
 			},
-			"required": [ "eventSourceType", "syslogFieldsVersion", "syslogMsg", "syslogTag" ]
+			"required": [
+				"eventSourceType",
+				"syslogFieldsVersion",
+				"syslogMsg",
+				"syslogTag"
+			]
 		},
 		"thresholdCrossingAlertFields": {
 			"description": "fields specific to threshold crossing alert events",
@@ -1567,8 +1783,8 @@
 				"additionalFields": {
 					"description": "additional threshold crossing alert fields if needed",
 					"type": "array",
-					"items": {  
-						"$ref": "#/definitions/field" 
+					"items": {
+						"$ref": "#/definitions/field"
 					}
 				},
 				"additionalParameters": {
@@ -1608,7 +1824,9 @@
 				"associatedAlertIdList": {
 					"description": "List of eventIds associated with the event being reported",
 					"type": "array",
-					"items": { "type": "string" }
+					"items": {
+						"type": "string"
+					}
 				},
 				"collectionTimestamp": {
 					"description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
@@ -1682,7 +1900,9 @@
 					"type": "string"
 				}
 			},
-			"required": [ "vendorName" ]
+			"required": [
+				"vendorName"
+			]
 		},
 		"vNicPerformance": {
 			"description": "describes the performance and errors of an identified virtual network interface card",
@@ -1803,64 +2023,78 @@
 				"valuesAreSuspect": {
 					"description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions",
 					"type": "string",
-					"enum": [ "true", "false" ]
+					"enum": [
+						"true",
+						"false"
+					]
 				},
 				"vNicIdentifier": {
 					"description": "vNic identification",
 					"type": "string"
 				}
 			},
-			"required": [ "valuesAreSuspect", "vNicIdentifier" ]
+			"required": [
+				"valuesAreSuspect",
+				"vNicIdentifier"
+			]
 		},
-        "voiceQualityFields": {
-            "description": "provides statistics related to customer facing voice products",
-            "type": "object",
-            "properties": {
-                "additionalInformation": {
+		"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" 
+					"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" ]
-        }
+				},
+				"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"}
-    }
+		"event": {
+			"$ref": "#/definitions/event"
+		}
+	}
 }