diff options
Diffstat (limited to 'ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services')
2 files changed, 281 insertions, 213 deletions
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimControllerServices.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimControllerServices.java index 3e1e2a9..7aad13a 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimControllerServices.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimControllerServices.java @@ -58,6 +58,7 @@ import org.onap.ransim.rest.api.models.NeighborDetails; import org.onap.ransim.rest.api.models.NeihborId; import org.onap.ransim.rest.api.models.NetconfServers; import org.onap.ransim.rest.api.models.NRCellCU; +import org.onap.ransim.rest.api.models.NRCellRelation; import org.onap.ransim.rest.api.models.PLMNInfo; import org.onap.ransim.rest.api.models.RRMPolicyMember; import org.onap.ransim.rest.api.models.RRMPolicyRatio; @@ -87,7 +88,6 @@ import org.onap.ransim.websocket.model.ConfigData; import org.onap.ransim.websocket.model.ConfigPLMNInfo; import org.onap.ransim.websocket.model.GNBCUCPFunction; import org.onap.ransim.websocket.model.ModifyNeighbor; -import org.onap.ransim.websocket.model.ModifyPci; import org.onap.ransim.websocket.model.Neighbor; import org.onap.ransim.websocket.model.SNSSAI; import org.onap.ransim.websocket.model.SetConfigTopology; @@ -466,7 +466,7 @@ public class RansimControllerServices { for (NRCellCUModel nRCellCUModel : gNBCUCPModel.getCellCUList()) { if (nRCellCUModel.getpLMNInfoList().isEmpty()) { org.json.simple.parser.JSONParser jsonParser = new org.json.simple.parser.JSONParser(); - try (FileReader reader = new FileReader("/tmp/ransim-install/config/ransimdata.json")) { + try (FileReader reader = new FileReader("/tmp/ransim-install/config/ran-data.json")) { // Read JSON file Object obj = jsonParser.parse(reader); JSONArray List = (JSONArray) obj; @@ -1126,7 +1126,7 @@ public class RansimControllerServices { List<NRCellDU> nRCellDUList = new ArrayList<>(); for (NRCellDUModel nRCellDUModel : gNBDUModel.getCellDUList()) { NRCellDU nRCellDU = new NRCellDU(); - Attributes nRCellDUattributes = new Attributes(); + DUAttributes nRCellDUattributes = new DUAttributes(); nRCellDUattributes.setOperationalState(nRCellDUModel.getOperationalState()); nRCellDUattributes.setCellState(nRCellDUModel.getCellState()); nRCellDU.setAttributes(nRCellDUattributes); @@ -1224,9 +1224,9 @@ public class RansimControllerServices { nbr.setIdNRCellRelation(nbrCell.getNodeId()); nbr.setNRTCI(nbrCell.getPhysicalCellId()); nbr.setIdGNBCUCPFunction(nbrCell.getServerId()); - nbr.setServerId(nbrCell.getServerId()); + nbr.setServerId(nbrCell.getServerId()); nbr.setPlmnId(nbrCell.getNetworkId()); - nbr.setIsHOAllowed(cellDetails.isBlacklisted()); + nbr.setIsHOAllowed(cellDetails.isBlacklisted()); nbrList.add(nbr); } cell.setNeighborList(nbrList); @@ -1272,14 +1272,21 @@ public class RansimControllerServices { */ public void handleModifyPciFromSdnr(String message, Session session, String ipPort) { log.info("handleModifyPciFromSDNR: message:" + message + " session:" + session + " ipPort:" + ipPort); - ModifyPci modifyPci = new Gson().fromJson(message, ModifyPci.class); - log.info("handleModifyPciFromSDNR: modifyPci:" + modifyPci.getIdNRCellDU() + "; pci: " + modifyPci.getNRPCI()); - String source = "Netconf"; - CellDetails cd = ransimRepo.getCellDetail(modifyPci.getIdNRCellDU()); - long pci = cd.getPhysicalCellId(); - cd.setPhysicalCellId(modifyPci.getNRPCI()); - ransimRepo.mergeCellDetails(cd); - rsPciHdlr.updatePciOperationsTable(modifyPci.getIdNRCellDU(), source, pci, modifyPci.getNRPCI()); + NRCellDU modifyPci = new Gson().fromJson(message, NRCellDU.class); + log.info("handleModifyPciFromSDNR: modifyPci:" + modifyPci.getIdNRCellDU() + "; pci: " + modifyPci.getAttributes().getNRPCI()); + String source = "Netconf"; + int cellLocalId = Integer.parseInt(modifyPci.getIdNRCellDU()); + org.onap.ransim.rest.api.models.NRCellDU nrCellDU = ransimRepo.getNRCellDUDetail(cellLocalId); + //CellDetails cd = ransimRepo.getCellDetail(modifyPci.getIdNRCellDU()); + log.info("NRCellDU: " + nrCellDU); + int nRPCI = nrCellDU.getnRPCI(); + nrCellDU.setnRPCI(modifyPci.getAttributes().getNRPCI()); + ransimRepo.mergeNRCellDU(nrCellDU); + long pci = Long.valueOf(nRPCI); + //long pci = cd.getPhysicalCellId(); + //cd.setPhysicalCellId(modifyPci.getAttributes().getNRPCI()); + //ransimRepo.mergeCellDetails(cd); + rsPciHdlr.updatePciOperationsTable(modifyPci.getIdNRCellDU(), source, pci, modifyPci.getAttributes().getNRPCI()); } public void handleRTRICConfigFromSdnr(String message, Session session, String ipPort) { @@ -1558,48 +1565,39 @@ public class RansimControllerServices { public void handleModifyNeighborFromSdnr(String message, Session session, String ipPort) { log.info("handleModifyAnrFromSDNR: message:" + message + " session:" + session + " ipPort:" + ipPort); ModifyNeighbor modifyNeighbor = new Gson().fromJson(message, ModifyNeighbor.class); - log.info("handleModifyAnrFromSDNR: modifyPci:" + modifyNeighbor.getIdNRCellCU()); - List<NeighborDetails> neighborList = new ArrayList<NeighborDetails>(); + log.info("handleModifyAnrFromSDNR: modifyNeighbor:" + modifyNeighbor.getIdNRCellCU()); + Integer cellLocalId = Integer.parseInt(modifyNeighbor.getIdNRCellCU()); + Integer idNRCellRel = Integer.parseInt(modifyNeighbor.getIdNRCellRelation()); + org.onap.ransim.rest.api.models.NRCellCU nrCellCU = ransimRepo.getNRCellCUDetail(cellLocalId); + NRCellRelation nRCellRel = new NRCellRelation(); + nRCellRel.setIdNRCellRelation(idNRCellRel); + nRCellRel.setnRTCI(modifyNeighbor.getAttributes().getNRTCI()); + nRCellRel.setisHOAllowed(modifyNeighbor.getAttributes().getIsHOAllowed()); + nRCellRel.setCellLocalId(nrCellCU); List<String> cellList = new ArrayList<String>(); cellList.add(modifyNeighbor.getIdNRCellCU()); + cellList.add(modifyNeighbor.getIdNRCellRelation()); String nbrsAdd = ""; String nbrsDel = ""; String source = "Netconf"; - for (int i = 0; i < modifyNeighbor.getNeighborList().size(); i++) { - if (!modifyNeighbor.getNeighborList().get(i).getIsHOAllowed()) { - NeighborDetails nd = new NeighborDetails( - new NeihborId(modifyNeighbor.getIdNRCellCU(), modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation()), - true); - ransimRepo.mergeNeighborDetails(nd); - cellList.add(modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation()); - if (nbrsAdd.equals("")) { - nbrsDel = modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation(); - } else { - nbrsDel += "," + modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation(); - } - } else { - NeighborDetails nd = new NeighborDetails( - new NeihborId(modifyNeighbor.getIdNRCellCU(), modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation()), - false); - ransimRepo.mergeNeighborDetails(nd); - cellList.add(modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation()); - if (nbrsDel.equals("")) { - nbrsAdd = modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation(); - } else { - nbrsAdd += "," + modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation(); - } - } - - } + NRCellRelation nRCellRel1 = ransimRepo.getNRCellRelation(idNRCellRel,nrCellCU); + if(nRCellRel1!=null){ + nRCellRel1.setisHOAllowed(modifyNeighbor.getAttributes().getIsHOAllowed()); + ransimRepo.mergeNRCellRel(nRCellRel1); + if(!modifyNeighbor.getAttributes().getIsHOAllowed()) { + nbrsDel = modifyNeighbor.getIdNRCellRelation(); + } + } else { + nbrsAdd = modifyNeighbor.getIdNRCellRelation(); + ransimRepo.mergeNRCellRel(nRCellRel); + } for (String cl : cellList) { rsPciHdlr.setCollisionConfusionFromFile(cl); } - log.info("neighbor list: " + neighborList); - - rsPciHdlr.updateNbrsOperationsTable(modifyNeighbor.getIdNRCellCU(), source, nbrsAdd, nbrsDel); + rsPciHdlr.updateNbrsOperationsTable(modifyNeighbor.getIdNRCellCU(), source, nbrsAdd, nbrsDel); } /** @@ -1621,7 +1619,7 @@ public class RansimControllerServices { Neighbor nbr = new Neighbor(); CellDetails nbrCell = ransimRepo.getCellDetail(nbCell.getNeigbor().getNeighborCell()); - nbr.setIdNRCellRelation(nbrCell.getNodeId()); + nbr.setIdNRCellRelation(nbrCell.getNodeId()); nbr.setNRTCI(nbrCell.getPhysicalCellId()); nbr.setIdGNBCUCPFunction(nbrCell.getNodeName()); nbr.setServerId(nbrCell.getServerId()); diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimRepositoryService.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimRepositoryService.java index f707369..8a6713b 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimRepositoryService.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimRepositoryService.java @@ -30,10 +30,14 @@ import org.onap.ransim.rest.api.models.CellNeighbor; import org.onap.ransim.rest.api.models.NeighborDetails; import org.onap.ransim.rest.api.models.NetconfServers; import org.onap.ransim.rest.api.models.NRCellCU; +import org.onap.ransim.rest.api.models.NRCellDU; +import org.onap.ransim.rest.api.models.NRCellRelation; import org.onap.ransim.rest.api.models.OperationLog; import org.onap.ransim.rest.api.repository.CellDetailsRepo; import org.onap.ransim.rest.api.repository.CellNeighborRepo; import org.onap.ransim.rest.api.repository.NRCellCURepository; +import org.onap.ransim.rest.api.repository.NRCellDURepository; +import org.onap.ransim.rest.api.repository.NRCellRelationRepository; import org.onap.ransim.rest.api.repository.NeighborDetailsRepo; import org.onap.ransim.rest.api.repository.NetconfServersRepo; import org.onap.ransim.rest.api.repository.OperationLogRepo; @@ -52,6 +56,12 @@ public class RansimRepositoryService { NRCellCURepository nRCellCURepo; @Autowired + NRCellDURepository nRCellDURepo; + + @Autowired + NRCellRelationRepository nRCellRelRepo; + + @Autowired NetconfServersRepo netconfServersRepo; @Autowired @@ -79,6 +89,21 @@ public class RansimRepositoryService { } /** + * Method to retrieve cellDU details + * + * @param cellLocalId + * @return + */ + public NRCellDU getNRCellDUDetail(Integer cellLocalId) { + Optional<NRCellDU> cd = nRCellDURepo.findById(cellLocalId); + NRCellDU nrCellDU = null; + if (cd.isPresent()) { + nrCellDU = cd.get(); + } + return nrCellDU; + } + + /** * Method to retrieve cellCU details * * @param cellLocalId @@ -93,189 +118,234 @@ public class RansimRepositoryService { return nrCellCU; } - /** - * Method to retrieve cellCU neighbors + /** + * Method to retrieve cellCU details * + * @param idNRCellRelation * @param cellLocalId * @return */ - public NRCellCU getCellRelation(Integer cellLocalId) { - Optional<NRCellCU> cellNeighborDetails = nRCellCURepo.findById(cellLocalId); - NRCellCU cellRelation = null; - if (cellNeighborDetails.isPresent()) { - cellRelation = cellNeighborDetails.get(); + public NRCellRelation getNRCellRelation(Integer idNRCellRelation, NRCellCU cellLocalId) { + Optional<NRCellRelation> rel = nRCellRelRepo.findByIdNRCellRelationAndCellLocalId(idNRCellRelation,cellLocalId); + NRCellRelation nRCellRel = null; + if (rel.isPresent()) { + nRCellRel = rel.get(); } - return cellRelation; - } - - /** - * Method to retrieve netconf server details - * - * @param serverId - * @return - */ - public NetconfServers getNetconfServer(String serverId) { - Optional<NetconfServers> serverDetails = netconfServersRepo.findById(serverId); - NetconfServers server = null; - if (serverDetails.isPresent()) { - server = serverDetails.get(); - } - return server; + return nRCellRel; } /** - * Method to retrieve cell neighbors - * - * @param nodeId - * @return - */ - public CellNeighbor getCellNeighbor(String nodeId) { - Optional<CellNeighbor> cellNeighborDetails = cellNeighborRepo.findById(nodeId); - CellNeighbor cellNeighbor = null; - if (cellNeighborDetails.isPresent()) { - cellNeighbor = cellNeighborDetails.get(); - } - return cellNeighbor; - } - - /** - * Method to retrieve all cell details - * - * @return - */ - public List<CellDetails> getCellDetailsList() { - Iterable<CellDetails> cellsList = cellDetailsRepo.findAll(); - if (cellsList != null) { - return (List<CellDetails>) cellsList; - } else { - return new ArrayList<>(); - } - } - - /** - * Method to retrieve cells with no server ids - * - * @return - */ - public List<CellDetails> getCellsWithNoServerIds() { - List<CellDetails> cellsList = cellDetailsRepo.findCellsWithNoServerId(); - if (cellsList != null) { - return cellsList; - } else { - return new ArrayList<>(); - } - } - - /** - * Method to retrieve cell with collision or confusion - * - * @return - */ - public List<CellDetails> getCellsWithCollisionOrConfusion() { - List<CellDetails> cellsList = cellDetailsRepo.getCellsWithCollisionOrConfusion(); - if (cellsList != null) { - return cellsList; - } else { - return new ArrayList<>(); - } - } - - /** - * Method to retrieve operation log - * - * @return - */ - public List<OperationLog> getOperationLogList() { - Iterable<OperationLog> opLogList = operationLogRepo.findAll(); - if (opLogList != null) { - return (List<OperationLog>) opLogList; - } else { - return new ArrayList<>(); - } - } - - /** - * Method to retrieve all netconf servers - * - * @return - */ - public List<NetconfServers> getNetconfServersList() { - Iterable<NetconfServers> serversList = netconfServersRepo.findAll(); - if (serversList != null) { - return (List<NetconfServers>) serversList; - } else { - return new ArrayList<>(); - } - } - - /** - * Method to retrieve all cell neighbors - * - * @return - */ - public List<CellNeighbor> getCellNeighborList() { - Iterable<CellNeighbor> cellNeighborList = cellNeighborRepo.findAll(); - if (cellNeighborList != null) { - return (List<CellNeighbor>) cellNeighborList; - } else { - return new ArrayList<>(); - } - } - - /** - * Method to delete specific cells - * - * @param deleteCelldetail - */ - public void deleteCellDetails(CellDetails deleteCelldetail) { - - if (deleteCelldetail.getServerId() != null) { - NetconfServers ns = getNetconfServer(deleteCelldetail.getServerId()); - if (ns != null) { - ns.getCells().remove(deleteCelldetail); - netconfServersRepo.save(ns); - } - } - cellDetailsRepo.deleteById(deleteCelldetail.getNodeId()); - } - - /** - * Method to delete cell neighbors - * - * @param deleteCellNeighbor - */ - public void deleteCellNeighbor(CellNeighbor deleteCellNeighbor) { - cellNeighborRepo.deleteById(deleteCellNeighbor.getNodeId()); - } - - /** - * Method to delete all netconf servers - */ - public void deleteNetconfServers() { - netconfServersRepo.deleteAll(); - } - - /** - * Method to delete all cell neighbors - */ - public void deleteCellNeighbors() { - cellNeighborRepo.deleteAll(); + * Method to retrieve cellCU details + * + * @param cellLocalId + * @return + */ + public List<NRCellRelation> getNRCellRelationList(NRCellCU cellLocalId) { + List<NRCellRelation> rel = nRCellRelRepo.findByCellLocalId(cellLocalId); + return rel; } - /** - * Method to delete all cells - */ - public void deleteAllCellDetails() { - cellDetailsRepo.deleteAll(); + /** + * Method to retrieve cellCU neighbors + * + * @param cellLocalId + * @return + */ + public NRCellCU getCellRelation(Integer cellLocalId) { + Optional<NRCellCU> cellNeighborDetails = nRCellCURepo.findById(cellLocalId); + NRCellCU cellRelation = null; + if (cellNeighborDetails.isPresent()) { + cellRelation = cellNeighborDetails.get(); + } + return cellRelation; + } + + /** + * Method to retrieve netconf server details + * + * @param serverId + * @return + */ + public NetconfServers getNetconfServer(String serverId) { + Optional<NetconfServers> serverDetails = netconfServersRepo.findById(serverId); + NetconfServers server = null; + if (serverDetails.isPresent()) { + server = serverDetails.get(); + } + return server; + } + + /** + * Method to retrieve cell neighbors + * + * @param nodeId + * @return + */ + public CellNeighbor getCellNeighbor(String nodeId) { + Optional<CellNeighbor> cellNeighborDetails = cellNeighborRepo.findById(nodeId); + CellNeighbor cellNeighbor = null; + if (cellNeighborDetails.isPresent()) { + cellNeighbor = cellNeighborDetails.get(); + } + return cellNeighbor; + } + + /** + * Method to retrieve all cell details + * + * @return + */ + public List<CellDetails> getCellDetailsList() { + Iterable<CellDetails> cellsList = cellDetailsRepo.findAll(); + if (cellsList != null) { + return (List<CellDetails>) cellsList; + } else { + return new ArrayList<>(); + } + } + + /** + * Method to retrieve cells with no server ids + * + * @return + */ + public List<CellDetails> getCellsWithNoServerIds() { + List<CellDetails> cellsList = cellDetailsRepo.findCellsWithNoServerId(); + if (cellsList != null) { + return cellsList; + } else { + return new ArrayList<>(); + } + } + + /** + * Method to retrieve cell with collision or confusion + * + * @return + */ + public List<CellDetails> getCellsWithCollisionOrConfusion() { + List<CellDetails> cellsList = cellDetailsRepo.getCellsWithCollisionOrConfusion(); + if (cellsList != null) { + return cellsList; + } else { + return new ArrayList<>(); + } + } + + /** + * Method to retrieve operation log + * + * @return + */ + public List<OperationLog> getOperationLogList() { + Iterable<OperationLog> opLogList = operationLogRepo.findAll(); + if (opLogList != null) { + return (List<OperationLog>) opLogList; + } else { + return new ArrayList<>(); + } + } + + /** + * Method to retrieve all netconf servers + * + * @return + */ + public List<NetconfServers> getNetconfServersList() { + Iterable<NetconfServers> serversList = netconfServersRepo.findAll(); + if (serversList != null) { + return (List<NetconfServers>) serversList; + } else { + return new ArrayList<>(); + } + } + + /** + * Method to retrieve all cell neighbors + * + * @return + */ + public List<CellNeighbor> getCellNeighborList() { + Iterable<CellNeighbor> cellNeighborList = cellNeighborRepo.findAll(); + if (cellNeighborList != null) { + return (List<CellNeighbor>) cellNeighborList; + } else { + return new ArrayList<>(); + } + } + + /** + * Method to delete specific cells + * + * @param deleteCelldetail + */ + public void deleteCellDetails(CellDetails deleteCelldetail) { + + if (deleteCelldetail.getServerId() != null) { + NetconfServers ns = getNetconfServer(deleteCelldetail.getServerId()); + if (ns != null) { + ns.getCells().remove(deleteCelldetail); + netconfServersRepo.save(ns); + } + } + cellDetailsRepo.deleteById(deleteCelldetail.getNodeId()); + } + + /** + * Method to delete cell neighbors + * + * @param deleteCellNeighbor + */ + public void deleteCellNeighbor(CellNeighbor deleteCellNeighbor) { + cellNeighborRepo.deleteById(deleteCellNeighbor.getNodeId()); + } + + /** + * Method to delete all netconf servers + */ + public void deleteNetconfServers() { + netconfServersRepo.deleteAll(); + } + + /** + * Method to delete all cell neighbors + */ + public void deleteCellNeighbors() { + cellNeighborRepo.deleteAll(); + } + + /** + * Method to delete all cells + */ + public void deleteAllCellDetails() { + cellDetailsRepo.deleteAll(); + } + + /** + * Method to save cells + * + * @param cellDetail + */ + public void mergeCellDetails(CellDetails cellDetail) { + cellDetailsRepo.save(cellDetail); + } + + /** + * Method to save cells + * + * @param nRCellRelation + */ + public void mergeNRCellRel(NRCellRelation nRCellRel) { + nRCellRelRepo.save(nRCellRel); } /** * Method to save cells - * - * @param cellDetail + * + * @param nRCellDU */ - public void mergeCellDetails(CellDetails cellDetail) { - cellDetailsRepo.save(cellDetail); + public void mergeNRCellDU(NRCellDU nRCellDU) { + nRCellDURepo.save(nRCellDU); } /** |