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=6c0ca4bd4b17dc2f30332e8e3bd8db937e0ba25a;hb=4d6f9a14931a6aaaab28b482d73380e0960a82d6;hp=36543568a431c120352dc2d2df8c5905e4696f97;hpb=c535d05d9cf44ecee863387b8536211937f9a039;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 36543568..6c0ca4bd 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 @@ -28,7 +28,9 @@ import org.oransc.ric.anrxapp.client.api.NcrtApi; import org.oransc.ric.anrxapp.client.model.NeighborCellRelationDelTable; import org.oransc.ric.anrxapp.client.model.NeighborCellRelationModTable; import org.oransc.ric.anrxapp.client.model.NeighborCellRelationTable; +import org.oransc.ric.portal.dashboard.DashboardApplication; import org.oransc.ric.portal.dashboard.DashboardConstants; +import org.oransc.ric.portal.dashboard.model.SuccessTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +52,7 @@ import io.swagger.annotations.ApiOperation; */ @Configuration @RestController -@RequestMapping(value = DashboardConstants.ENDPOINT_PREFIX + "/ncrt", produces = MediaType.APPLICATION_JSON_VALUE) +@RequestMapping(value = DashboardConstants.ENDPOINT_PREFIX + "/xapp/anr", produces = MediaType.APPLICATION_JSON_VALUE) public class AnrXappController { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@ -74,6 +76,13 @@ public class AnrXappController { this.ncrtApi = ncrtApi; } + @ApiOperation(value = "Gets the ANR client library MANIFEST.MF property Implementation-Version.", response = SuccessTransport.class) + @RequestMapping(value = DashboardConstants.VERSION_PATH, method = RequestMethod.GET) + public SuccessTransport getVersion() { + logger.debug("getVersion enter"); + return new SuccessTransport(200, DashboardApplication.getImplementationVersion(HealthApi.class)); + } + @ApiOperation(value = "Performs a liveness probe on the ANR xApp, result expressed as the response code.") @RequestMapping(value = "/health/alive", method = RequestMethod.GET) public void getHealthAlive(HttpServletResponse response) { @@ -118,7 +127,7 @@ public class AnrXappController { @RequestBody NeighborCellRelationModTable ncrtModTable, // HttpServletResponse response) { logger.debug("modifyNcrt: cellIdentifier {} modTable {}", cellIdentifier, ncrtModTable); - ncrtApi.modifyNCRT(cellIdentifier, ncrtModTable, null, null, null, null); + ncrtApi.modifyNcrt(cellIdentifier, ncrtModTable); response.setStatus(healthApi.getApiClient().getStatusCode().value()); } @@ -128,7 +137,7 @@ public class AnrXappController { @RequestBody NeighborCellRelationDelTable ncrtDelTable, // HttpServletResponse response) { logger.debug("modifyNcrt: cellIdentifier {} delTable {}", cellIdentifier, ncrtDelTable); - ncrtApi.deleteNcrt(cellIdentifier, ncrtDelTable, null, null, null, null); + ncrtApi.deleteNcrt(cellIdentifier, ncrtDelTable); response.setStatus(healthApi.getApiClient().getStatusCode().value()); } }