Implement Enhancements to the Microservice

Change-Id: Ie3b11fe14f1794fdd6880c40bc382eccbef34aa2
Issue-ID: DCAEGEN2-1109
Signed-off-by: krishna moorthy <krishna.moorthy6@wipro.com>

17 files changed, 424 insertions, 173 deletions

diff --git a/src/test/resources/AsyncRespBody.json b/src/test/resources/AsyncRespBody.json
new file mode 100644
index 0000000..08a8e51
--- /dev/null
+++ b/src/test/resources/AsyncRespBody.json
@@ -0,0 +1,23 @@
+{
+  "requestId":"9d2d790e-a5f0-11e8-98d0-529269fb1459",
+  "transactionId":"9d2d790e-a5f0-11e8-98d0-529269fb1458",
+  "statusMessage":"accepted",
+  "requestStatus":"success",
+  "solutions":{
+    "networkId":"NTWK005",
+    "pciSolutions":[
+      {
+        "cellId":"EXP001",
+        "pci":"101"
+      },
+      {
+        "cellId":"EXP002",
+        "pci":"102"
+      }
+    ],
+    "anrSolutions":[
+      {"cellId":"EXP003",
+	"removeableNeighbors":["EXP006"]}
+    ]
+  }
+}
diff --git a/src/test/resources/ClusterDetailsTest.json b/src/test/resources/ClusterDetailsTest.json
index 01839ae..24b6d8d 100644
--- a/src/test/resources/ClusterDetailsTest.json
+++ b/src/test/resources/ClusterDetailsTest.json
@@ -1,10 +1,13 @@
-[{"clusterId":"0",
-"clusterInfo":"",
- "childThreadId":986476
-},
-{"clusterId":"1",
-"clusterInfo":"",
- "childThreadId":986475
-}
+[
+	{
+		"clusterId": "0",
+		"clusterInfo": "",
+		"childThreadId": 986476
+	},
+	{
+		"clusterId": "1",
+		"clusterInfo": "",
+		"childThreadId": 986475
+	}
 ]
 
diff --git a/src/test/resources/clusterInfo1.json b/src/test/resources/clusterInfo1.json
index 685d923..d78d86e 100644
--- a/src/test/resources/clusterInfo1.json
+++ b/src/test/resources/clusterInfo1.json
@@ -1 +1,12 @@
-[{"cellId":"29","physicalCellId":209,"neighbours":"[]"},{"cellId":"25","physicalCellId":32,"neighbours":"[{\"physicalCellId\":209,\"cellId\":\"29\"}]"}]
+[
+	{
+		"cellId": "29",
+		"physicalCellId": 209,
+		"neighbours": "[]"
+	},
+	{
+		"cellId": "25",
+		"physicalCellId": 32,
+		"neighbours": "[{\"physicalCellId\":209,\"cellId\":\"29\"}]"
+	}
+]
diff --git a/src/test/resources/clusterInfo2.json b/src/test/resources/clusterInfo2.json
index 6fe6d5e..eeadde3 100644
--- a/src/test/resources/clusterInfo2.json
+++ b/src/test/resources/clusterInfo2.json
@@ -1 +1,12 @@
-[{"cellId":"45","physicalCellId":310,"neighbours":"[]"},{"cellId":"47","physicalCellId":302,"neighbours":"[{\"physicalCellId\":310,\"cellId\":\"45\"}]"}]
+[
+	{
+		"cellId": "45",
+		"physicalCellId": 310,
+		"neighbours": "[]"
+	},
+	{
+		"cellId": "47",
+		"physicalCellId": 302,
+		"neighbours": "[{\"physicalCellId\":310,\"cellId\":\"45\"}]"
+	}
+]
diff --git a/src/test/resources/clusterInfo3.json b/src/test/resources/clusterInfo3.json
index 71e7736..2188654 100644
--- a/src/test/resources/clusterInfo3.json
+++ b/src/test/resources/clusterInfo3.json
@@ -1 +1,12 @@
-[{"cellId":"72","physicalCellId":2,"neighbours":"[]"},{"cellId":"63","physicalCellId":5,"neighbours":"[{\"physicalCellId\":2,\"cellId\":\"72\"}]"}]
+[
+	{
+		"cellId": "72",
+		"physicalCellId": 2,
+		"neighbours": "[]"
+	},
+	{
+		"cellId": "63",
+		"physicalCellId": 5,
+		"neighbours": "[{\"physicalCellId\":2,\"cellId\":\"72\"}]"
+	}
+]
diff --git a/src/test/resources/clusterInfo4.json b/src/test/resources/clusterInfo4.json
index 4da8c07..f620e73 100644
--- a/src/test/resources/clusterInfo4.json
+++ b/src/test/resources/clusterInfo4.json
@@ -1 +1,12 @@
-[{"cellId":"2","physicalCellId":20,"neighbours":"[]"},{"cellId":"5","physicalCellId":30,"neighbours":"[{\"physicalCellId\":20,\"cellId\":\"2\"}]"}]
+[
+	{
+		"cellId": "2",
+		"physicalCellId": 20,
+		"neighbours": "[]"
+	},
+	{
+		"cellId": "5",
+		"physicalCellId": 30,
+		"neighbours": "[{\"physicalCellId\":20,\"cellId\":\"2\"}]"
+	}
+]
diff --git a/src/test/resources/clusterInfo5.json b/src/test/resources/clusterInfo5.json
index 7612d10..37c1a13 100644
--- a/src/test/resources/clusterInfo5.json
+++ b/src/test/resources/clusterInfo5.json
@@ -1 +1,17 @@
-[{"cellId":"44","physicalCellId":3,"neighbours":"[]"},{"cellId":"48","physicalCellId":0,"neighbours":"[{\"physicalCellId\":3,\"cellId\":\"44\"}]"},{"cellId":"45","physicalCellId":310,"neighbours":"[{\"physicalCellId\":0,\"cellId\":\"48\"}]"}]
+[
+	{
+		"cellId": "44",
+		"physicalCellId": 3,
+		"neighbours": "[]"
+	},
+	{
+		"cellId": "48",
+		"physicalCellId": 0,
+		"neighbours": "[{\"physicalCellId\":3,\"cellId\":\"44\"}]"
+	},
+	{
+		"cellId": "45",
+		"physicalCellId": 310,
+		"neighbours": "[{\"physicalCellId\":0,\"cellId\":\"48\"}]"
+	}
+]
diff --git a/src/test/resources/clusterInfo6.json b/src/test/resources/clusterInfo6.json
index 88e0763..a49ab9a 100644
--- a/src/test/resources/clusterInfo6.json
+++ b/src/test/resources/clusterInfo6.json
@@ -1 +1,17 @@
-[{"cellId":"48","physicalCellId":0,"neighbours":"[]"},{"cellId":"45","physicalCellId":310,"neighbours":"[{\"physicalCellId\":0,\"cellId\":\"48\"}]"},{"cellId":"47","physicalCellId":302,"neighbours":"[{\"physicalCellId\":310,\"cellId\":\"45\"}]"}]
+[
+	{
+		"cellId": "48",
+		"physicalCellId": 0,
+		"neighbours": "[]"
+	},
+	{
+		"cellId": "45",
+		"physicalCellId": 310,
+		"neighbours": "[{\"physicalCellId\":0,\"cellId\":\"48\"}]"
+	},
+	{
+		"cellId": "47",
+		"physicalCellId": 302,
+		"neighbours": "[{\"physicalCellId\":310,\"cellId\":\"45\"}]"
+	}
+]
diff --git a/src/test/resources/clusterInfo7.json b/src/test/resources/clusterInfo7.json
index 1d8dc7d..b9ebc65 100644
--- a/src/test/resources/clusterInfo7.json
+++ b/src/test/resources/clusterInfo7.json
@@ -1 +1,12 @@
-[{"cellId":"82","physicalCellId":32,"neighbours":"[]"},{"cellId":"81","physicalCellId":31,"neighbours":"[{\"physicalCellId\":32,\"cellId\":\"82\"}]"}]
+[
+	{
+		"cellId": "82",
+		"physicalCellId": 32,
+		"neighbours": "[]"
+	},
+	{
+		"cellId": "81",
+		"physicalCellId": 31,
+		"neighbours": "[{\"physicalCellId\":32,\"cellId\":\"82\"}]"
+	}
+]
diff --git a/src/test/resources/hoDetails.json b/src/test/resources/hoDetails.json
new file mode 100644
index 0000000..be8f161
--- /dev/null
+++ b/src/test/resources/hoDetails.json
@@ -0,0 +1,14 @@
+[
+  {
+    "dstCellId":"Chn0014",
+    "attemptsCount":200,
+    "successCount":190,
+    "successRate":95
+  },
+  {
+    "dstCellId":"Chn0013",
+    "attemptsCount":300,
+    "successCount":210,
+    "successRate":70
+  }
+]
diff --git a/src/test/resources/notification1.json b/src/test/resources/notification1.json
index 87f60e6..ee6c847 100644
--- a/src/test/resources/notification1.json
+++ b/src/test/resources/notification1.json
@@ -1,45 +1,45 @@
 {
-   "requestID":"9d2d790e-a5f0-11e8-98d0-529269fb1459",
-   "AAI":{
-
-   },
-   "from":"SDNR",
-   "version":"1.0.2",
-   "Action":"NeighborListModified",
-   "Payload":{
-      "RadioAccess":{
-         "FAPServiceNumberOfEntries":"1",
-         "FAPServiceList":[
-            {
-               "alias":"45",
-               "X0005b9Lte":{
-                  "phyCellIdInUse":"310",
-                  "pnfName":"ncserver2"
-               },
-               "CellConfig":{
-                  "LTE":{
-                     "RAN":{
-                        "CellIdentity":"45",
-                        "NeighborListInUse":{
-                           "LTECellNumberOfEntries":"1",
-                           "LTENeighborListInUseLTECell":[
-                              {
-                                 "pnfName":"ncserver1",
-                                 "enable":"true",
-                                 "alias":"48",
-                                 "mustInclude":"true",
-                                 "plmnid":"ran-1",
-                                 "cid":"48",
-                                 "phyCellId":"0",
-                                 "blacklisted":"false"
-                              }
-                           ]
-                        }
-                     }
-                  }
-               }
-            }
-         ]
-      }
-   }
+	"requestID": "9d2d790e-a5f0-11e8-98d0-529269fb1459",
+	"AAI": {
+		
+	},
+	"from": "SDNR",
+	"version": "1.0.2",
+	"Action": "NeighborListModified",
+	"Payload": {
+		"RadioAccess": {
+			"FAPServiceNumberOfEntries": "1",
+			"FAPServiceList": [
+				{
+					"alias": "45",
+					"X0005b9Lte": {
+						"phyCellIdInUse": "310",
+						"pnfName": "ncserver2"
+					},
+					"CellConfig": {
+						"LTE": {
+							"RAN": {
+								"CellIdentity": "45",
+								"NeighborListInUse": {
+									"LTECellNumberOfEntries": "1",
+									"LTENeighborListInUseLTECell": [
+										{
+											"pnfName": "ncserver1",
+											"enable": "true",
+											"alias": "48",
+											"mustInclude": "true",
+											"plmnid": "ran-1",
+											"cid": "48",
+											"phyCellId": "0",
+											"blacklisted": "false"
+										}
+									]
+								}
+							}
+						}
+					}
+				}
+			]
+		}
+	}
 }
diff --git a/src/test/resources/notification2.json b/src/test/resources/notification2.json
index 702b643..7d0a8ad 100644
--- a/src/test/resources/notification2.json
+++ b/src/test/resources/notification2.json
@@ -1,55 +1,55 @@
 {
-   "requestID":"9d2d790e-a5f0-11e8-98d0-529269fb1459",
-   "AAI":{
-
-   },
-   "from":"SDNR",
-   "version":"1.0.2",
-   "Action":"NeighborListModified",
-   "Payload":{
-      "RadioAccess":{
-         "FAPServiceNumberOfEntries":"1",
-         "FAPServiceList":[
-            {
-               "alias":"120",
-               "X0005b9Lte":{
-                  "phyCellIdInUse":"2",
-                  "pnfName":"ncserver2"
-               },
-               "CellConfig":{
-                  "LTE":{
-                     "RAN":{
-                        "CellIdentity":"120",
-                        "NeighborListInUse":{
-                           "LTECellNumberOfEntries":"3",
-                           "LTENeighborListInUseLTECell":[
-                              {
-                                 "pnfName":"ncserver1",
-                                 "enable":"true",
-                                 "alias":"123",
-                                 "mustInclude":"true",
-                                 "plmnid":"ran-1",
-                                 "cid":"123",
-                                 "phyCellId":"6",
-                                 "blacklisted":"false"
-                              },
-                              {
-                                 "pnfName":"ncserver1",
-                                 "enable":"true",
-                                 "alias":"49",
-                                 "mustInclude":"true",
-                                 "plmnid":"ran-1",
-                                 "cid":"124",
-                                 "phyCellId":"4",
-                                 "blacklisted":"false"
-                              }
-                           ]
-                        }
-                     }
-                  }
-               }
-            }
-         ]
-      }
-   }
+	"requestID": "9d2d790e-a5f0-11e8-98d0-529269fb1459",
+	"AAI": {
+		
+	},
+	"from": "SDNR",
+	"version": "1.0.2",
+	"Action": "NeighborListModified",
+	"Payload": {
+		"RadioAccess": {
+			"FAPServiceNumberOfEntries": "1",
+			"FAPServiceList": [
+				{
+					"alias": "120",
+					"X0005b9Lte": {
+						"phyCellIdInUse": "2",
+						"pnfName": "ncserver2"
+					},
+					"CellConfig": {
+						"LTE": {
+							"RAN": {
+								"CellIdentity": "120",
+								"NeighborListInUse": {
+									"LTECellNumberOfEntries": "3",
+									"LTENeighborListInUseLTECell": [
+										{
+											"pnfName": "ncserver1",
+											"enable": "true",
+											"alias": "123",
+											"mustInclude": "true",
+											"plmnid": "ran-1",
+											"cid": "123",
+											"phyCellId": "6",
+											"blacklisted": "false"
+										},
+										{
+											"pnfName": "ncserver1",
+											"enable": "true",
+											"alias": "49",
+											"mustInclude": "true",
+											"plmnid": "ran-1",
+											"cid": "124",
+											"phyCellId": "4",
+											"blacklisted": "false"
+										}
+									]
+								}
+							}
+						}
+					}
+				}
+			]
+		}
+	}
 }
diff --git a/src/test/resources/notification3.json b/src/test/resources/notification3.json
index 4a3a2a0..2588f3c 100644
--- a/src/test/resources/notification3.json
+++ b/src/test/resources/notification3.json
@@ -1,45 +1,45 @@
 {
-   "requestID":"9d2d790e-a5f0-11e8-98d0-529269fb1459",
-   "AAI":{
-
-   },
-   "from":"SDNR",
-   "version":"1.0.2",
-   "Action":"NeighborListModified",
-   "Payload":{
-      "RadioAccess":{
-         "FAPServiceNumberOfEntries":"1",
-         "FAPServiceList":[
-            {
-               "alias":"81",
-               "X0005b9Lte":{
-                  "phyCellIdInUse":"31",
-                  "pnfName":"ncserver2"
-               },
-               "CellConfig":{
-                  "LTE":{
-                     "RAN":{
-                        "CellIdentity":"81",
-                        "NeighborListInUse":{
-                           "LTECellNumberOfEntries":"1",
-                           "LTENeighborListInUseLTECell":[
-                              {
-                                 "pnfName":"ncserver1",
-                                 "enable":"true",
-                                 "alias":"82",
-                                 "mustInclude":"true",
-                                 "plmnid":"ran-1",
-                                 "cid":"82",
-                                 "phyCellId":"32",
-                                 "blacklisted":"false"
-                              }
-                           ]
-                        }
-                     }
-                  }
-               }
-            }
-         ]
-      }
-   }
+	"requestID": "9d2d790e-a5f0-11e8-98d0-529269fb1459",
+	"AAI": {
+		
+	},
+	"from": "SDNR",
+	"version": "1.0.2",
+	"Action": "NeighborListModified",
+	"Payload": {
+		"RadioAccess": {
+			"FAPServiceNumberOfEntries": "1",
+			"FAPServiceList": [
+				{
+					"alias": "81",
+					"X0005b9Lte": {
+						"phyCellIdInUse": "31",
+						"pnfName": "ncserver2"
+					},
+					"CellConfig": {
+						"LTE": {
+							"RAN": {
+								"CellIdentity": "81",
+								"NeighborListInUse": {
+									"LTECellNumberOfEntries": "1",
+									"LTENeighborListInUseLTECell": [
+										{
+											"pnfName": "ncserver1",
+											"enable": "true",
+											"alias": "82",
+											"mustInclude": "true",
+											"plmnid": "ran-1",
+											"cid": "82",
+											"phyCellId": "32",
+											"blacklisted": "false"
+										}
+									]
+								}
+							}
+						}
+					}
+				}
+			]
+		}
+	}
 }
diff --git a/src/test/resources/pmNotification.json b/src/test/resources/pmNotification.json
new file mode 100644
index 0000000..a956ae4
--- /dev/null
+++ b/src/test/resources/pmNotification.json
@@ -0,0 +1,56 @@
+
+  {
+    "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"
+      },
+      "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"
+          }
+        ]
+      }
+    }
+  }
diff --git a/src/test/resources/pmNotification1.json b/src/test/resources/pmNotification1.json
new file mode 100644
index 0000000..0f046e2
--- /dev/null
+++ b/src/test/resources/pmNotification1.json
@@ -0,0 +1,55 @@
+{
+    "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"
+      },
+      "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"
+          }
+        ]
+      }
+    }
+  }
diff --git a/src/test/resources/policy_notification.json b/src/test/resources/policy_notification.json
index b9a6910..3863d1c 100644
--- a/src/test/resources/policy_notification.json
+++ b/src/test/resources/policy_notification.json
@@ -1,20 +1,18 @@
 {
-
-    "closedLoopControlName":"ControlLoop-vPCI-fb41f388-a5f2-11e8-98d0-529269fb1459",
-    "closedLoopAlarmStart":1542445563201,
-    "closedLoopEventClient":"microservice.PCI",
-    "closedLoopEventStatus":"ONSET",
-    "target_type":"VNF",
-    "target":"generic-vnf.vnf-id",
-    "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\"}}}}}}}]}",
-    "AAI":{
-        "generic-vnf.prov-status":"ACTIVE",
-        "generic-vnf.is-closed-loop-disabled":"false",
-        "generic-vnf.vnf-id":"ncserver23"
-    },
-    "Action":"ModifyConfig"
-
+	"closedLoopControlName": "ControlLoop-vPCI-fb41f388-a5f2-11e8-98d0-529269fb1459",
+	"closedLoopAlarmStart": 1542445563201,
+	"closedLoopEventClient": "microservice.PCI",
+	"closedLoopEventStatus": "ONSET",
+	"target_type": "VNF",
+	"target": "generic-vnf.vnf-id",
+	"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\"}}}}}}}]}",
+	"AAI": {
+		"generic-vnf.prov-status": "ACTIVE",
+		"generic-vnf.is-closed-loop-disabled": "false",
+		"generic-vnf.vnf-id": "ncserver23"
+	},
+	"Action": "ModifyConfig"
 }
diff --git a/src/test/resources/solutions.json b/src/test/resources/solutions.json
index cf82283..8f6f41f 100644
--- a/src/test/resources/solutions.json
+++ b/src/test/resources/solutions.json
@@ -1 +1,16 @@
-[{"startTime":"2016-10-01T00:30+01:00","finishTime":"2016-10-01T00:40+01.00","networkId":"NTWK005","pciSolutions":[{"cellId":"EXP001","pci":"101"},{"cellId":"EXP002","pci":"102"}]}]
+{
+    "networkId":"NTWK005",
+    "pciSolutions":[
+      {
+        "cellId":"EXP001",
+        "pci":"101"
+      },
+      {
+        "cellId":"EXP002",
+        "pci":"102"
+      }
+    ],
+    "anrSolutions":[
+
+    ]
+}