Update schema and format java files

Issue-ID: INT-1892
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: Ib35c35cf7ac7a858311618e741c9327d7630aed6

2 files changed, 1003 insertions, 1072 deletions

diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/handler/RansimPciHandler.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/handler/RansimPciHandler.java
index e185108..881d19b 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/handler/RansimPciHandler.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/handler/RansimPciHandler.java
@@ -20,6 +20,8 @@
 
 package org.onap.ransim.rest.api.handler;
 
+import com.google.gson.Gson;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -32,6 +34,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+
 import javax.websocket.Session;
 
 import org.apache.log4j.Logger;
@@ -60,392 +63,355 @@ import org.onap.ransim.websocket.server.RansimWebSocketServer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.google.gson.Gson;
 
 @Service
 public class RansimPciHandler {
-	
-	static Logger log = Logger.getLogger(RansimPciHandler.class
-			.getName());
-	
-	@Autowired
-	RansimRepositoryService ransimRepo ;
-	
-	@Autowired
-	RansimControllerServices rscServices;
-	
-	@Autowired
-	RANSliceConfigService ranSliceConfigService;
-	
-	static Map<String, String> globalFmCellIdUuidMap = new ConcurrentHashMap<String, String>();
-	static Map<String, String> globalPmCellIdUuidMap = new ConcurrentHashMap<String, String>();
-
-	Set<String> cellsWithIssues = new HashSet<>();
-
-	List<PmParameters> pmParameters = new ArrayList<PmParameters>();
-	int next = 0;
-
-	
-
-	public FmAlarmInfo setCollisionConfusionFromFile(String cellNodeId) {
-
-		FmAlarmInfo result = new FmAlarmInfo();
-
-		try {
-
-			boolean collisionDetected = false;
-			boolean confusionDetected = false;
-			List<Long> nbrPcis = new ArrayList<Long>();
-			List<Long> ConfusionPcis = new ArrayList<Long>();
-			int collisionCount = 0;
-			int confusionCount = 0;
-			CellDetails currentCell = ransimRepo.getCellDetail(cellNodeId);
-			log.info("Setting confusion/collision for Cell :" + cellNodeId);
-
-			GetNeighborList cellNbrDetails = generateNeighborList(cellNodeId);
-
-			for (CellDetails firstLevelNbr : cellNbrDetails.getCellsWithHo()) {
-				if (nbrPcis
-						.contains((Long)firstLevelNbr.getPhysicalCellId())) {
-					confusionDetected = true;
-					if (ConfusionPcis.contains(firstLevelNbr
-							.getPhysicalCellId())) {
-						confusionCount++;
-					} else {
-						ConfusionPcis.add(firstLevelNbr.getPhysicalCellId());
-						confusionCount = confusionCount + 2;
-					}
-
-				} else {
-					nbrPcis.add((Long)firstLevelNbr.getPhysicalCellId());
-				}
-
-				if (currentCell.getPhysicalCellId() == firstLevelNbr
-						.getPhysicalCellId()) {
-					collisionDetected = true;
-					collisionCount++;
-				}
-			}
-
-			currentCell.setPciCollisionDetected(collisionDetected);
-			currentCell.setPciConfusionDetected(confusionDetected);
-
-			if (!currentCell.isPciCollisionDetected()
-					&& !currentCell.isPciConfusionDetected()) {
-				currentCell.setColor("#BFBFBF"); // GREY - No Issues
-				result.setProblem("No Issues");
-			} else if (currentCell.isPciCollisionDetected()
-					&& currentCell.isPciConfusionDetected()) {
-				currentCell.setColor("#C30000"); // BROWN - Cell has both
-													// collision & confusion
-				result.setProblem("CollisionAndConfusion");
-
-			} else if (currentCell.isPciCollisionDetected()) {
-				currentCell.setColor("#FF0000"); // RED - Cell has collision
-				result.setProblem("Collision");
-
-			} else if (currentCell.isPciConfusionDetected()) {
-				currentCell.setColor("#E88B00"); // ORANGE - Cell has confusion
-				result.setProblem("Confusion");
-
-			} else {
-				currentCell.setColor("#BFBFBF"); // GREY - No Issues
-				result.setProblem("No Issues");
-			}
-
-			result.setCollisionCount("" + collisionCount);
-			result.setConfusionCount("" + confusionCount);
-
-			ransimRepo.mergeCellDetails(currentCell);
-
-			return result;
-
-		} catch (Exception e2) {
-			log.info("setCollisionConfusionFromFile :", e2);
-
-			return null;
-		}
-
-	}
-
-	/**
-	 * Generates separate list of neighbors with and without hand-off for a
-	 * cell.
-	 * 
-	 * @param nodeId
-	 *            Node Id of cell for which the neighbor list is generated
-	 * @return Returns GetNeighborList object
-	 */
-	public GetNeighborList generateNeighborList(String nodeId) {
-
-	
-		try {
-			log.info("inside generateNeighborList for: " + nodeId);
-			CellNeighbor neighborList = ransimRepo.getCellNeighbor(nodeId);
-			GetNeighborList result = new GetNeighborList();
-			 neighborList.display();
-			List<CellDetails> cellsWithNoHO = new ArrayList<CellDetails>();
-			List<CellDetails> cellsWithHO = new ArrayList<CellDetails>();
-
-			List<NeighborDetails> nbrList = new ArrayList<>();
-			if(neighborList != null) {
-				nbrList.addAll(
-						 neighborList.getNeighborList());
-			}
-
-			for (int i = 0; i < nbrList.size(); i++) {
-
-				CellDetails nbr = ransimRepo.getCellDetail(nbrList
-						.get(i).getNeigbor().getNeighborCell());
-
-				if (nbrList.get(i).isBlacklisted()) {
-					cellsWithNoHO.add(nbr);
-				} else {
-					cellsWithHO.add(nbr);
-				}
-
-			}
-
-			result.setNodeId(nodeId);
-			result.setCellsWithHo(cellsWithHO);
-			result.setCellsWithNoHo(cellsWithNoHO);
-			return result;
-
-		} catch (Exception eu) {
-			log.info("/getNeighborList", eu);
-			return null;
-		}
-	}
-
-	public void checkCollisionAfterModify() {
-		try {
-			List<CellDetails> checkCollisionConfusion = ransimRepo.getCellsWithCollisionOrConfusion();
-
-			for (int i = 0; i < checkCollisionConfusion.size(); i++) {
-				log.info(checkCollisionConfusion.get(i).getNodeId());
-				setCollisionConfusionFromFile(checkCollisionConfusion.get(i)
-						.getNodeId());
-			}
-		} catch (Exception eu) {
-			log.info("checkCollisionAfterModify", eu);
-		}
-	}
-
-	/**
-	 * It updates the cell with its new neighbor list and PCI and updates the
-	 * change in a database.
-	 * 
-	 * @param nodeId
-	 *            node Id of the cell
-	 * @param physicalCellId
-	 *            PCI number of the cell
-	 * @param newNbrs
-	 *            List of new neighbors for the cell
-	 * @param source
-	 *            The source from which cell modification has been triggered
-	 * @return returns success or failure message
-	 */
-	public int modifyCellFunction(String nodeId, long physicalCellId,
-			List<NeighborDetails> newNbrs, String source) {
-
-		int result = 111;
-
-		log.info("modifyCellFunction nodeId:" + nodeId + ", physicalCellId:"
-				+ physicalCellId);
-		CellDetails modifyCell = ransimRepo.getCellDetail(nodeId);
-
-		if (modifyCell != null) {
-			if (physicalCellId < 0
-					|| physicalCellId > RansimControllerServices.maxPciValueAllowed) {
-				log.info("NewPhysicalCellId is empty or invalid");
-				result = 400;
-			} else {
-				long oldPciId = modifyCell.getPhysicalCellId();
-				if (physicalCellId != oldPciId) {
-					updatePciOperationsTable(nodeId, source, physicalCellId,
-							oldPciId);
-
-					modifyCell.setPhysicalCellId(physicalCellId);
-					ransimRepo.mergeCellDetails(modifyCell);
-				}
-
-				CellNeighbor neighbors = ransimRepo.getCellNeighbor(nodeId);
-				List<NeighborDetails> oldNbrList = new ArrayList<NeighborDetails>(
-						neighbors.getNeighborList());
-				List<NeighborDetails> oldNbrListWithHo = new ArrayList<NeighborDetails>();
-
-				for (NeighborDetails cell : oldNbrList) {
-					if (!cell.isBlacklisted()) {
-						oldNbrListWithHo.add(cell);
-					}
-				}
-
-				boolean flag = false;
-
-				List<NeighborDetails> addedNbrs = new ArrayList<NeighborDetails>();
-				List<NeighborDetails> deletedNbrs = new ArrayList<NeighborDetails>();
-
-				String nbrsDel = "";
-
-				List<String> oldNbrsArr = new ArrayList<String>();
-				for (NeighborDetails cell : oldNbrListWithHo) {
-					oldNbrsArr.add(cell.getNeigbor().getNeighborCell());
-				}
-
-				List<String> newNbrsArr = new ArrayList<String>();
-				for (NeighborDetails cell : newNbrs) {
-					newNbrsArr.add(cell.getNeigbor().getNeighborCell());
-				}
-
-				for (NeighborDetails cell : oldNbrListWithHo) {
-
-					if (!newNbrsArr.contains(cell.getNeigbor()
-							.getNeighborCell())) {
-						if (!flag) {
-							flag = true;
-						}
-						deletedNbrs.add(cell);
-						if (nbrsDel == "") {
-							nbrsDel = cell.getNeigbor().getNeighborCell();
-						} else {
-							nbrsDel += ","
-									+ cell.getNeigbor().getNeighborCell();
-						}
-						log.info("deleted cell: "
-								+ cell.getNeigbor().getNeighborCell()
-								+ cell.isBlacklisted());
-
-					}
-				}
-
-				String nbrsAdd = "";
-
-				for (NeighborDetails cell : newNbrs) {
-					if (cell.isBlacklisted()) {
-						addedNbrs.add(cell);
-					} else {
-						if (!oldNbrsArr.contains(cell.getNeigbor()
-								.getNeighborCell())) {
-							addedNbrs.add(cell);
-							if (nbrsAdd == "") {
-								nbrsAdd = cell.getNeigbor().getNeighborCell();
-							} else {
-								nbrsAdd += ","
-										+ cell.getNeigbor().getNeighborCell();
-							}
-							log.info("added cell: "
-									+ cell.getNeigbor().getNeighborCell()
-									+ cell.isBlacklisted());
-						}
-					}
-
-				}
-				List<NeighborDetails> newNeighborList = new ArrayList<NeighborDetails>(
-						oldNbrList);
-				for (NeighborDetails cell : deletedNbrs) {
-					NeighborDetails removeHo = new NeighborDetails(
-							cell.getNeigbor(), true);
-					ransimRepo.mergeNeighborDetails(removeHo);
-					newNeighborList.add(removeHo);
-				}
-
-				for (NeighborDetails cell : addedNbrs) {
-					ransimRepo.mergeNeighborDetails(cell);
-					newNeighborList.add(cell);
-				}
-
-				if (!flag) {
-					if (newNbrs.size() != oldNbrList.size()) {
-						flag = true;
-					}
-				}
-
-				if (flag) {
-					updateNbrsOperationsTable(nodeId, source, nbrsAdd, nbrsDel);
-				}
-
-				if (newNbrs != null) {
-					neighbors.getNeighborList().clear();
-					Set<NeighborDetails> updatedNbrList = new HashSet<NeighborDetails>(
-							newNeighborList);
-					neighbors.setNeighborList(updatedNbrList);
-					ransimRepo.mergeCellNeighbor(neighbors);
-				}
-
-				generateFmData(source, modifyCell, newNeighborList);
-
-				result = 200;
-			}
-
-
-		} else {
-			result = 400;
-		}
-
-		return result;
-	}
-
-	public void checkCellsWithIssue() {
-
-		
-		try {
-
-			for (String id : cellsWithIssues) {
-				CellDetails currentCell = ransimRepo.getCellDetail(id);
-				FmMessage fmDataMessage = new FmMessage();
-				List<EventFm> data = new ArrayList<EventFm>();
-
-				if (!currentCell.isPciCollisionDetected()) {
-					if (!currentCell.isPciConfusionDetected()) {
-
-						cellsWithIssues.remove(id);
-						CommonEventHeaderFm commonEventHeader = new CommonEventHeaderFm();
-						FaultFields faultFields = new FaultFields();
-
-						commonEventHeader.setStartEpochMicrosec(System
-								.currentTimeMillis() * 1000);
-						commonEventHeader
-								.setSourceName(currentCell.getNodeId());
-						commonEventHeader.setReportingEntityName(currentCell
-								.getServerId());
-						String uuid = globalFmCellIdUuidMap.get(currentCell
-								.getNodeId());
-						commonEventHeader.setSourceUuid(uuid);
-
-						faultFields
-								.setAlarmCondition("RanPciCollisionConfusionOccurred");
-						faultFields.setEventSeverity("NORMAL");
-						faultFields.setEventSourceType("other");
-						faultFields.setSpecificProblem("Problem Solved");
-
-						commonEventHeader.setLastEpochMicrosec(System
-								.currentTimeMillis() * 1000);
-
-						EventFm event = new EventFm();
-						event.setCommonEventHeader(commonEventHeader);
-						event.setFaultFields(faultFields);
-
-						data.add(event);
-					}
-				}
-
-				fmDataMessage.setFmEventList(data);
-
-				if (!data.isEmpty()) {
-					sendFmData(currentCell.getServerId(), fmDataMessage);
-				}
-
-			}
-
-		} catch (Exception eu) {
-			log.error("Exception:", eu);
-		} 
-	}
-
-	public void updatePciOperationsTable(String nodeId, String source, long physicalCellId, long oldPciId) {
-        
+
+    static Logger log = Logger.getLogger(RansimPciHandler.class.getName());
+
+    @Autowired
+    RansimRepositoryService ransimRepo;
+
+    @Autowired
+    RansimControllerServices rscServices;
+
+    @Autowired
+    RANSliceConfigService ranSliceConfigService;
+
+    static Map<String, String> globalFmCellIdUuidMap = new ConcurrentHashMap<String, String>();
+    static Map<String, String> globalPmCellIdUuidMap = new ConcurrentHashMap<String, String>();
+
+    Set<String> cellsWithIssues = new HashSet<>();
+
+    List<PmParameters> pmParameters = new ArrayList<PmParameters>();
+    int next = 0;
+
+    public FmAlarmInfo setCollisionConfusionFromFile(String cellNodeId) {
+
+        FmAlarmInfo result = new FmAlarmInfo();
+
+        try {
+
+            boolean collisionDetected = false;
+            boolean confusionDetected = false;
+            List<Long> nbrPcis = new ArrayList<Long>();
+            List<Long> ConfusionPcis = new ArrayList<Long>();
+            int collisionCount = 0;
+            int confusionCount = 0;
+            CellDetails currentCell = ransimRepo.getCellDetail(cellNodeId);
+            log.info("Setting confusion/collision for Cell :" + cellNodeId);
+
+            GetNeighborList cellNbrDetails = generateNeighborList(cellNodeId);
+
+            for (CellDetails firstLevelNbr : cellNbrDetails.getCellsWithHo()) {
+                if (nbrPcis.contains((Long) firstLevelNbr.getPhysicalCellId())) {
+                    confusionDetected = true;
+                    if (ConfusionPcis.contains(firstLevelNbr.getPhysicalCellId())) {
+                        confusionCount++;
+                    } else {
+                        ConfusionPcis.add(firstLevelNbr.getPhysicalCellId());
+                        confusionCount = confusionCount + 2;
+                    }
+
+                } else {
+                    nbrPcis.add((Long) firstLevelNbr.getPhysicalCellId());
+                }
+
+                if (currentCell.getPhysicalCellId() == firstLevelNbr.getPhysicalCellId()) {
+                    collisionDetected = true;
+                    collisionCount++;
+                }
+            }
+
+            currentCell.setPciCollisionDetected(collisionDetected);
+            currentCell.setPciConfusionDetected(confusionDetected);
+
+            if (!currentCell.isPciCollisionDetected() && !currentCell.isPciConfusionDetected()) {
+                currentCell.setColor("#BFBFBF"); // GREY - No Issues
+                result.setProblem("No Issues");
+            } else if (currentCell.isPciCollisionDetected() && currentCell.isPciConfusionDetected()) {
+                currentCell.setColor("#C30000"); // BROWN - Cell has both
+                                                 // collision & confusion
+                result.setProblem("CollisionAndConfusion");
+
+            } else if (currentCell.isPciCollisionDetected()) {
+                currentCell.setColor("#FF0000"); // RED - Cell has collision
+                result.setProblem("Collision");
+
+            } else if (currentCell.isPciConfusionDetected()) {
+                currentCell.setColor("#E88B00"); // ORANGE - Cell has confusion
+                result.setProblem("Confusion");
+
+            } else {
+                currentCell.setColor("#BFBFBF"); // GREY - No Issues
+                result.setProblem("No Issues");
+            }
+
+            result.setCollisionCount("" + collisionCount);
+            result.setConfusionCount("" + confusionCount);
+
+            ransimRepo.mergeCellDetails(currentCell);
+
+            return result;
+
+        } catch (Exception e2) {
+            log.info("setCollisionConfusionFromFile :", e2);
+
+            return null;
+        }
+
+    }
+
+    /**
+     * Generates separate list of neighbors with and without hand-off for a
+     * cell.
+     *
+     * @param nodeId
+     *        Node Id of cell for which the neighbor list is generated
+     * @return Returns GetNeighborList object
+     */
+    public GetNeighborList generateNeighborList(String nodeId) {
+
+        try {
+            log.info("inside generateNeighborList for: " + nodeId);
+            CellNeighbor neighborList = ransimRepo.getCellNeighbor(nodeId);
+            GetNeighborList result = new GetNeighborList();
+            neighborList.display();
+            List<CellDetails> cellsWithNoHO = new ArrayList<CellDetails>();
+            List<CellDetails> cellsWithHO = new ArrayList<CellDetails>();
+
+            List<NeighborDetails> nbrList = new ArrayList<>();
+            if (neighborList != null) {
+                nbrList.addAll(neighborList.getNeighborList());
+            }
+
+            for (int i = 0; i < nbrList.size(); i++) {
+
+                CellDetails nbr = ransimRepo.getCellDetail(nbrList.get(i).getNeigbor().getNeighborCell());
+
+                if (nbrList.get(i).isBlacklisted()) {
+                    cellsWithNoHO.add(nbr);
+                } else {
+                    cellsWithHO.add(nbr);
+                }
+
+            }
+
+            result.setNodeId(nodeId);
+            result.setCellsWithHo(cellsWithHO);
+            result.setCellsWithNoHo(cellsWithNoHO);
+            return result;
+
+        } catch (Exception eu) {
+            log.info("/getNeighborList", eu);
+            return null;
+        }
+    }
+
+    public void checkCollisionAfterModify() {
+        try {
+            List<CellDetails> checkCollisionConfusion = ransimRepo.getCellsWithCollisionOrConfusion();
+
+            for (int i = 0; i < checkCollisionConfusion.size(); i++) {
+                log.info(checkCollisionConfusion.get(i).getNodeId());
+                setCollisionConfusionFromFile(checkCollisionConfusion.get(i).getNodeId());
+            }
+        } catch (Exception eu) {
+            log.info("checkCollisionAfterModify", eu);
+        }
+    }
+
+    /**
+     * It updates the cell with its new neighbor list and PCI and updates the
+     * change in a database.
+     *
+     * @param nodeId
+     *        node Id of the cell
+     * @param physicalCellId
+     *        PCI number of the cell
+     * @param newNbrs
+     *        List of new neighbors for the cell
+     * @param source
+     *        The source from which cell modification has been triggered
+     * @return returns success or failure message
+     */
+    public int modifyCellFunction(String nodeId, long physicalCellId, List<NeighborDetails> newNbrs, String source) {
+
+        int result = 111;
+
+        log.info("modifyCellFunction nodeId:" + nodeId + ", physicalCellId:" + physicalCellId);
+        CellDetails modifyCell = ransimRepo.getCellDetail(nodeId);
+
+        if (modifyCell != null) {
+            if (physicalCellId < 0 || physicalCellId > RansimControllerServices.maxPciValueAllowed) {
+                log.info("NewPhysicalCellId is empty or invalid");
+                result = 400;
+            } else {
+                long oldPciId = modifyCell.getPhysicalCellId();
+                if (physicalCellId != oldPciId) {
+                    updatePciOperationsTable(nodeId, source, physicalCellId, oldPciId);
+
+                    modifyCell.setPhysicalCellId(physicalCellId);
+                    ransimRepo.mergeCellDetails(modifyCell);
+                }
+
+                CellNeighbor neighbors = ransimRepo.getCellNeighbor(nodeId);
+                List<NeighborDetails> oldNbrList = new ArrayList<NeighborDetails>(neighbors.getNeighborList());
+                List<NeighborDetails> oldNbrListWithHo = new ArrayList<NeighborDetails>();
+
+                for (NeighborDetails cell : oldNbrList) {
+                    if (!cell.isBlacklisted()) {
+                        oldNbrListWithHo.add(cell);
+                    }
+                }
+
+                boolean flag = false;
+
+                List<NeighborDetails> addedNbrs = new ArrayList<NeighborDetails>();
+                List<NeighborDetails> deletedNbrs = new ArrayList<NeighborDetails>();
+
+                String nbrsDel = "";
+
+                List<String> oldNbrsArr = new ArrayList<String>();
+                for (NeighborDetails cell : oldNbrListWithHo) {
+                    oldNbrsArr.add(cell.getNeigbor().getNeighborCell());
+                }
+
+                List<String> newNbrsArr = new ArrayList<String>();
+                for (NeighborDetails cell : newNbrs) {
+                    newNbrsArr.add(cell.getNeigbor().getNeighborCell());
+                }
+
+                for (NeighborDetails cell : oldNbrListWithHo) {
+
+                    if (!newNbrsArr.contains(cell.getNeigbor().getNeighborCell())) {
+                        if (!flag) {
+                            flag = true;
+                        }
+                        deletedNbrs.add(cell);
+                        if (nbrsDel == "") {
+                            nbrsDel = cell.getNeigbor().getNeighborCell();
+                        } else {
+                            nbrsDel += "," + cell.getNeigbor().getNeighborCell();
+                        }
+                        log.info("deleted cell: " + cell.getNeigbor().getNeighborCell() + cell.isBlacklisted());
+
+                    }
+                }
+
+                String nbrsAdd = "";
+
+                for (NeighborDetails cell : newNbrs) {
+                    if (cell.isBlacklisted()) {
+                        addedNbrs.add(cell);
+                    } else {
+                        if (!oldNbrsArr.contains(cell.getNeigbor().getNeighborCell())) {
+                            addedNbrs.add(cell);
+                            if (nbrsAdd == "") {
+                                nbrsAdd = cell.getNeigbor().getNeighborCell();
+                            } else {
+                                nbrsAdd += "," + cell.getNeigbor().getNeighborCell();
+                            }
+                            log.info("added cell: " + cell.getNeigbor().getNeighborCell() + cell.isBlacklisted());
+                        }
+                    }
+
+                }
+                List<NeighborDetails> newNeighborList = new ArrayList<NeighborDetails>(oldNbrList);
+                for (NeighborDetails cell : deletedNbrs) {
+                    NeighborDetails removeHo = new NeighborDetails(cell.getNeigbor(), true);
+                    ransimRepo.mergeNeighborDetails(removeHo);
+                    newNeighborList.add(removeHo);
+                }
+
+                for (NeighborDetails cell : addedNbrs) {
+                    ransimRepo.mergeNeighborDetails(cell);
+                    newNeighborList.add(cell);
+                }
+
+                if (!flag) {
+                    if (newNbrs.size() != oldNbrList.size()) {
+                        flag = true;
+                    }
+                }
+
+                if (flag) {
+                    updateNbrsOperationsTable(nodeId, source, nbrsAdd, nbrsDel);
+                }
+
+                if (newNbrs != null) {
+                    neighbors.getNeighborList().clear();
+                    Set<NeighborDetails> updatedNbrList = new HashSet<NeighborDetails>(newNeighborList);
+                    neighbors.setNeighborList(updatedNbrList);
+                    ransimRepo.mergeCellNeighbor(neighbors);
+                }
+
+                generateFmData(source, modifyCell, newNeighborList);
+
+                result = 200;
+            }
+
+        } else {
+            result = 400;
+        }
+
+        return result;
+    }
+
+    public void checkCellsWithIssue() {
+
+        try {
+
+            for (String id : cellsWithIssues) {
+                CellDetails currentCell = ransimRepo.getCellDetail(id);
+                FmMessage fmDataMessage = new FmMessage();
+                List<EventFm> data = new ArrayList<EventFm>();
+
+                if (!currentCell.isPciCollisionDetected()) {
+                    if (!currentCell.isPciConfusionDetected()) {
+
+                        cellsWithIssues.remove(id);
+                        CommonEventHeaderFm commonEventHeader = new CommonEventHeaderFm();
+                        FaultFields faultFields = new FaultFields();
+
+                        commonEventHeader.setStartEpochMicrosec(System.currentTimeMillis() * 1000);
+                        commonEventHeader.setSourceName(currentCell.getNodeId());
+                        commonEventHeader.setReportingEntityName(currentCell.getServerId());
+                        String uuid = globalFmCellIdUuidMap.get(currentCell.getNodeId());
+                        commonEventHeader.setSourceUuid(uuid);
+
+                        faultFields.setAlarmCondition("RanPciCollisionConfusionOccurred");
+                        faultFields.setEventSeverity("NORMAL");
+                        faultFields.setEventSourceType("other");
+                        faultFields.setSpecificProblem("Problem Solved");
+
+                        commonEventHeader.setLastEpochMicrosec(System.currentTimeMillis() * 1000);
+
+                        EventFm event = new EventFm();
+                        event.setCommonEventHeader(commonEventHeader);
+                        event.setFaultFields(faultFields);
+
+                        data.add(event);
+                    }
+                }
+
+                fmDataMessage.setFmEventList(data);
+
+                if (!data.isEmpty()) {
+                    sendFmData(currentCell.getServerId(), fmDataMessage);
+                }
+
+            }
+
+        } catch (Exception eu) {
+            log.error("Exception:", eu);
+        }
+    }
+
+    public void updatePciOperationsTable(String nodeId, String source, long physicalCellId, long oldPciId) {
+
         OperationLog operationLog = new OperationLog();
-        
+
         operationLog.setNodeId(nodeId);
         operationLog.setFieldName("PCID");
         operationLog.setOperation("Modify");
@@ -454,510 +420,481 @@ public class RansimPciHandler {
         operationLog.setMessage("PCID value changed from " + oldPciId + " to " + physicalCellId);
         ransimRepo.mergeOperationLog(operationLog);
     }
-    
+
     public void updateNbrsOperationsTable(String nodeId, String source, String addedNbrs, String deletedNbrs) {
-        
+
         OperationLog operationLogNbrChng = new OperationLog();
         operationLogNbrChng.setNodeId(nodeId);
         operationLogNbrChng.setFieldName("Neighbors");
         operationLogNbrChng.setOperation("Modify");
         operationLogNbrChng.setSource(source);
-        
+
         log.info(" Neighbors added " + addedNbrs + ".");
         log.info(" Neighbors removed " + deletedNbrs + ".");
         String message = "";
-        if(!addedNbrs.equals("")){
-        	message += " Neighbors added " + addedNbrs + "." ;
+        if (!addedNbrs.equals("")) {
+            message += " Neighbors added " + addedNbrs + ".";
         }
-        
-        if(!deletedNbrs.equals("")){
-        	message += " Neighbors removed " + deletedNbrs + "." ;
+
+        if (!deletedNbrs.equals("")) {
+            message += " Neighbors removed " + deletedNbrs + ".";
         }
-        
+
         operationLogNbrChng.setMessage(message);
         operationLogNbrChng.setTime(System.currentTimeMillis());
         ransimRepo.mergeOperationLog(operationLogNbrChng);
     }
-	
-	/**
-	 * Sends PM message to the netconf agent through the websocket server.
-	 * 
-	 * @param serverId
-	 *            Netconf agent - Server ID to which the message is sent.
-	 * @param pmMessage
-	 *            PM message to be sent.
-	 */
-	void sendPmdata(String serverId, String pmMessage) {
-
-		log.info("Sending PM message to netconf agent");
-
-		String ipPort = RansimControllerServices.serverIdIpPortMapping.get(serverId);
-
-		if (ipPort != null && !ipPort.trim().equals("")) {
-
-			if (ipPort != null && !ipPort.trim().equals("")) {
-
-				Session clSess = RansimControllerServices.webSocketSessions.get(ipPort);
-				log.info("PM message. Netconf agent IP:" + ipPort);
-				if (clSess != null) {
-					RansimWebSocketServer.sendPmMessage(pmMessage, clSess);
-					log.info("Pm Data jsonStr: " + pmMessage);
-					log.info("PM message sent to netconf agent");
-				} else {
-					log.info("No client session for " + ipPort);
-				}
-			} else {
-				log.info("Pm message not sent, ipPort is null");
-			}
-		} else {
-
-			log.info("Pm message not sent, ipPort is null. Server Id: "
-					+ serverId);
-		}
-
-	}
-
-	/**
-	 * 
-	 * Reads the values PM parameter values from a dump file.
-	 * 
-	 */
-	public void readPmParameters() {
-
-		File dumpFile = null;
-		PmDataDump pmDump = null;
-		String jsonString = "";
-		dumpFile = new File("PM_Kpi_Data.json");
-
-		BufferedReader br = null;
-
-		try {
-			log.info("Reading dump file");
-			br = new BufferedReader(new FileReader(dumpFile));
-
-			StringBuilder sb = new StringBuilder();
-			String line = br.readLine();
-
-			while (line != null) {
-				sb.append(line);
-				sb.append("\n");
-				line = br.readLine();
-			}
-			jsonString = sb.toString();
-
-			pmDump = new Gson().fromJson(jsonString, PmDataDump.class);
-			log.info("Dump value: "
-					+ pmDump.getKpiDump().get(0).getParameter1());
-			pmParameters = new ArrayList<PmParameters>(pmDump.getKpiDump());
-
-		} catch (Exception eu) {
-			log.info("Exception: ", eu);
-		}
-	}
-
-	private static String getUuid() {
-		return UUID.randomUUID().toString();
-	}
-
-	/**
-	 * Sets values for all the parameters in the PM message
-	 * 
-	 * @param nodeIdBad
-	 *            List of node Ids with bad performance values
-	 * @param nodeIdPoor
-	 *            List of node Ids with poor performance values
-	 * @return It returns the pm message
-	 */
-	@Transactional
-	public List<String> generatePmData(String nodeIdBad, String nodeIdPoor) {
-
-		List<String> result = new ArrayList<>();
-
-		String parameter1 = "";
-		String successValue1 = "";
-		String badValue1 = "";
-		String poorValue1 = "";
-		String parameter2 = "";
-		String successValue2 = "";
-		String badValue2 = "";
-		String poorValue2 = "";
-
-		try {
-
-			if (next >= pmParameters.size()) {
-				next = 0;
-				log.info("next : " + next);
-			}
-			try {
-				log.info("next : " + next);
-				parameter1 = pmParameters.get(next).getParameter1();
-				successValue1 = pmParameters.get(next).getSuccessValue1();
-				badValue1 = pmParameters.get(next).getBadValue1();
-				poorValue1 = pmParameters.get(next).getPoorValue1();
-				parameter2 = pmParameters.get(next).getParameter2();
-				successValue2 = pmParameters.get(next).getSuccessValue2();
-				badValue2 = pmParameters.get(next).getBadValue2();
-				poorValue2 = pmParameters.get(next).getPoorValue2();
-				next++;
-			} catch (Exception e) {
-				log.info("Exception: ", e);
-			}
-
-			List<NetconfServers> cnl = ransimRepo.getNetconfServersList();
-			log.debug("obtained data from db");
-			String[] cellIdsBad = null;
-			String[] cellIdsPoor = null;
-			Set<String> nodeIdsBad = new HashSet<String>();
-			Set<String> nodeIdsPoor = new HashSet<String>();
-
-			if (nodeIdBad != null) {
-				cellIdsBad = nodeIdBad.split(",");
-				for (int a = 0; a < cellIdsBad.length; a++) {
-					nodeIdsBad.add(cellIdsBad[a].trim());
-				}
-			}
-			if (nodeIdPoor != null) {
-				cellIdsPoor = nodeIdPoor.split(",");
-				for (int a = 0; a < cellIdsPoor.length; a++) {
-					nodeIdsPoor.add(cellIdsPoor[a].trim());
-				}
-			}
-
-			for (int i = 0; i < cnl.size(); i++) {
-
-				long startTime = System.currentTimeMillis();
-				List<CellDetails> cellList = new ArrayList<CellDetails>(cnl
-						.get(i).getCells());
-				List<EventPm> data = new ArrayList<EventPm>();
-
-				for (int j = 0; j < cellList.size(); j++) {
-
-					long startTimeCell = System.currentTimeMillis();
-					String nodeId = cellList.get(j).getNodeId();
-					EventPm event = new EventPm();
-					CommonEventHeaderPm commonEventHeader = new CommonEventHeaderPm();
-					commonEventHeader.setSourceName(nodeId);
-					commonEventHeader.setStartEpochMicrosec(System
-							.currentTimeMillis() * 1000);
-					String uuid = globalPmCellIdUuidMap.get(nodeId);
-					if (uuid == null) {
-						uuid = getUuid();
-						globalPmCellIdUuidMap.put(nodeId, uuid);
-					}
-					commonEventHeader.setSourceUuid(uuid);
-
-					Measurement measurement = new Measurement();
-					measurement.setMeasurementInterval(180);
-
-					GetNeighborList cellNbrList = generateNeighborList(nodeId);
-
-					long startTimeCheckBadPoor = System.currentTimeMillis();
-
-					boolean checkBad = false;
-					boolean checkPoor = false;
-					int countBad = 0;
-					int countPoor = 0;
-
-					if (nodeIdsBad.contains(nodeId)) {
-						checkBad = true;
-						countBad = (int) (cellNbrList.getCellsWithHo().size() * 0.2);
-					}
-					if (nodeIdsPoor.contains(nodeId)) {
-						checkPoor = true;
-						countPoor = (int) (cellNbrList.getCellsWithHo().size() * 0.2);
-					}
-
-					long endTimeCheckBadPoor = System.currentTimeMillis();
-					log.debug("Time taken CheckBadPoor : " + (endTimeCheckBadPoor - startTimeCheckBadPoor));
-					List<AdditionalMeasurements> additionalMeasurements = new ArrayList<AdditionalMeasurements>();
-					if (checkPoor || checkBad) {
-
-						Collections.sort(cellNbrList.getCellsWithHo());
-
-						for (int k = 0; k < cellNbrList.getCellsWithHo().size(); k++) {
-							AdditionalMeasurements addMsmnt = new AdditionalMeasurements();
-							addMsmnt.setName(cellNbrList.getCellsWithHo()
-									.get(k).getNodeId());
-							Map<String, String> hashMap = new HashMap<String, String>();
-							hashMap.put("networkId", cellNbrList
-									.getCellsWithHo().get(k).getNetworkId());
-
-							hashMap.put(parameter1, successValue1);
-
-							if (checkBad == true) {
-
-								if (countBad > 0) {
-									log.info("countBad: " + countBad);
-									hashMap.put(parameter2, badValue2);
-									countBad--;
-								} else {
-									hashMap.put(parameter2, successValue2);
-								}
-
-							} else if (checkPoor == true) {
-								if (countPoor > 0) {
-									log.info("countBad: " + countPoor);
-									hashMap.put(parameter2, poorValue2);
-									countPoor--;
-								} else {
-									hashMap.put(parameter2, successValue2);
-								}
-
-							}
-
-							addMsmnt.setHashMap(hashMap);
-
-							additionalMeasurements.add(addMsmnt);
-
-						}
-					} else {
-						for (int k = 0; k < cellNbrList.getCellsWithHo().size(); k++) {
-							AdditionalMeasurements addMsmnt = new AdditionalMeasurements();
-							addMsmnt.setName(cellNbrList.getCellsWithHo()
-									.get(k).getNodeId());
-							Map<String, String> hashMap = new HashMap<String, String>();
-
-							hashMap.put("networkId", cellNbrList
-									.getCellsWithHo().get(k).getNetworkId());
-
-							hashMap.put(parameter1, successValue1);
-
-							hashMap.put(parameter2, successValue2);
-
-							addMsmnt.setHashMap(hashMap);
-							additionalMeasurements.add(addMsmnt);
-						}
-					}
-
-					commonEventHeader.setLastEpochMicrosec(System
-							.currentTimeMillis() * 1000);
-					measurement
-							.setAdditionalMeasurements(additionalMeasurements);
-
-					event.setCommonEventHeader(commonEventHeader);
-					event.setMeasurement(measurement);
-
-					data.add(event);
-					long endTimeCell = System.currentTimeMillis();
-					log.debug("Time taken to Process Cell list : " + (endTimeCell - startTimeCell));
-				}
-
-				long endTime = System.currentTimeMillis();
-				log.info("Time taken for generating PM data for "
-						+ cnl.get(i).getServerId() + " : "
-						+ (endTime - startTime));
-				PmMessage msg = new PmMessage();
-
-				if (data.size() > 0) {
-					msg.setEventPmList(data);
-					Gson gson = new Gson();
-					String jsonStr = gson.toJson(msg);
-					sendPmdata(cnl.get(i).getServerId(), jsonStr);
-
-					result.add(jsonStr);
-				}
-
-			}
-		} catch (Exception e) {
-			log.info("Exception in string builder", e);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Sets the value for all fields in the FM data for individual cell.
-	 * 
-	 * @param networkId
-	 *            Network Id of the cell
-	 * @param ncServer
-	 *            Server Id of the cell
-	 * @param cellId
-	 *            Node Id of the cell
-	 * @param issue
-	 *            Contains the collision/confusion details of the cess
-	 * @return returns EventFm object, with all the necessary parameters.
-	 */
-	public static EventFm setEventFm(String networkId, String ncServer,
-			String cellId, FmAlarmInfo issue) {
-
-		log.info("Inside generate FmData");
-		EventFm event = new EventFm();
-
-		try {
-
-			CommonEventHeaderFm commonEventHeader = new CommonEventHeaderFm();
-			FaultFields faultFields = new FaultFields();
-
-			commonEventHeader
-					.setStartEpochMicrosec(System.currentTimeMillis() * 1000);
-			commonEventHeader.setSourceName(cellId);
-			commonEventHeader.setReportingEntityName(ncServer);
-
-			String uuid = globalFmCellIdUuidMap.get(cellId);
-			if (uuid == null) {
-				uuid = getUuid();
-				globalFmCellIdUuidMap.put(cellId, uuid);
-			}
-			commonEventHeader.setSourceUuid(uuid);
-
-			if (issue.getProblem().equals("Collision")
-					|| issue.getProblem().equals("Confusion")
-					|| issue.getProblem().equals("CollisionAndConfusion")) {
-				faultFields
-						.setAlarmCondition("RanPciCollisionConfusionOccurred");
-				faultFields.setEventSeverity("CRITICAL");
-				faultFields.setEventSourceType("other");
-				faultFields.setSpecificProblem(issue.getProblem());
-
-				Map<String, String> alarmAdditionalInformation = new HashMap<String, String>();
-				alarmAdditionalInformation.put("networkId", networkId);
-				alarmAdditionalInformation.put("collisions",
-						issue.getCollisionCount());
-				alarmAdditionalInformation.put("confusions",
-						issue.getConfusionCount());
-
-				faultFields
-						.setAlarmAdditionalInformation(alarmAdditionalInformation);
-
-			}
-			commonEventHeader
-					.setLastEpochMicrosec(System.currentTimeMillis() * 1000);
-
-			event.setCommonEventHeader(commonEventHeader);
-			event.setFaultFields(faultFields);
-
-		} catch (Exception e) {
-			log.info("Exception: ", e);
-		}
-
-		return event;
-
-	}
-
-	/**
-	 * It checks if the cell or any of its neighbors have collision/confusion
-	 * issue. If there are any issues it generates the FM data for the entire
-	 * cluster
-	 * 
-	 * @param source
-	 *            The source from which the cell modification has been
-	 *            triggered.
-	 * @param cell
-	 *            Details of the given cell.
-	 * @param newNeighborList
-	 *            Neighbor list of the given cell.
-	 */
-	public void generateFmData(String source, CellDetails cell,
-			List<NeighborDetails> newNeighborList) {
-
-		List<EventFm> listCellIssue = new ArrayList<EventFm>();
-		Set<String> ncs = new HashSet<>();
-		log.info("Generating Fm data");
-		FmAlarmInfo op1 = setCollisionConfusionFromFile(cell.getNodeId());
-
-		if (source.equals("GUI")) {
-			if (op1.getProblem().equals("CollisionAndConfusion")
-					|| op1.getProblem().equals("Collision")
-					|| op1.getProblem().equals("Confusion")) {
-				log.info("op1: " + op1);
-				EventFm lci = setEventFm(cell.getNetworkId(),
-						cell.getServerId(), cell.getNodeId(), op1);
-				listCellIssue.add(lci);
-				ncs.add(cell.getServerId());
-				log.info("Generating Fm data for: " + cell.getNodeId());
-			}
-		}
-
-		for (NeighborDetails cd : newNeighborList) {
-			FmAlarmInfo op2 = setCollisionConfusionFromFile(cd.getNeigbor()
-					.getNeighborCell());
-			CellDetails nbrCell = ransimRepo.getCellDetail(cd.getNeigbor()
-					.getNeighborCell());
-
-			if (source.equals("GUI")) {
-				if (op2.getProblem().equals("CollisionAndConfusion")
-						|| op2.getProblem().equals("Collision")
-						|| op2.getProblem().equals("Confusion")) {
-					EventFm lci = setEventFm(nbrCell.getNetworkId(),
-							nbrCell.getServerId(), nbrCell.getNodeId(), op2);
-					log.info("FmData added:" + nbrCell.getNodeId());
-					listCellIssue.add(lci);
-					ncs.add(nbrCell.getServerId());
-					log.info("Generating Fm data for: " + nbrCell.getNodeId());
-				}
-			}
-
-		}
-
-		if (source.equals("GUI")) {
-			for (String nc : ncs) {
-
-				FmMessage fmDataMessage = new FmMessage();
-				List<EventFm> data = new ArrayList<EventFm>();
-				log.info("listCellIssue.size(): " + listCellIssue.size());
-				for (EventFm cellIssue : listCellIssue) {
-					if (cellIssue.getCommonEventHeader()
-							.getReportingEntityName().equals(nc)) {
-						data.add(cellIssue);
-						if (!cellsWithIssues.contains(cellIssue
-								.getCommonEventHeader().getSourceName())) {
-							cellsWithIssues.add(cellIssue
-									.getCommonEventHeader().getSourceName());
-						}
-
-					}
-				}
-				log.info("data.size(): " + data.size());
-
-				if (data.size() > 0) {
-					fmDataMessage.setFmEventList(data);
-					log.info("Sending FM message: ");
-					sendFmData(nc, fmDataMessage);
-				}
-
-			}
-		}
-
-	}
-
-	/**
-	 * Sends the FM data message to the netconf agent through the ransim
-	 * websocket server.
-	 * 
-	 * @param serverId
-	 *            server id of the netconf agent
-	 * @param fmDataMessage
-	 *            FM message to be sent
-	 */
-	public void sendFmData(String serverId, FmMessage fmDataMessage) {
-
-		log.info("inside sendFmData");
-		Gson gson = new Gson();
-		String jsonStr = gson.toJson(fmDataMessage);
-
-		log.info("Fm Data jsonStr: " + jsonStr);
-
-		String ipPort = RansimControllerServices.serverIdIpPortMapping.get(serverId);
-
-		if (ipPort != null && !ipPort.trim().equals("")) {
-
-			log.info("Connection estabilished with ip: " + ipPort);
-			if (ipPort != null && !ipPort.trim().equals("")) {
-				Session clSess = RansimControllerServices.webSocketSessions.get(ipPort);
-				if (clSess != null) {
-					log.info("FM message sent.");
-					RansimWebSocketServer.sendFmMessage(jsonStr, clSess);
-				} else {
-					log.info("No client session for " + ipPort);
-				}
-			} else {
-				log.info("No client for " + serverId);
-			}
-		} else {
-			log.info("No client for ");
-		}
-
-	}
+
+    /**
+     * Sends PM message to the netconf agent through the websocket server.
+     *
+     * @param serverId
+     *        Netconf agent - Server ID to which the message is sent.
+     * @param pmMessage
+     *        PM message to be sent.
+     */
+    void sendPmdata(String serverId, String pmMessage) {
+
+        log.info("Sending PM message to netconf agent");
+
+        String ipPort = RansimControllerServices.serverIdIpPortMapping.get(serverId);
+
+        if (ipPort != null && !ipPort.trim().equals("")) {
+
+            if (ipPort != null && !ipPort.trim().equals("")) {
+
+                Session clSess = RansimControllerServices.webSocketSessions.get(ipPort);
+                log.info("PM message. Netconf agent IP:" + ipPort);
+                if (clSess != null) {
+                    RansimWebSocketServer.sendPmMessage(pmMessage, clSess);
+                    log.info("Pm Data jsonStr: " + pmMessage);
+                    log.info("PM message sent to netconf agent");
+                } else {
+                    log.info("No client session for " + ipPort);
+                }
+            } else {
+                log.info("Pm message not sent, ipPort is null");
+            }
+        } else {
+
+            log.info("Pm message not sent, ipPort is null. Server Id: " + serverId);
+        }
+
+    }
+
+    /**
+     *
+     * Reads the values PM parameter values from a dump file.
+     *
+     */
+    public void readPmParameters() {
+
+        File dumpFile = null;
+        PmDataDump pmDump = null;
+        String jsonString = "";
+        dumpFile = new File("PM_Kpi_Data.json");
+
+        BufferedReader br = null;
+
+        try {
+            log.info("Reading dump file");
+            br = new BufferedReader(new FileReader(dumpFile));
+
+            StringBuilder sb = new StringBuilder();
+            String line = br.readLine();
+
+            while (line != null) {
+                sb.append(line);
+                sb.append("\n");
+                line = br.readLine();
+            }
+            jsonString = sb.toString();
+
+            pmDump = new Gson().fromJson(jsonString, PmDataDump.class);
+            log.info("Dump value: " + pmDump.getKpiDump().get(0).getParameter1());
+            pmParameters = new ArrayList<PmParameters>(pmDump.getKpiDump());
+
+        } catch (Exception eu) {
+            log.info("Exception: ", eu);
+        }
+    }
+
+    private static String getUuid() {
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     * Sets values for all the parameters in the PM message
+     *
+     * @param nodeIdBad
+     *        List of node Ids with bad performance values
+     * @param nodeIdPoor
+     *        List of node Ids with poor performance values
+     * @return It returns the pm message
+     */
+    @Transactional
+    public List<String> generatePmData(String nodeIdBad, String nodeIdPoor) {
+
+        List<String> result = new ArrayList<>();
+
+        String parameter1 = "";
+        String successValue1 = "";
+        String badValue1 = "";
+        String poorValue1 = "";
+        String parameter2 = "";
+        String successValue2 = "";
+        String badValue2 = "";
+        String poorValue2 = "";
+
+        try {
+
+            if (next >= pmParameters.size()) {
+                next = 0;
+                log.info("next : " + next);
+            }
+            try {
+                log.info("next : " + next);
+                parameter1 = pmParameters.get(next).getParameter1();
+                successValue1 = pmParameters.get(next).getSuccessValue1();
+                badValue1 = pmParameters.get(next).getBadValue1();
+                poorValue1 = pmParameters.get(next).getPoorValue1();
+                parameter2 = pmParameters.get(next).getParameter2();
+                successValue2 = pmParameters.get(next).getSuccessValue2();
+                badValue2 = pmParameters.get(next).getBadValue2();
+                poorValue2 = pmParameters.get(next).getPoorValue2();
+                next++;
+            } catch (Exception e) {
+                log.info("Exception: ", e);
+            }
+
+            List<NetconfServers> cnl = ransimRepo.getNetconfServersList();
+            log.debug("obtained data from db");
+            String[] cellIdsBad = null;
+            String[] cellIdsPoor = null;
+            Set<String> nodeIdsBad = new HashSet<String>();
+            Set<String> nodeIdsPoor = new HashSet<String>();
+
+            if (nodeIdBad != null) {
+                cellIdsBad = nodeIdBad.split(",");
+                for (int a = 0; a < cellIdsBad.length; a++) {
+                    nodeIdsBad.add(cellIdsBad[a].trim());
+                }
+            }
+            if (nodeIdPoor != null) {
+                cellIdsPoor = nodeIdPoor.split(",");
+                for (int a = 0; a < cellIdsPoor.length; a++) {
+                    nodeIdsPoor.add(cellIdsPoor[a].trim());
+                }
+            }
+
+            for (int i = 0; i < cnl.size(); i++) {
+
+                long startTime = System.currentTimeMillis();
+                List<CellDetails> cellList = new ArrayList<CellDetails>(cnl.get(i).getCells());
+                List<EventPm> data = new ArrayList<EventPm>();
+
+                for (int j = 0; j < cellList.size(); j++) {
+
+                    long startTimeCell = System.currentTimeMillis();
+                    String nodeId = cellList.get(j).getNodeId();
+                    EventPm event = new EventPm();
+                    CommonEventHeaderPm commonEventHeader = new CommonEventHeaderPm();
+                    commonEventHeader.setSourceName(nodeId);
+                    commonEventHeader.setStartEpochMicrosec(System.currentTimeMillis() * 1000);
+                    String uuid = globalPmCellIdUuidMap.get(nodeId);
+                    if (uuid == null) {
+                        uuid = getUuid();
+                        globalPmCellIdUuidMap.put(nodeId, uuid);
+                    }
+                    commonEventHeader.setSourceUuid(uuid);
+
+                    Measurement measurement = new Measurement();
+                    measurement.setMeasurementInterval(180);
+
+                    GetNeighborList cellNbrList = generateNeighborList(nodeId);
+
+                    long startTimeCheckBadPoor = System.currentTimeMillis();
+
+                    boolean checkBad = false;
+                    boolean checkPoor = false;
+                    int countBad = 0;
+                    int countPoor = 0;
+
+                    if (nodeIdsBad.contains(nodeId)) {
+                        checkBad = true;
+                        countBad = (int) (cellNbrList.getCellsWithHo().size() * 0.2);
+                    }
+                    if (nodeIdsPoor.contains(nodeId)) {
+                        checkPoor = true;
+                        countPoor = (int) (cellNbrList.getCellsWithHo().size() * 0.2);
+                    }
+
+                    long endTimeCheckBadPoor = System.currentTimeMillis();
+                    log.debug("Time taken CheckBadPoor : " + (endTimeCheckBadPoor - startTimeCheckBadPoor));
+                    List<AdditionalMeasurements> additionalMeasurements = new ArrayList<AdditionalMeasurements>();
+                    if (checkPoor || checkBad) {
+
+                        Collections.sort(cellNbrList.getCellsWithHo());
+
+                        for (int k = 0; k < cellNbrList.getCellsWithHo().size(); k++) {
+                            AdditionalMeasurements addMsmnt = new AdditionalMeasurements();
+                            addMsmnt.setName(cellNbrList.getCellsWithHo().get(k).getNodeId());
+                            Map<String, String> hashMap = new HashMap<String, String>();
+                            hashMap.put("networkId", cellNbrList.getCellsWithHo().get(k).getNetworkId());
+
+                            hashMap.put(parameter1, successValue1);
+
+                            if (checkBad == true) {
+
+                                if (countBad > 0) {
+                                    log.info("countBad: " + countBad);
+                                    hashMap.put(parameter2, badValue2);
+                                    countBad--;
+                                } else {
+                                    hashMap.put(parameter2, successValue2);
+                                }
+
+                            } else if (checkPoor == true) {
+                                if (countPoor > 0) {
+                                    log.info("countBad: " + countPoor);
+                                    hashMap.put(parameter2, poorValue2);
+                                    countPoor--;
+                                } else {
+                                    hashMap.put(parameter2, successValue2);
+                                }
+
+                            }
+
+                            addMsmnt.setHashMap(hashMap);
+
+                            additionalMeasurements.add(addMsmnt);
+
+                        }
+                    } else {
+                        for (int k = 0; k < cellNbrList.getCellsWithHo().size(); k++) {
+                            AdditionalMeasurements addMsmnt = new AdditionalMeasurements();
+                            addMsmnt.setName(cellNbrList.getCellsWithHo().get(k).getNodeId());
+                            Map<String, String> hashMap = new HashMap<String, String>();
+
+                            hashMap.put("networkId", cellNbrList.getCellsWithHo().get(k).getNetworkId());
+
+                            hashMap.put(parameter1, successValue1);
+
+                            hashMap.put(parameter2, successValue2);
+
+                            addMsmnt.setHashMap(hashMap);
+                            additionalMeasurements.add(addMsmnt);
+                        }
+                    }
+
+                    commonEventHeader.setLastEpochMicrosec(System.currentTimeMillis() * 1000);
+                    measurement.setAdditionalMeasurements(additionalMeasurements);
+
+                    event.setCommonEventHeader(commonEventHeader);
+                    event.setMeasurement(measurement);
+
+                    data.add(event);
+                    long endTimeCell = System.currentTimeMillis();
+                    log.debug("Time taken to Process Cell list : " + (endTimeCell - startTimeCell));
+                }
+
+                long endTime = System.currentTimeMillis();
+                log.info("Time taken for generating PM data for " + cnl.get(i).getServerId() + " : "
+                        + (endTime - startTime));
+                PmMessage msg = new PmMessage();
+
+                if (data.size() > 0) {
+                    msg.setEventPmList(data);
+                    Gson gson = new Gson();
+                    String jsonStr = gson.toJson(msg);
+                    sendPmdata(cnl.get(i).getServerId(), jsonStr);
+
+                    result.add(jsonStr);
+                }
+
+            }
+        } catch (Exception e) {
+            log.info("Exception in string builder", e);
+        }
+
+        return result;
+    }
+
+    /**
+     * Sets the value for all fields in the FM data for individual cell.
+     *
+     * @param networkId
+     *        Network Id of the cell
+     * @param ncServer
+     *        Server Id of the cell
+     * @param cellId
+     *        Node Id of the cell
+     * @param issue
+     *        Contains the collision/confusion details of the cess
+     * @return returns EventFm object, with all the necessary parameters.
+     */
+    public static EventFm setEventFm(String networkId, String ncServer, String cellId, FmAlarmInfo issue) {
+
+        log.info("Inside generate FmData");
+        EventFm event = new EventFm();
+
+        try {
+
+            CommonEventHeaderFm commonEventHeader = new CommonEventHeaderFm();
+            FaultFields faultFields = new FaultFields();
+
+            commonEventHeader.setStartEpochMicrosec(System.currentTimeMillis() * 1000);
+            commonEventHeader.setSourceName(cellId);
+            commonEventHeader.setReportingEntityName(ncServer);
+
+            String uuid = globalFmCellIdUuidMap.get(cellId);
+            if (uuid == null) {
+                uuid = getUuid();
+                globalFmCellIdUuidMap.put(cellId, uuid);
+            }
+            commonEventHeader.setSourceUuid(uuid);
+
+            if (issue.getProblem().equals("Collision") || issue.getProblem().equals("Confusion")
+                    || issue.getProblem().equals("CollisionAndConfusion")) {
+                faultFields.setAlarmCondition("RanPciCollisionConfusionOccurred");
+                faultFields.setEventSeverity("CRITICAL");
+                faultFields.setEventSourceType("other");
+                faultFields.setSpecificProblem(issue.getProblem());
+
+                Map<String, String> alarmAdditionalInformation = new HashMap<String, String>();
+                alarmAdditionalInformation.put("networkId", networkId);
+                alarmAdditionalInformation.put("collisions", issue.getCollisionCount());
+                alarmAdditionalInformation.put("confusions", issue.getConfusionCount());
+
+                faultFields.setAlarmAdditionalInformation(alarmAdditionalInformation);
+
+            }
+            commonEventHeader.setLastEpochMicrosec(System.currentTimeMillis() * 1000);
+
+            event.setCommonEventHeader(commonEventHeader);
+            event.setFaultFields(faultFields);
+
+        } catch (Exception e) {
+            log.info("Exception: ", e);
+        }
+
+        return event;
+
+    }
+
+    /**
+     * It checks if the cell or any of its neighbors have collision/confusion
+     * issue. If there are any issues it generates the FM data for the entire
+     * cluster
+     *
+     * @param source
+     *        The source from which the cell modification has been
+     *        triggered.
+     * @param cell
+     *        Details of the given cell.
+     * @param newNeighborList
+     *        Neighbor list of the given cell.
+     */
+    public void generateFmData(String source, CellDetails cell, List<NeighborDetails> newNeighborList) {
+
+        List<EventFm> listCellIssue = new ArrayList<EventFm>();
+        Set<String> ncs = new HashSet<>();
+        log.info("Generating Fm data");
+        FmAlarmInfo op1 = setCollisionConfusionFromFile(cell.getNodeId());
+
+        if (source.equals("GUI")) {
+            if (op1.getProblem().equals("CollisionAndConfusion") || op1.getProblem().equals("Collision")
+                    || op1.getProblem().equals("Confusion")) {
+                log.info("op1: " + op1);
+                EventFm lci = setEventFm(cell.getNetworkId(), cell.getServerId(), cell.getNodeId(), op1);
+                listCellIssue.add(lci);
+                ncs.add(cell.getServerId());
+                log.info("Generating Fm data for: " + cell.getNodeId());
+            }
+        }
+
+        for (NeighborDetails cd : newNeighborList) {
+            FmAlarmInfo op2 = setCollisionConfusionFromFile(cd.getNeigbor().getNeighborCell());
+            CellDetails nbrCell = ransimRepo.getCellDetail(cd.getNeigbor().getNeighborCell());
+
+            if (source.equals("GUI")) {
+                if (op2.getProblem().equals("CollisionAndConfusion") || op2.getProblem().equals("Collision")
+                        || op2.getProblem().equals("Confusion")) {
+                    EventFm lci = setEventFm(nbrCell.getNetworkId(), nbrCell.getServerId(), nbrCell.getNodeId(), op2);
+                    log.info("FmData added:" + nbrCell.getNodeId());
+                    listCellIssue.add(lci);
+                    ncs.add(nbrCell.getServerId());
+                    log.info("Generating Fm data for: " + nbrCell.getNodeId());
+                }
+            }
+
+        }
+
+        if (source.equals("GUI")) {
+            for (String nc : ncs) {
+
+                FmMessage fmDataMessage = new FmMessage();
+                List<EventFm> data = new ArrayList<EventFm>();
+                log.info("listCellIssue.size(): " + listCellIssue.size());
+                for (EventFm cellIssue : listCellIssue) {
+                    if (cellIssue.getCommonEventHeader().getReportingEntityName().equals(nc)) {
+                        data.add(cellIssue);
+                        if (!cellsWithIssues.contains(cellIssue.getCommonEventHeader().getSourceName())) {
+                            cellsWithIssues.add(cellIssue.getCommonEventHeader().getSourceName());
+                        }
+
+                    }
+                }
+                log.info("data.size(): " + data.size());
+
+                if (data.size() > 0) {
+                    fmDataMessage.setFmEventList(data);
+                    log.info("Sending FM message: ");
+                    sendFmData(nc, fmDataMessage);
+                }
+
+            }
+        }
+
+    }
+
+    /**
+     * Sends the FM data message to the netconf agent through the ransim
+     * websocket server.
+     *
+     * @param serverId
+     *        server id of the netconf agent
+     * @param fmDataMessage
+     *        FM message to be sent
+     */
+    public void sendFmData(String serverId, FmMessage fmDataMessage) {
+
+        log.info("inside sendFmData");
+        Gson gson = new Gson();
+        String jsonStr = gson.toJson(fmDataMessage);
+
+        log.info("Fm Data jsonStr: " + jsonStr);
+
+        String ipPort = RansimControllerServices.serverIdIpPortMapping.get(serverId);
+
+        if (ipPort != null && !ipPort.trim().equals("")) {
+
+            log.info("Connection estabilished with ip: " + ipPort);
+            if (ipPort != null && !ipPort.trim().equals("")) {
+                Session clSess = RansimControllerServices.webSocketSessions.get(ipPort);
+                if (clSess != null) {
+                    log.info("FM message sent.");
+                    RansimWebSocketServer.sendFmMessage(jsonStr, clSess);
+                } else {
+                    log.info("No client session for " + ipPort);
+                }
+            } else {
+                log.info("No client for " + serverId);
+            }
+        } else {
+            log.info("No client for ");
+        }
+
+    }
 
 }
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/handler/RansimSlicingHandler.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/handler/RansimSlicingHandler.java
index c435541..4629fc6 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/handler/RansimSlicingHandler.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/handler/RansimSlicingHandler.java
@@ -20,6 +20,8 @@
 
 package org.onap.ransim.rest.api.handler;
 
+import com.google.gson.Gson;
+
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -27,9 +29,10 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
+
+import javax.websocket.Session;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
-import javax.websocket.Session;
 
 import org.apache.log4j.Logger;
 import org.onap.ransim.rest.api.services.RANSliceConfigService;
@@ -39,9 +42,9 @@ import org.onap.ransim.rest.web.mapper.GNBCUCPModel;
 import org.onap.ransim.rest.web.mapper.NRCellCUModel;
 import org.onap.ransim.rest.web.mapper.PLMNInfoModel;
 import org.onap.ransim.rest.xml.models.*;
-import org.onap.ransim.websocket.server.RansimWebSocketServer;
 import org.onap.ransim.websocket.model.SlicingPmMessage;
-
+import org.onap.ransim.websocket.server.RansimWebSocketServer;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -49,217 +52,208 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
 import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.client.RestTemplate;
 
 @Service
 public class RansimSlicingHandler {
-	
-	static Logger log = Logger.getLogger(RansimSlicingHandler.class
-			.getName());
-			
-	@Autowired
-	RansimRepositoryService ransimRepo ;
-	
-	@Autowired
-	RansimControllerServices rscServices;
-	
-	@Autowired
-	RANSliceConfigService ranSliceConfigService;
 
+    static Logger log = Logger.getLogger(RansimSlicingHandler.class.getName());
 
-   public List<String> generateIntelligentSlicingPmData(long startTime, HashMap<String,List<String>> taCells) {
-		  List<String> result = new ArrayList<String>();
-		  try {
-		    String requestUrl = "http://" + "localhost" + ":" + "8081" + "/ransim/api/ransim-db/v4/cucp-list";
-		    List<GNBCUCPModel> gnbcucpModelList = sendGetRequestToConfigDb(requestUrl).getBody();
-		    long peakEndTime = System.currentTimeMillis() + 360000;
-		    for (int i = 0; i < gnbcucpModelList.size(); i++) {
-		                                String gNBName = gnbcucpModelList.get(i).getgNBCUName();                              
-		                                LocalDateTime beginTime = LocalDateTime.now();
-		                                String beginTimeString = beginTime.toString();
-						SlicingPmMessage pmMessage = new SlicingPmMessage();
-                                                pmMessage.setStartEpochMicrosec(System.currentTimeMillis() * 1000);
-                                                pmMessage.setSourceName(gNBName);
-		                                MeasCollec measCollec = new MeasCollec(beginTimeString);
-		                                FileSender fileSender = new FileSender(gNBName);
-		                                FileHeader fileHeader = new FileHeader("Prefix", "Acme Ltd", "32.435 V10.0", measCollec, fileSender);
-		                                Random r = new Random();
-		                                int jobId = r.nextInt((9999 - 1000) + 1) + 1000;
-		                                Job job = new Job(String.valueOf(jobId));
-		                                ReportingPeriod reportingPeriod = new ReportingPeriod("PT900S");
-		                                List<MeasType> measTypeList = new ArrayList<MeasType>();
-		                                int numberOfNssaiType = 1;
-		                                HashMap<String, Integer> nssaiInfoMap = new HashMap<String, Integer>();
-		                                for (NRCellCUModel nRCellCUModel : gnbcucpModelList.get(i).getCellCUList()) {
-		                                    for (PLMNInfoModel pLMNInfoModel : nRCellCUModel.getpLMNInfoList()) {
-		                                        if (pLMNInfoModel.getsNSSAI().getStatus().equalsIgnoreCase("active")) {
-		                                                        nssaiInfoMap.put(pLMNInfoModel.getsNSSAI().getsNSSAI(),
-		                                                        pLMNInfoModel.getsNSSAI().getConfigData().getMaxNumberOfConns());
-		                                                }
-		                                    }
-		                                }
-		                                HashMap<String, Integer> nSSAINo = new HashMap<String, Integer>();
-		                                for (java.util.Map.Entry<String, Integer> map : nssaiInfoMap.entrySet()) {   
-		                                        String nssai = map.getKey();
-		                                        MeasType mesType1 = new MeasType("SM.PDUSessionSetupReq." + nssai, numberOfNssaiType++);
-		                                        MeasType mesType2 = new MeasType("SM.PDUSessionSetupSucc." + nssai, numberOfNssaiType++);
-		                                         measTypeList.add(mesType1);
-		                                        measTypeList.add(mesType2);
-		                                        if (numberOfNssaiType == 3) {
-		                                                MeasType mesTypeFail = new MeasType("SM.PDUSessionSetupFail." + "0", 3);
-		                                                measTypeList.add(mesTypeFail);
-		                                                numberOfNssaiType++;
-		                                        }
-		                                        nSSAINo.put(nssai,mesType1.getP());
-		                                }
-		                                
-		                                List<MeasValue> measValueList = new ArrayList<MeasValue>();
-		                                
-		                                for (NRCellCUModel nRCellCUModel : gnbcucpModelList.get(i).getCellCUList()) {
-		                                        List<Result> resultList = new ArrayList<Result>();
-		                                        int noOfRequestedSessions = 0;
-		                                        int successfulSessions = 0;
-		                                        int failedSessions = 0;
-		                                        int configData = 0;
-		                                        double rNumForTotalReq = 0;
-                                                int numberOfNssaiValue = 1; //change
-		                                        for (PLMNInfoModel pLMNInfoModel : nRCellCUModel.getpLMNInfoList()) {
-		                                         for (java.util.Map.Entry<String, Integer> nssaiMap :  nSSAINo.entrySet()) {
-		                                                if(nssaiMap.getKey().equals(pLMNInfoModel.getsNSSAI().getsNSSAI())) {
-		                                                configData = pLMNInfoModel.getsNSSAI().getConfigData().getMaxNumberOfConns();
-		                                                noOfRequestedSessions = 0;
-		                                                successfulSessions = 0;
-		                                                for (java.util.Map.Entry<String, List<String>> taCellMap : taCells.entrySet()) {
-		                                                      for(String cell : taCellMap.getValue()) {
-                                                                        if(Integer.parseInt(cell) == nRCellCUModel.getCellLocalId().intValue()) {
-                                                                           long end = (System.currentTimeMillis());
-		                                                                    if(peakEndTime>end) {
-		                                                                       if(taCellMap.getKey().equalsIgnoreCase("TA1") || taCellMap.getKey().equalsIgnoreCase("TA3")) {
-		                                                                             rNumForTotalReq = 1.4 + (new Random().nextDouble() * (1.0 - 1.4));
-		                                                                            } else  {
-		                                                                            	rNumForTotalReq = 0.6 + (new Random().nextDouble() * (0.3 - 0.6));
-		                                                                            	}    
-		                                                                       }
-		                                                                    else {
-		                                                                    	rNumForTotalReq = 0.7 + (new Random().nextDouble() * (0.3 - 0.7));
-		                                                                    	}
-		                                                                    }
-                                                                        }
-		                                                      }
+    @Autowired
+    RansimRepositoryService ransimRepo;
 
-		                                                double rNumForFs = 0.10 + (new Random().nextDouble() * (0.05 - 0.10));
-		                                                double rNumForSs = 0.75 + (new Random().nextDouble()* (0.75 - 0.90));
-		                                                noOfRequestedSessions = (int) (configData * rNumForTotalReq);
-		                                                successfulSessions = (int) (noOfRequestedSessions * rNumForSs);
-		                                                failedSessions += noOfRequestedSessions - successfulSessions;
-		                                                numberOfNssaiValue = nssaiMap.getValue();
-		                                                Result result1 = new Result(numberOfNssaiValue++, noOfRequestedSessions);
-		                                                Result result2 = new Result(numberOfNssaiValue++, successfulSessions);
-		                                                resultList.add(result1);
-		                                                resultList.add(result2);
-		                                                if (numberOfNssaiValue == 3) {
-	                                                        numberOfNssaiValue++;
-	                                                    }
-		                                                if(nRCellCUModel.getpLMNInfoList().indexOf(pLMNInfoModel)+1 == nRCellCUModel.getpLMNInfoList().size())
-		                                                {                                       
-		                                                failedSessions -= failedSessions * rNumForFs;
-		                                                Result result3 = new Result(3, failedSessions);
-		                                                resultList.add(result3);  
-		                                                }		                                               
-		                                        }
-		                                    }
-		                                        
-		                                 }
+    @Autowired
+    RansimControllerServices rscServices;
 
-		                                        MeasValue measValue = new MeasValue(nRCellCUModel.getCellLocalId(),
-		                                                        resultList, false);
-		                                        measValueList.add(measValue);
-		                                }
-		                           
-		                                ManagedElement managedElement = new ManagedElement("r0.1", gNBName);
-		                                LocalDateTime grabularityEndTime = LocalDateTime.now();
-		                                String grabularityEndTimeString = grabularityEndTime.toString();
-		                                GranularityPeriod granularityPeriod = new GranularityPeriod(grabularityEndTimeString, "PT900S");
-		                                MeasInfo measInfo = new MeasInfo("measInfoIsVal", job, granularityPeriod, reportingPeriod, measTypeList,
-		                                                measValueList);
-		                                List<MeasInfo> measInfoList = new ArrayList<MeasInfo>();
-		                                measInfoList.add(measInfo);
-		                                MeasData measData = new MeasData(managedElement, measInfoList);
-		                                List<MeasData> measDataList = new ArrayList<MeasData>();
-		                                measDataList.add(measData);
-		                                LocalDateTime endTime = LocalDateTime.now();
-		                                String endTimeString = endTime.toString();
-	                                        pmMessage.setLastEpochMicrosec(System.currentTimeMillis() * 1000);
-		                                MeasCollecEnd measCollecEnd = new MeasCollecEnd(endTimeString);
-		                                FileFooter fileFooter = new FileFooter(measCollecEnd);
-		                                MeasCollecFile measCollecFile = new MeasCollecFile(fileHeader, measDataList, fileFooter,
-		                                                "http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec");		                             
-		                                String startDate = beginTimeString.replace(':', '-');
-		                                String endDate = endTimeString.replace(':', '-');
-		                                String fileName = "A" + startDate + "-"+ endDate + "-" + String.valueOf(jobId) + "-" + gNBName+ ".xml";
-		                                pmMessage.setFileName(fileName);
-		                                Gson gson = new Gson();
-		                                String pmData = gson.toJson(measCollecFile);
-		                                pmMessage.setPmData(pmData);
-		                                sendIntelligentSlicingPmData(pmMessage);
-		                                }
-		         }
-		         catch (Exception e) {
-		        	 System.out.println("Exception: " + e);
-		         }
-		     return result;
-}
+    @Autowired
+    RANSliceConfigService ranSliceConfigService;
 
-public static <T> ResponseEntity<List<GNBCUCPModel>> sendGetRequestToConfigDb(String requestUrl) {
-    
-          HttpHeaders headers = new HttpHeaders();
-          log.info("sending...");
-          headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
-          HttpEntity<Void> requestEntity = new HttpEntity<>(headers);
-         try {
-             RestTemplate restTemplate = new RestTemplate();
-             return restTemplate.exchange(requestUrl, HttpMethod.GET, requestEntity,
-             new ParameterizedTypeReference<List<GNBCUCPModel>>() {
-           });
-       }
-       catch (Exception e) {
-          return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-      }
-}
+    public List<String> generateIntelligentSlicingPmData(long startTime, HashMap<String, List<String>> taCells) {
+        List<String> result = new ArrayList<String>();
+        try {
+            String requestUrl = "http://" + "localhost" + ":" + "8081" + "/ransim/api/ransim-db/v4/cucp-list";
+            List<GNBCUCPModel> gnbcucpModelList = sendGetRequestToConfigDb(requestUrl).getBody();
+            long peakEndTime = System.currentTimeMillis() + 360000;
+            for (int i = 0; i < gnbcucpModelList.size(); i++) {
+                String gNBName = gnbcucpModelList.get(i).getgNBCUName();
+                LocalDateTime beginTime = LocalDateTime.now();
+                String beginTimeString = beginTime.toString();
+                SlicingPmMessage pmMessage = new SlicingPmMessage();
+                pmMessage.setStartEpochMicrosec(System.currentTimeMillis() * 1000);
+                pmMessage.setSourceName(gNBName);
+                MeasCollec measCollec = new MeasCollec(beginTimeString);
+                FileSender fileSender = new FileSender(gNBName);
+                FileHeader fileHeader = new FileHeader("Prefix", "Acme Ltd", "32.435 V10.0", measCollec, fileSender);
+                Random r = new Random();
+                int jobId = r.nextInt((9999 - 1000) + 1) + 1000;
+                Job job = new Job(String.valueOf(jobId));
+                ReportingPeriod reportingPeriod = new ReportingPeriod("PT900S");
+                List<MeasType> measTypeList = new ArrayList<MeasType>();
+                int numberOfNssaiType = 1;
+                HashMap<String, Integer> nssaiInfoMap = new HashMap<String, Integer>();
+                for (NRCellCUModel nRCellCUModel : gnbcucpModelList.get(i).getCellCUList()) {
+                    for (PLMNInfoModel pLMNInfoModel : nRCellCUModel.getpLMNInfoList()) {
+                        if (pLMNInfoModel.getsNSSAI().getStatus().equalsIgnoreCase("active")) {
+                            nssaiInfoMap.put(pLMNInfoModel.getsNSSAI().getsNSSAI(),
+                                    pLMNInfoModel.getsNSSAI().getConfigData().getMaxNumberOfConns());
+                        }
+                    }
+                }
+                HashMap<String, Integer> nSSAINo = new HashMap<String, Integer>();
+                for (java.util.Map.Entry<String, Integer> map : nssaiInfoMap.entrySet()) {
+                    String nssai = map.getKey();
+                    MeasType mesType1 = new MeasType("SM.PDUSessionSetupReq." + nssai, numberOfNssaiType++);
+                    MeasType mesType2 = new MeasType("SM.PDUSessionSetupSucc." + nssai, numberOfNssaiType++);
+                    measTypeList.add(mesType1);
+                    measTypeList.add(mesType2);
+                    if (numberOfNssaiType == 3) {
+                        MeasType mesTypeFail = new MeasType("SM.PDUSessionSetupFail." + "0", 3);
+                        measTypeList.add(mesTypeFail);
+                        numberOfNssaiType++;
+                    }
+                    nSSAINo.put(nssai, mesType1.getP());
+                }
 
+                List<MeasValue> measValueList = new ArrayList<MeasValue>();
 
-public void sendIntelligentSlicingPmData( SlicingPmMessage pmMessage) {
+                for (NRCellCUModel nRCellCUModel : gnbcucpModelList.get(i).getCellCUList()) {
+                    List<Result> resultList = new ArrayList<Result>();
+                    int noOfRequestedSessions = 0;
+                    int successfulSessions = 0;
+                    int failedSessions = 0;
+                    int configData = 0;
+                    double rNumForTotalReq = 0;
+                    int numberOfNssaiValue = 1; // change
+                    for (PLMNInfoModel pLMNInfoModel : nRCellCUModel.getpLMNInfoList()) {
+                        for (java.util.Map.Entry<String, Integer> nssaiMap : nSSAINo.entrySet()) {
+                            if (nssaiMap.getKey().equals(pLMNInfoModel.getsNSSAI().getsNSSAI())) {
+                                configData = pLMNInfoModel.getsNSSAI().getConfigData().getMaxNumberOfConns();
+                                noOfRequestedSessions = 0;
+                                successfulSessions = 0;
+                                for (java.util.Map.Entry<String, List<String>> taCellMap : taCells.entrySet()) {
+                                    for (String cell : taCellMap.getValue()) {
+                                        if (Integer.parseInt(cell) == nRCellCUModel.getCellLocalId().intValue()) {
+                                            long end = (System.currentTimeMillis());
+                                            if (peakEndTime > end) {
+                                                if (taCellMap.getKey().equalsIgnoreCase("TA1")
+                                                        || taCellMap.getKey().equalsIgnoreCase("TA3")) {
+                                                    rNumForTotalReq = 1.4 + (new Random().nextDouble() * (1.0 - 1.4));
+                                                } else {
+                                                    rNumForTotalReq = 0.6 + (new Random().nextDouble() * (0.3 - 0.6));
+                                                }
+                                            } else {
+                                                rNumForTotalReq = 0.7 + (new Random().nextDouble() * (0.3 - 0.7));
+                                            }
+                                        }
+                                    }
+                                }
 
-		log.info("inside sendIntelligentSlicingPmData");
-		
-		Gson gson = new Gson();
-		String jsonStr = gson.toJson(pmMessage);
+                                double rNumForFs = 0.10 + (new Random().nextDouble() * (0.05 - 0.10));
+                                double rNumForSs = 0.75 + (new Random().nextDouble() * (0.75 - 0.90));
+                                noOfRequestedSessions = (int) (configData * rNumForTotalReq);
+                                successfulSessions = (int) (noOfRequestedSessions * rNumForSs);
+                                failedSessions += noOfRequestedSessions - successfulSessions;
+                                numberOfNssaiValue = nssaiMap.getValue();
+                                Result result1 = new Result(numberOfNssaiValue++, noOfRequestedSessions);
+                                Result result2 = new Result(numberOfNssaiValue++, successfulSessions);
+                                resultList.add(result1);
+                                resultList.add(result2);
+                                if (numberOfNssaiValue == 3) {
+                                    numberOfNssaiValue++;
+                                }
+                                if (nRCellCUModel.getpLMNInfoList().indexOf(pLMNInfoModel) + 1 == nRCellCUModel
+                                        .getpLMNInfoList().size()) {
+                                    failedSessions -= failedSessions * rNumForFs;
+                                    Result result3 = new Result(3, failedSessions);
+                                    resultList.add(result3);
+                                }
+                            }
+                        }
 
-		log.info("IntelligentSlicingPmData " + jsonStr);
+                    }
 
-		String ipPort = RansimControllerServices.serverIdIpPortMapping.get(pmMessage.getSourceName());
+                    MeasValue measValue = new MeasValue(nRCellCUModel.getCellLocalId(), resultList, false);
+                    measValueList.add(measValue);
+                }
 
-		if (ipPort != null && !ipPort.trim().equals("")) {
+                ManagedElement managedElement = new ManagedElement("r0.1", gNBName);
+                LocalDateTime grabularityEndTime = LocalDateTime.now();
+                String grabularityEndTimeString = grabularityEndTime.toString();
+                GranularityPeriod granularityPeriod = new GranularityPeriod(grabularityEndTimeString, "PT900S");
+                MeasInfo measInfo = new MeasInfo("measInfoIsVal", job, granularityPeriod, reportingPeriod, measTypeList,
+                        measValueList);
+                List<MeasInfo> measInfoList = new ArrayList<MeasInfo>();
+                measInfoList.add(measInfo);
+                MeasData measData = new MeasData(managedElement, measInfoList);
+                List<MeasData> measDataList = new ArrayList<MeasData>();
+                measDataList.add(measData);
+                LocalDateTime endTime = LocalDateTime.now();
+                String endTimeString = endTime.toString();
+                pmMessage.setLastEpochMicrosec(System.currentTimeMillis() * 1000);
+                MeasCollecEnd measCollecEnd = new MeasCollecEnd(endTimeString);
+                FileFooter fileFooter = new FileFooter(measCollecEnd);
+                MeasCollecFile measCollecFile = new MeasCollecFile(fileHeader, measDataList, fileFooter,
+                        "http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec");
+                String startDate = beginTimeString.replace(':', '-');
+                String endDate = endTimeString.replace(':', '-');
+                String fileName =
+                        "A" + startDate + "-" + endDate + "-" + String.valueOf(jobId) + "-" + gNBName + ".xml";
+                pmMessage.setFileName(fileName);
+                Gson gson = new Gson();
+                String pmData = gson.toJson(measCollecFile);
+                pmMessage.setPmData(pmData);
+                sendIntelligentSlicingPmData(pmMessage);
+            }
+        } catch (Exception e) {
+            System.out.println("Exception: " + e);
+        }
+        return result;
+    }
 
-			log.info("Connection estabilished with ip: " + ipPort);
-			if (ipPort != null && !ipPort.trim().equals("")) {
-				Session clSess = RansimControllerServices.webSocketSessions.get(ipPort);
-				if (clSess != null) {
-					log.info("PM Data message sent.");
-					RansimWebSocketServer.sendIntelligentSlicingPmData(jsonStr, clSess);
-				} else {
-					log.info("No client session for " + ipPort);
-				}
-			} else {
-				log.info("No client for this serverId");
-			}
-		} else {
-			log.info("No client for ");
-		}
-     
-	}
-}
+    public static <T> ResponseEntity<List<GNBCUCPModel>> sendGetRequestToConfigDb(String requestUrl) {
+
+        HttpHeaders headers = new HttpHeaders();
+        log.info("sending...");
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        HttpEntity<Void> requestEntity = new HttpEntity<>(headers);
+        try {
+            RestTemplate restTemplate = new RestTemplate();
+            return restTemplate.exchange(requestUrl, HttpMethod.GET, requestEntity,
+                    new ParameterizedTypeReference<List<GNBCUCPModel>>() {});
+        } catch (Exception e) {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
+    public void sendIntelligentSlicingPmData(SlicingPmMessage pmMessage) {
+
+        log.info("inside sendIntelligentSlicingPmData");
 
+        Gson gson = new Gson();
+        String jsonStr = gson.toJson(pmMessage);
+
+        log.info("IntelligentSlicingPmData " + jsonStr);
+
+        String ipPort = RansimControllerServices.serverIdIpPortMapping.get(pmMessage.getSourceName());
+
+        if (ipPort != null && !ipPort.trim().equals("")) {
+
+            log.info("Connection estabilished with ip: " + ipPort);
+            if (ipPort != null && !ipPort.trim().equals("")) {
+                Session clSess = RansimControllerServices.webSocketSessions.get(ipPort);
+                if (clSess != null) {
+                    log.info("PM Data message sent.");
+                    RansimWebSocketServer.sendIntelligentSlicingPmData(jsonStr, clSess);
+                } else {
+                    log.info("No client session for " + ipPort);
+                }
+            } else {
+                log.info("No client for this serverId");
+            }
+        } else {
+            log.info("No client for ");
+        }
+
+    }
+}