Merge "[DCAEGEN2] Update son-handler CSIT with CPS"

5 files changed, 44 insertions, 5 deletions

diff --git a/tests/dcaegen2-services-son-handler/testcases/data/cps_expected_payload_fm.json b/tests/dcaegen2-services-son-handler/testcases/data/cps_expected_payload_fm.json
new file mode 100644
index 00000000..e8d7e518
--- /dev/null
+++ b/tests/dcaegen2-services-son-handler/testcases/data/cps_expected_payload_fm.json
@@ -0,0 +1,2 @@
+
+{"Configurations":[{"data":{"FAPService":{"alias":"15176","X0005b9Lte":{"phyCellIdInUse":3,"pnfName":"220"},"CellConfig":{"LTE":{"RAN":{"Common":{"CellIdentity":"15176"}}}}}}},{"data":{"FAPService":{"alias":"15174","X0005b9Lte":{"phyCellIdInUse":1,"pnfName":"220"},"CellConfig":{"LTE":{"RAN":{"Common":{"CellIdentity":"15174"}}}}}}}]}
diff --git a/tests/dcaegen2-services-son-handler/testcases/data/cps_expected_payload_pm.json b/tests/dcaegen2-services-son-handler/testcases/data/cps_expected_payload_pm.json
new file mode 100644
index 00000000..2a56f2cc
--- /dev/null
+++ b/tests/dcaegen2-services-son-handler/testcases/data/cps_expected_payload_pm.json
@@ -0,0 +1 @@
+{"Configurations":[{"data":{"FAPService":{"alias":"Chn0002","CellConfig":{"LTE":{"RAN":{"Common":{"CellIdentity":"Chn0002"},"NeighborListInUse":{"LTECell":[{"PNFName":"ncserver1","PLMNID":"plmnid1","CID":"Chn0004","PhyCellID":0,"Blacklisted":"true"},{"PNFName":"ncserver1","CID":"Chn0001","PhyCellID":0,"Blacklisted":"true"}],"LTECellNumberOfEntries":"2"}}}}}}}]}
diff --git a/tests/dcaegen2-services-son-handler/testcases/data/cps_fault_notification.json b/tests/dcaegen2-services-son-handler/testcases/data/cps_fault_notification.json
new file mode 100644
index 00000000..6b09e5ee
--- /dev/null
+++ b/tests/dcaegen2-services-son-handler/testcases/data/cps_fault_notification.json
@@ -0,0 +1,35 @@
+{
+	"event":{
+		"commonEventHeader":{
+			"domain":"fault",
+			"eventId":"fault000002",
+			"eventName":"Fault_RansimAgent-Wipro_RanPCIProblem",
+			"lastEpochMicrosec":1.633608637561E15,
+			"priority":"High",
+			"reportingEntityName":"ncserver1",
+			"sequence":1,
+			"sourceName":"15289",
+			"startEpochMicrosec":1.633608637561E15,
+			"version":"4.0.1",
+			"nfNamingCode":"RansimAgent",
+			"reportingEntityId":"69fb75e9-b85e-4132-ac21-515e9e8f5edb",
+			"sourceId":"94c26740-c875-4122-9e81-82723769bb54",
+			"nfVendorName":"Wipro",
+			"vesEventListenerVersion":"7.2",
+			"timeZoneOffset":"UTC+05:30"
+		},
+		"faultFields":{
+			"alarmCondition":"RanPciCollisionConfusionOccurred",
+			"eventSeverity":"CRITICAL",
+			"eventCategory": "PCIConfusion",
+			"eventSourceType":"other",
+			"faultFieldsVersion":"4.0",
+			"specificProblem":"15290",
+			"vfStatus":"Active",
+			"alarmAdditionalInformation":{
+				"networkId":"10000000"
+			}
+		}
+	}
+}
+
diff --git a/tests/dcaegen2-services-son-handler/testcases/data/fault_notification.json b/tests/dcaegen2-services-son-handler/testcases/data/fault_notification.json
index e5a327ad..3d2b2c6e 100644
--- a/tests/dcaegen2-services-son-handler/testcases/data/fault_notification.json
+++ b/tests/dcaegen2-services-son-handler/testcases/data/fault_notification.json
@@ -2,7 +2,7 @@
 	"event": {
 		"commonEventHeader": {
 			"version": "4.0.1",
-			"vesEventListenerVersion": "7.0.1",
+			"vesEventListenerVersion": "7.2",
 			"domain": "fault",
 			"eventName": "Fault_RansimAgent-Wipro_RanPCIProblem",
 			"eventId": "fault000001",
@@ -22,7 +22,8 @@
 			"faultFieldsVersion": "4.0",
 			"alarmCondition": "RanPciCollisionConfusionOccurred",
 			"eventSourceType": "other",
-			"specificProblem": "Collision",
+			"eventCategory": "PCIConfusion",
+			"specificProblem": "Chn0001",
 			"eventSeverity": "CRITICAL",
 			"vfStatus": "Active",
 			"alarmAdditionalInformation": {
@@ -32,4 +33,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/dcaegen2-services-son-handler/testcases/data/performance_notification.json b/tests/dcaegen2-services-son-handler/testcases/data/performance_notification.json
index 7721163a..87d89067 100644
--- a/tests/dcaegen2-services-son-handler/testcases/data/performance_notification.json
+++ b/tests/dcaegen2-services-son-handler/testcases/data/performance_notification.json
@@ -15,7 +15,7 @@
 			"lastEpochMicrosec": 1551790542000000,
 			"nfNamingCode": "RansimAgent",
 			"nfVendorName": "Wipro",
-			"vesEventListenerVersion": "7.0.1",
+			"vesEventListenerVersion": "7.2",
 			"timeZoneOffset": "UTC-05:30"
 		},
 		"measurementFields": {
@@ -39,4 +39,4 @@
 			]
 		}
 	}
-}
\ No newline at end of file
+}