From 2896a24832902865313cd16081bba8b2d079748f Mon Sep 17 00:00:00 2001 From: krishnaa96 Date: Wed, 10 Apr 2019 14:28:53 +0530 Subject: Fix bugs and formatting issues Added minor functionality changes License formatting fixed Change-Id: Ieed4aab7562256eaf15627de0cee53cfe1cc8956 Issue-ID: DCAEGEN2-1111 Signed-off-by: krishnaa96 --- src/test/resources/anrSolutions.json | 15 +++++ src/test/resources/pmNotification.json | 94 ++++++++++++---------------- src/test/resources/pmNotification1.json | 96 +++++++++++++---------------- src/test/resources/policy_notification.json | 4 +- 4 files changed, 101 insertions(+), 108 deletions(-) create mode 100644 src/test/resources/anrSolutions.json (limited to 'src/test/resources') diff --git a/src/test/resources/anrSolutions.json b/src/test/resources/anrSolutions.json new file mode 100644 index 0000000..77291a3 --- /dev/null +++ b/src/test/resources/anrSolutions.json @@ -0,0 +1,15 @@ +[ + { + "cellId":"cell1", + "removeableNeighbors":[ + "cell2", + "cell3" + ] + }, + { + "cellId":"cell8", + "removeableNeighbors":[ + "cell9" + ] + } +] diff --git a/src/test/resources/pmNotification.json b/src/test/resources/pmNotification.json index a956ae4..7b9dbe1 100644 --- a/src/test/resources/pmNotification.json +++ b/src/test/resources/pmNotification.json @@ -1,56 +1,44 @@ - - { - "event":{ +{ + "event":{ "commonEventHeader":{ - "version":"4.0", - "domain":"measurement", - "eventName":"Measurement_RansimAgent-Wipro_HandoffMetric", - "eventId":"measurement000001", - "sequence":0, - "priority":"Normal", - "reportingEntityId":"cc305d54-75b4-431b-adb2-eb6b9e541234", - "reportingEntityName":"ncserver1", - "sourceId":"de305d54-75b4-431b-adb2-eb6b9e546456", - "sourceName":"Chn0001", - "startEpochMicrosec":1551772223000000, - "lastEpochMicrosec":1551790542000000, - "nfNamingCode":"RansimAgent", - "nfVendorName":"Wipro", - "vesEventListenerVersion":"7.0.1", - "timeZoneOffset":"UTC-05:30" + "version":"4.0.1", + "domain":"measurement", + "eventName":"Measurement_RansimAgent-Wipro_HandoffMetric", + "eventId":"measurement000001", + "sequence":0, + "priority":"Normal", + "reportingEntityId":"cc305d54-75b4-431b-adb2-eb6b9e541234", + "reportingEntityName":"ncserver1", + "sourceId":"de305d54-75b4-431b-adb2-eb6b9e546456", + "sourceName":"Chn0001", + "startEpochMicrosec":1551772223000000, + "lastEpochMicrosec":1551790542000000, + "nfNamingCode":"RansimAgent", + "nfVendorName":"Wipro", + "vesEventListenerVersion":"7.0.1", + "timeZoneOffset":"UTC-05:30" }, - "measurement":{ - "measurementInterval":180, - "additionalMeasurements":[ - { - "arrayOfNamedHashMap":[ - { - "networkId":"plmnid1" - }, - { - "InterEnbOutAtt_X2HO":"200" - }, - { - "InterEnbOutSucc_X2HO":"190" - } - ], - "name":"Chn0014" - }, - { - "arrayOfNamedHashMap":[ - { - "networkId":"plmnid1" - }, - { - "InterEnbOutAtt_X2HO":"300" - }, - { - "InterEnbOutSucc_X2HO":"210" - } - ], - "name":"Chn0013" - } - ] + "measurementFields":{ + "measurementInterval":180, + "measurementFieldsVersion":"4.0", + "additionalMeasurements":[ + { + "hashMap":{ + "networkId":"plmnid1", + "InterEnbOutAtt_X2HO":"200", + "InterEnbOutSucc_X2HO":"190" + }, + "name":"Chn0014" + }, + { + "hashMap":{ + "networkId":"plmnid1", + "InterEnbOutAtt_X2HO":"300", + "InterEnbOutSucc_X2HO":"210" + }, + "name":"Chn0013" + } + ] } - } - } + } +} \ No newline at end of file diff --git a/src/test/resources/pmNotification1.json b/src/test/resources/pmNotification1.json index 0f046e2..2ad6aa7 100644 --- a/src/test/resources/pmNotification1.json +++ b/src/test/resources/pmNotification1.json @@ -1,55 +1,45 @@ -{ - "event": { - "commonEventHeader": { - "version": "4.0", - "domain": "measurement", - "eventName": "Measurement_RansimAgent-Wipro_HandoffMetric", - "eventId": "measurement000002", - "sequence": 0, - "priority": "Normal", - "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e544567", - "reportingEntityName": "ncserver1", - "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546456", - "sourceName": "Chn0002", - "startEpochMicrosec": 1551772223000000, - "lastEpochMicrosec": 1551790542000000, - "nfNamingCode": "RansimAgent", - "nfVendorName": "Wipro", - "vesEventListenerVersion": "7.0.1", - "timeZoneOffset": "UTC-05:30" + + { + "event":{ + "commonEventHeader":{ + "version":"4.0.1", + "domain":"measurement", + "eventName":"Measurement_RansimAgent-Wipro_HandoffMetric", + "eventId":"measurement000001", + "sequence":0, + "priority":"Normal", + "reportingEntityId":"cc305d54-75b4-431b-adb2-eb6b9e541234", + "reportingEntityName":"ncserver1", + "sourceId":"de305d54-75b4-431b-adb2-eb6b9e546456", + "sourceName":"Chn0002", + "startEpochMicrosec":1551772223000000, + "lastEpochMicrosec":1551790542000000, + "nfNamingCode":"RansimAgent", + "nfVendorName":"Wipro", + "vesEventListenerVersion":"7.0.1", + "timeZoneOffset":"UTC-05:30" }, - "measurement": { - "measurementInterval": 180, - "additionalMeasurements": [ - { - "arrayOfNamedHashMap": [ - { - "networkId":"plmnid1" - }, - { - "InterEnbOutAtt_X2HO":"300" - }, - { - "InterEnbOutSucc_X2HO":"100" - } - ], - "name": "Chn0004" - }, - { - "arrayOfNamedHashMap": [ - { - "networkId":"plmnid1" - }, - { - "InterEnbOutAtt_X2HO":"250" - }, - { - "InterEnbOutSucc_X2HO":"100" - } - ], - "name": "Chn0001" - } - ] + "measurementFields":{ + "measurementInterval":180, + "measurementFieldsVersion":"4.0", + "additionalMeasurements":[ + { + "hashMap":{ + "networkId":"plmnid1", + "InterEnbOutAtt_X2HO":"300", + "InterEnbOutSucc_X2HO":"100" + }, + "name":"Chn0004" + }, + { + "hashMap":{ + "networkId":"plmnid1", + "InterEnbOutAtt_X2HO":"250", + "InterEnbOutSucc_X2HO":"100" + }, + "name":"Chn0001" + } + ] } - } - } + } +} \ No newline at end of file diff --git a/src/test/resources/policy_notification.json b/src/test/resources/policy_notification.json index 3863d1c..b99a8b9 100644 --- a/src/test/resources/policy_notification.json +++ b/src/test/resources/policy_notification.json @@ -8,11 +8,11 @@ "requestID": "a4130fd5-2291-4a83-8992-04e4c9f32731", "from": "PCIMS", "version": "1.0.2", - "payload": "{\"Configurations\":[{\"data\":{\"FAPService\":{\"alias\":\"Chn0330\",\"X0005b9Lte\":{\"phyCellIdInUse\":6,\"pnfName\":\"ncserver23\"},\"CellConfig\":{\"LTE\":{\"RAN\":{\"Common\":{\"CellIdentity\":\"Chn0330\"}}}}}}},{\"data\":{\"FAPService\":{\"alias\":\"Chn0331\",\"X0005b9Lte\":{\"phyCellIdInUse\":7,\"pnfName\":\"ncserver23\"},\"CellConfig\":{\"LTE\":{\"RAN\":{\"Common\":{\"CellIdentity\":\"Chn0331\"}}}}}}}]}", + "payload": "payloadString", "AAI": { "generic-vnf.prov-status": "ACTIVE", "generic-vnf.is-closed-loop-disabled": "false", "generic-vnf.vnf-id": "ncserver23" }, - "Action": "ModifyConfig" + "Action": "action" } -- cgit 1.2.3-korg