diff --git a/test/csit/plans/dcae/testsuites/setup.sh b/test/csit/plans/dcaegen2/testsuites/setup.sh
similarity index 97%
rename from test/csit/plans/dcae/testsuites/setup.sh
rename to test/csit/plans/dcaegen2/testsuites/setup.sh
index d7f02bc..3068b50 100755
--- a/test/csit/plans/dcae/testsuites/setup.sh
+++ b/test/csit/plans/dcaegen2/testsuites/setup.sh
@@ -31,7 +31,7 @@
 VESC_IP=`get-instance-ip.sh vesc`
 export VESC_IP=${VESC_IP}
 
-export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcae/testcases/resources"
+export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcaegen2/testcases/resources"
 
 # Wait container ready
 sleep 5
diff --git a/test/csit/plans/dcae/testsuites/teardown.sh b/test/csit/plans/dcaegen2/testsuites/teardown.sh
similarity index 100%
rename from test/csit/plans/dcae/testsuites/teardown.sh
rename to test/csit/plans/dcaegen2/testsuites/teardown.sh
diff --git a/test/csit/plans/dcae/testsuites/testplan.txt b/test/csit/plans/dcaegen2/testsuites/testplan.txt
similarity index 84%
rename from test/csit/plans/dcae/testsuites/testplan.txt
rename to test/csit/plans/dcaegen2/testsuites/testplan.txt
index 777842a..fbf0883 100755
--- a/test/csit/plans/dcae/testsuites/testplan.txt
+++ b/test/csit/plans/dcaegen2/testsuites/testplan.txt
@@ -1,3 +1,3 @@
 # Test suites are relative paths under [integration.git]/test/csit/tests/.
 # Place the suites in run order.
-dcae/testcases
+dcaegen2/testcases
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 d9893a7..0000000
--- 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/__init__.robot b/test/csit/tests/dcaegen2/testcases/__init__.robot
similarity index 100%
rename from test/csit/tests/dcae/testcases/__init__.robot
rename to test/csit/tests/dcaegen2/testcases/__init__.robot
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/CommonEventFormat_28.3.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/CommonEventFormat_28.3.json
similarity index 100%
rename from test/csit/tests/dcae/testcases/assets/json_events/CommonEventFormat_28.3.json
rename to test/csit/tests/dcaegen2/testcases/assets/json_events/CommonEventFormat_28.3.json
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/dcae_healthcheck.json
similarity index 100%
rename from test/csit/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json
rename to test/csit/tests/dcaegen2/testcases/assets/json_events/dcae_healthcheck.json
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/ves_vfirewall_measurement.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json
similarity index 100%
rename from test/csit/tests/dcae/testcases/assets/json_events/ves_vfirewall_measurement.json
rename to test/csit/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json
similarity index 100%
rename from test/csit/tests/dcae/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json
rename to test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json
similarity index 100%
rename from test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event.json
rename to test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event_bad.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event_bad.json
similarity index 100%
rename from test/csit/tests/dcae/testcases/assets/json_events/ves_volte_single_fault_event_bad.json
rename to test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event_bad.json
diff --git a/test/csit/tests/dcae/testcases/dcae_ves.robot b/test/csit/tests/dcaegen2/testcases/dcae_ves.robot
similarity index 95%
rename from test/csit/tests/dcae/testcases/dcae_ves.robot
rename to test/csit/tests/dcaegen2/testcases/dcae_ves.robot
index 1df67ae..00c5807 100644
--- a/test/csit/tests/dcae/testcases/dcae_ves.robot
+++ b/test/csit/tests/dcaegen2/testcases/dcae_ves.robot
@@ -20,11 +20,11 @@
 ${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
+${EVENT_DATA_FILE}                       %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json
+${EVENT_MEASURE_FILE}                    %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json
+${EVENT_DATA_FILE_BAD}                   %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event_bad.json
+${EVENT_BATCH_DATA_FILE}                 %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json
+${EVENT_THROTTLING_STATE_DATA_FILE}      %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_provide_throttle_state.json
 
 
 #DCAE Health Check
diff --git a/test/csit/tests/dcae/testcases/assets/json_events/CommonEventFormat_28.3.json b/test/csit/tests/dcaegen2/testcases/resources/CommonEventFormat_28.3.json
similarity index 100%
copy from test/csit/tests/dcae/testcases/assets/json_events/CommonEventFormat_28.3.json
copy to test/csit/tests/dcaegen2/testcases/resources/CommonEventFormat_28.3.json
diff --git a/test/csit/tests/dcae/testcases/resources/DMaaP.py b/test/csit/tests/dcaegen2/testcases/resources/DMaaP.py
similarity index 100%
rename from test/csit/tests/dcae/testcases/resources/DMaaP.py
rename to test/csit/tests/dcaegen2/testcases/resources/DMaaP.py
diff --git a/test/csit/tests/dcae/testcases/resources/DcaeLibrary.py b/test/csit/tests/dcaegen2/testcases/resources/DcaeLibrary.py
similarity index 100%
rename from test/csit/tests/dcae/testcases/resources/DcaeLibrary.py
rename to test/csit/tests/dcaegen2/testcases/resources/DcaeLibrary.py
diff --git a/test/csit/tests/dcae/testcases/resources/DcaeVariables.py b/test/csit/tests/dcaegen2/testcases/resources/DcaeVariables.py
similarity index 80%
rename from test/csit/tests/dcae/testcases/resources/DcaeVariables.py
rename to test/csit/tests/dcaegen2/testcases/resources/DcaeVariables.py
index e2f1867..4d51a8f 100644
--- a/test/csit/tests/dcae/testcases/resources/DcaeVariables.py
+++ b/test/csit/tests/dcaegen2/testcases/resources/DcaeVariables.py
@@ -7,7 +7,7 @@
 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"
+CommonEventSchemaV5  = GetEnvironmentVariable('WORKSPACE') + "/test/csit/tests/dcaegen2/testcases/assets/json_events/CommonEventFormat_28.3.json"
 
 HttpServerThread = None
 HTTPD = None
diff --git a/test/csit/tests/dcae/testcases/resources/VES-4.27.2-dataformat.json b/test/csit/tests/dcaegen2/testcases/resources/VES-4.27.2-dataformat.json
similarity index 100%
rename from test/csit/tests/dcae/testcases/resources/VES-4.27.2-dataformat.json
rename to test/csit/tests/dcaegen2/testcases/resources/VES-4.27.2-dataformat.json
diff --git a/test/csit/tests/dcae/testcases/resources/VES-5.28.3-dataformat.json b/test/csit/tests/dcaegen2/testcases/resources/VES-5.28.4-dataformat.json
similarity index 91%
rename from test/csit/tests/dcae/testcases/resources/VES-5.28.3-dataformat.json
rename to test/csit/tests/dcaegen2/testcases/resources/VES-5.28.4-dataformat.json
index 7663233..386b5e6 100644
--- a/test/csit/tests/dcae/testcases/resources/VES-5.28.3-dataformat.json
+++ b/test/csit/tests/dcaegen2/testcases/resources/VES-5.28.4-dataformat.json
@@ -1,44 +1,81 @@
 {
 	"self": {
 		"name": "VES_specification",
-		"version": "5.28.3",
-		"description": "VES spec for 5.3"
+		"version": "5.28.4",
+		"description": "VES spec for 5.4"
 	},
 	"dataformatversion": "1.0.0",
 	"jsonschema": {
 		"$schema": "http://json-schema.org/draft-04/schema#",
+		"title": "VES Event Listener",
+		"type": "object",
+		"properties": {
+			"event": {
+				"$ref": "#/definitions/event"
+			},
+			"eventList": {
+				"$ref": "#/definitions/eventList"
+			}
+		},
+
 		"definitions": {
-					"attCopyrightNotice": {
-				"description": "Copyright (c) <2017>, AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the License)",
+			"schemaHeaderBlock": {
+				"description": "schema date, version, author and associated API",
 				"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",
+					"associatedApi": {
+						"description": "VES Event Listener",
 						"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,",
+					"lastUpdatedBy": {
+						"description": "re2947",
 						"type": "string"
 					},
-					"condition2": {
-						"description": "Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.",
+					"schemaDate": {
+						"description": "September 12, 2017",
 						"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"
+					"schemaVersion": {
+						"description": "28.4",
+						"type": "number"
 					}
-				   }
+				}
+			},
+			"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",
@@ -50,10 +87,7 @@
 						"type": "integer"
 					}
 				},
-				"required": [
-					"codecIdentifier",
-					"numberInUse"
-				]
+				"required": ["codecIdentifier", "numberInUse"]
 			},
 			"command": {
 				"description": "command from an event collector toward an event source",
@@ -78,9 +112,7 @@
 						"type": "integer"
 					}
 				},
-				"required": [
-					"commandType"
-				]
+				"required": ["commandType"]
 			},
 			"commandList": {
 				"description": "array of commands from an event collector toward an event source",
@@ -176,17 +208,9 @@
 						"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": {
@@ -195,10 +219,7 @@
 				"properties": {
 					"criticality": {
 						"type": "string",
-						"enum": [
-							"CRIT",
-							"MAJ"
-						]
+						"enum": ["CRIT", "MAJ"]
 					},
 					"name": {
 						"type": "string"
@@ -210,12 +231,7 @@
 						"type": "string"
 					}
 				},
-				"required": [
-					"criticality",
-					"name",
-					"thresholdCrossed",
-					"value"
-				]
+				"required": ["criticality", "name", "thresholdCrossed", "value"]
 			},
 			"cpuUsage": {
 				"description": "usage of an identified CPU",
@@ -262,10 +278,7 @@
 						"type": "number"
 					}
 				},
-				"required": [
-					"cpuIdentifier",
-					"percentUsage"
-				]
+				"required": ["cpuIdentifier", "percentUsage"]
 			},
 			"diskUsage": {
 				"description": "usage of an identified disk",
@@ -436,9 +449,7 @@
 						"type": "number"
 					}
 				},
-				"required": [
-					"diskIdentifier"
-				]
+				"required": ["diskIdentifier"]
 			},
 			"endOfCallVqmSummaries": {
 				"description": "provides end of call voice quality metrics",
@@ -451,10 +462,7 @@
 					"endpointDescription": {
 						"description": "Either Caller or Callee",
 						"type": "string",
-						"enum": [
-							"Caller",
-							"Callee"
-						]
+						"enum": ["Caller", "Callee"]
 					},
 					"endpointJitter": {
 						"description": "",
@@ -533,10 +541,7 @@
 						"type": "number"
 					}
 				},
-				"required": [
-					"adjacencyName",
-					"endpointDescription"
-				]
+				"required": ["adjacencyName", "endpointDescription"]
 			},
 			"event": {
 				"description": "the root level of the common event format",
@@ -576,9 +581,7 @@
 						"$ref": "#/definitions/voiceQualityFields"
 					}
 				},
-				"required": [
-					"commonEventHeader"
-				]
+				"required": ["commonEventHeader"]
 			},
 			"eventDomainThrottleSpecification": {
 				"description": "specification of what information to suppress within an event domain",
@@ -603,9 +606,7 @@
 						}
 					}
 				},
-				"required": [
-					"eventDomain"
-				]
+				"required": ["eventDomain"]
 			},
 			"eventDomainThrottleSpecificationList": {
 				"description": "array of eventDomainThrottleSpecifications",
@@ -638,9 +639,7 @@
 						"$ref": "#/definitions/eventDomainThrottleSpecificationList"
 					}
 				},
-				"required": [
-					"eventThrottlingMode"
-				]
+				"required": ["eventThrottlingMode"]
 			},
 			"faultFields": {
 				"description": "fields specific to fault events",
@@ -700,13 +699,8 @@
 						]
 					}
 				},
-				"required": [
-					"alarmCondition",
-					"eventSeverity",
-					"eventSourceType",
-					"faultFieldsVersion",
-					"specificProblem",
-					"vfStatus"
+				"required": ["alarmCondition", "eventSeverity", "eventSourceType",
+					"faultFieldsVersion", "specificProblem", "vfStatus"
 				]
 			},
 			"featuresInUse": {
@@ -720,10 +714,7 @@
 						"type": "integer"
 					}
 				},
-				"required": [
-					"featureIdentifier",
-					"featureUtilization"
-				]
+				"required": ["featureIdentifier", "featureUtilization"]
 			},
 			"field": {
 				"description": "name value pair",
@@ -736,10 +727,7 @@
 						"type": "string"
 					}
 				},
-				"required": [
-					"name",
-					"value"
-				]
+				"required": ["name", "value"]
 			},
 			"filesystemUsage": {
 				"description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
@@ -767,14 +755,8 @@
 						"type": "string"
 					}
 				},
-				"required": [
-					"blockConfigured",
-					"blockIops",
-					"blockUsed",
-					"ephemeralConfigured",
-					"ephemeralIops",
-					"ephemeralUsed",
-					"filesystemName"
+				"required": ["blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured",
+					"ephemeralIops", "ephemeralUsed", "filesystemName"
 				]
 			},
 			"gtpPerFlowMetrics": {
@@ -858,8 +840,7 @@
 						"type": "array",
 						"items": {
 							"type": "array",
-							"items": [
-								{
+							"items": [{
 									"type": "string"
 								},
 								{
@@ -900,8 +881,7 @@
 						"type": "array",
 						"items": {
 							"type": "array",
-							"items": [
-								{
+							"items": [{
 									"type": "string"
 								},
 								{
@@ -1002,8 +982,7 @@
 						"type": "array",
 						"items": {
 							"type": "array",
-							"items": [
-								{
+							"items": [{
 									"type": "string"
 								},
 								{
@@ -1024,37 +1003,21 @@
 						"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",
+				"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"
+					"numRetries", "numTimeouts", "numTunneledL7BytesReceived",
+					"roundTripTime", "timeToFirstByte"
 				]
 			},
 			"heartbeatFields": {
@@ -1077,10 +1040,7 @@
 						"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",
@@ -1118,10 +1078,7 @@
 						"type": "string"
 					}
 				},
-				"required": [
-					"objectInstances",
-					"objectName"
-				]
+				"required": ["objectInstances", "objectName"]
 			},
 			"jsonObjectInstance": {
 				"description": "meta-information about an instance of a jsonObject along with the actual object instance",
@@ -1143,9 +1100,7 @@
 						}
 					}
 				},
-				"required": [
-					"objectInstance"
-				]
+				"required": ["objectInstance"]
 			},
 			"key": {
 				"description": "tuple which provides the name of a key along with its value and relative order",
@@ -1164,9 +1119,7 @@
 						"type": "string"
 					}
 				},
-				"required": [
-					"keyName"
-				]
+				"required": ["keyName"]
 			},
 			"latencyBucketMeasure": {
 				"description": "number of counts falling within a defined latency bucket",
@@ -1182,9 +1135,7 @@
 						"type": "number"
 					}
 				},
-				"required": [
-					"countsInTheBucket"
-				]
+				"required": ["countsInTheBucket"]
 			},
 			"measurementsForVfScalingFields": {
 				"description": "measurementsForVfScaling fields",
@@ -1300,10 +1251,7 @@
 						}
 					}
 				},
-				"required": [
-					"measurementInterval",
-					"measurementsForVfScalingVersion"
-				]
+				"required": ["measurementInterval", "measurementsForVfScalingVersion"]
 			},
 			"memoryUsage": {
 				"description": "memory usage of an identified virtual machine",
@@ -1342,11 +1290,7 @@
 						"type": "string"
 					}
 				},
-				"required": [
-					"memoryFree",
-					"memoryUsed",
-					"vmIdentifier"
-				]
+				"required": ["memoryFree", "memoryUsed", "vmIdentifier"]
 			},
 			"mobileFlowFields": {
 				"description": "mobileFlow fields",
@@ -1487,16 +1431,9 @@
 						"type": "string"
 					}
 				},
-				"required": [
-					"flowDirection",
-					"gtpPerFlowMetrics",
-					"ipProtocolType",
-					"ipVersion",
-					"mobileFlowFieldsVersion",
-					"otherEndpointIpAddress",
-					"otherEndpointPort",
-					"reportingEndpointIpAddr",
-					"reportingEndpointPort"
+				"required": ["flowDirection", "gtpPerFlowMetrics", "ipProtocolType", "ipVersion",
+					"mobileFlowFieldsVersion", "otherEndpointIpAddress", "otherEndpointPort",
+					"reportingEndpointIpAddr", "reportingEndpointPort"
 				]
 			},
 			"namedArrayOfFields": {
@@ -1514,10 +1451,7 @@
 						}
 					}
 				},
-				"required": [
-					"name",
-					"arrayOfFields"
-				]
+				"required": ["name", "arrayOfFields"]
 			},
 			"otherFields": {
 				"description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
@@ -1549,9 +1483,7 @@
 						"type": "number"
 					}
 				},
-				"required": [
-					"otherFieldsVersion"
-				]
+				"required": ["otherFieldsVersion"]
 			},
 			"requestError": {
 				"description": "standard request error data structure",
@@ -1574,10 +1506,7 @@
 						"type": "string"
 					}
 				},
-				"required": [
-					"messageId",
-					"text"
-				]
+				"required": ["messageId", "text"]
 			},
 			"sipSignalingFields": {
 				"description": "sip signaling fields",
@@ -1619,21 +1548,15 @@
 						"type": "number"
 					},
 					"summarySip": {
-						"description": "the SIP Method or Response (‘INVITE’, ‘200 OK’, ‘BYE’, etc)",
+						"description": "the SIP Method or Response (â€˜INVITEâ€™, â€˜200 OKâ€™, â€˜BYEâ€™, etc)",
 						"type": "string"
 					},
 					"vendorVnfNameFields": {
 						"$ref": "#/definitions/vendorVnfNameFields"
 					}
 				},
-				"required": [
-					"correlator",
-					"localIpAddress",
-					"localPort",
-					"remoteIpAddress",
-					"remotePort",
-					"sipSignalingFieldsVersion",
-					"vendorVnfNameFields"
+				"required": ["correlator", "localIpAddress", "localPort", "remoteIpAddress",
+					"remotePort", "sipSignalingFieldsVersion", "vendorVnfNameFields"
 				]
 			},
 			"stateChangeFields": {
@@ -1674,12 +1597,7 @@
 						"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",
@@ -1697,17 +1615,14 @@
 						}
 					}
 				},
-				"required": [
-					"nvPairFieldName",
-					"suppressedNvPairNames"
-				]
+				"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|…'",
+						"description": "additional syslog fields if needed provided as name=value delimited by a pipe â€˜|â€™ symbol, for example: 'name1=value1|name2=value2|â€¦'",
 						"type": "string"
 					},
 					"eventSourceHost": {
@@ -1773,12 +1688,7 @@
 						"type": "number"
 					}
 				},
-				"required": [
-					"eventSourceType",
-					"syslogFieldsVersion",
-					"syslogMsg",
-					"syslogTag"
-				]
+				"required": ["eventSourceType", "syslogFieldsVersion", "syslogMsg", "syslogTag"]
 			},
 			"thresholdCrossingAlertFields": {
 				"description": "fields specific to threshold crossing alert events",
@@ -1904,9 +1814,7 @@
 						"type": "string"
 					}
 				},
-				"required": [
-					"vendorName"
-				]
+				"required": ["vendorName"]
 			},
 			"vNicPerformance": {
 				"description": "describes the performance and errors of an identified virtual network interface card",
@@ -2027,20 +1935,14 @@
 					"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",
@@ -2084,22 +1986,10 @@
 						"type": "number"
 					}
 				},
-				"required": [
-					"calleeSideCodec",
-					"callerSideCodec",
-					"correlator",
-					"midCallRtcp",
-					"vendorVnfNameFields",
-					"voiceQualityFieldsVersion"
+				"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/dcaegen2/testcases/resources/dcae_keywords.robot
similarity index 100%
rename from test/csit/tests/dcae/testcases/resources/dcae_keywords.robot
rename to test/csit/tests/dcaegen2/testcases/resources/dcae_keywords.robot
diff --git a/test/csit/tests/dcae/testcases/resources/dcae_properties.robot b/test/csit/tests/dcaegen2/testcases/resources/dcae_properties.robot
similarity index 100%
rename from test/csit/tests/dcae/testcases/resources/dcae_properties.robot
rename to test/csit/tests/dcaegen2/testcases/resources/dcae_properties.robot
diff --git a/test/csit/tests/dcae/testcases/resources/index.htm b/test/csit/tests/dcaegen2/testcases/resources/index.htm
similarity index 100%
rename from test/csit/tests/dcae/testcases/resources/index.htm
rename to test/csit/tests/dcaegen2/testcases/resources/index.htm