X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FAnrXappController.java;h=aa7b443fe189a719beadf7d1dbac41d519fed8da;hb=refs%2Fchanges%2F84%2F184%2F2;hp=5692c5e4f5e813126d56ef64d00586d682d1f0db;hpb=2239b1d982aafe5e7dce4dbbec5100f3e3191249;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java
index 5692c5e4..aa7b443f 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java
@@ -101,7 +101,7 @@ public class AnrXappController {
 
 	@ApiOperation(value = "Query NCRT of all cells, all or one gNB(s)", response = NeighborCellRelationTable.class)
 	@RequestMapping(value = "/cell", method = RequestMethod.GET)
-	public NeighborCellRelationTable queryNcrtAllCells( //
+	public NeighborCellRelationTable getNcrtInfo( //
 			@RequestParam(name = GGNBID, required = false) String ggnbId, //
 			@RequestParam(name = START_INDEX, required = false) String startIndex, //
 			@RequestParam(name = LIMIT, required = false) Integer limit) {
@@ -111,14 +111,14 @@ public class AnrXappController {
 
 	@ApiOperation(value = "Query NCRT of a single serving cell", response = NeighborCellRelationTable.class)
 	@RequestMapping(value = "/cell/" + CELL_ID + "/{" + CELL_ID + "}", method = RequestMethod.GET)
-	public NeighborCellRelationTable queryNcrtServingCell(@PathVariable(CELL_ID) String cellIdentifier, //
+	public NeighborCellRelationTable getCellNcrtInfo(@PathVariable(CELL_ID) String cellIdentifier, //
 			@RequestParam(name = START_INDEX, required = false) String startIndex, //
 			@RequestParam(name = LIMIT, required = false) Integer limit,
 			@RequestParam(name = NRPCI, required = false) String nrpci,
 			@RequestParam(name = NRCGI, required = false) String nrcgi) {
 		logger.debug("queryNcrtAllCells: cellIdentifier {}, startIndex {} limit {} nrpci {} nrcgi {}", cellIdentifier,
 				startIndex, limit, nrpci, nrcgi);
-		return ncrtApi.getCellNcrtInfo(cellIdentifier,  nrpci, nrcgi, startIndex, limit);
+		return ncrtApi.getCellNcrtInfo(cellIdentifier, startIndex, limit, nrpci, nrcgi);
 	}
 
 	@ApiOperation(value = "Modify neighbor cell relation based on Source Cell NR CGI and Target Cell NR PCI / NR CGI")
@@ -127,17 +127,21 @@ public class AnrXappController {
 			@RequestBody NeighborCellRelationModTable ncrtModTable, //
 			HttpServletResponse response) {
 		logger.debug("modifyNcrt: cellIdentifier {} modTable {}", cellIdentifier, ncrtModTable);
-		ncrtApi.modifyNcrt(cellIdentifier, ncrtModTable, null, null);
+		ncrtApi.modifyNcrt(cellIdentifier, ncrtModTable);
 		response.setStatus(healthApi.getApiClient().getStatusCode().value());
 	}
 
+	/*
+	 * TODO: DELETE should not have a body - the path should identify the resource to be deleted.
+	 */
 	@ApiOperation(value = "Delete neighbor cell relation based on Source Cell NR CGI and Target Cell NR PCI / NR CGI")
 	@RequestMapping(value = "/cell/" + CELL_ID + "/{" + CELL_ID + "}", method = RequestMethod.DELETE)
-	public void modifyNcrt(@PathVariable(CELL_ID) String cellIdentifier, //
+	public void deleteNcrt(@PathVariable(CELL_ID) String cellIdentifier, //
 			@RequestBody NeighborCellRelationDelTable ncrtDelTable, //
 			HttpServletResponse response) {
 		logger.debug("modifyNcrt: cellIdentifier {} delTable {}", cellIdentifier, ncrtDelTable);
-		ncrtApi.deleteNcrt(cellIdentifier, ncrtDelTable, null, null);
+		ncrtApi.deleteNcrt(cellIdentifier, ncrtDelTable);
 		response.setStatus(healthApi.getApiClient().getStatusCode().value());
 	}
+
 }