X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FE2ManagerController.java;h=f4888fc76e9ad39b8144475199e1dd0101ddca02;hb=0b44138e09b41a42ee1f87afd39616478911dde5;hp=53593a642f1afdfa031b88c37e25216628f35ade;hpb=f660cae7a447b60d84ef75f7c2bcbf62412d4579;p=portal%2Fric-dashboard.git diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java index 53593a64..f4888fc7 100644 --- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java @@ -1,6 +1,6 @@ /*- * ========================LICENSE_START================================= - * ORAN-OSC + * O-RAN-SC * %% * Copyright (C) 2019 AT&T Intellectual Property and Nokia * %% @@ -26,15 +26,22 @@ import java.util.Set; import javax.servlet.http.HttpServletResponse; import org.oransc.ric.e2mgr.client.api.HealthCheckApi; -import org.oransc.ric.e2mgr.client.api.X2SetupRequestApi; +import org.oransc.ric.e2mgr.client.api.NodebApi; +import org.oransc.ric.e2mgr.client.model.GetNodebResponse; import org.oransc.ric.e2mgr.client.model.SetupRequest; +import org.oransc.ric.portal.dashboard.DashboardApplication; import org.oransc.ric.portal.dashboard.DashboardConstants; +import org.oransc.ric.portal.dashboard.model.E2SetupRequestType; +import org.oransc.ric.portal.dashboard.model.E2SetupResponse; +import org.oransc.ric.portal.dashboard.model.IDashboardResponse; +import org.oransc.ric.portal.dashboard.model.SuccessTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -46,8 +53,8 @@ import io.swagger.annotations.ApiOperation; * Provides methods to contact the E2 Manager. * * As of this writing the E2 interface only supports setup connection and check - * health actions; it does not support query or close operations on existing - * connections. So this class mocks up some of that needed functionality. + * health actions, and query by RAN name. But it does not support get-all, oo + * this class mocks up some of that functionality. */ @Configuration @RestController @@ -56,19 +63,23 @@ public class E2ManagerController { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + // Path parameters + private static final String PP_RANNAME = "ranName"; + // Populated by the autowired constructor - private final HealthCheckApi healthCheckApi; - private final X2SetupRequestApi x2SetupRequestApi; + private final HealthCheckApi e2HealthCheckApi; + private final NodebApi e2NodebApi; - // Tracks the requests previously submitted. + // Stores the requests and results. // TODO remove when the E2 manager is extended. - private Set requests = new HashSet<>(); + private Set responses = new HashSet<>(); @Autowired - public E2ManagerController(final HealthCheckApi healthCheckApi, final X2SetupRequestApi x2SetupRequestApi) { - Assert.notNull(healthCheckApi, "API must not be null"); - this.healthCheckApi = healthCheckApi; - this.x2SetupRequestApi = x2SetupRequestApi; + public E2ManagerController(final HealthCheckApi e2HealthCheckApi, final NodebApi e2NodebApi) { + Assert.notNull(e2HealthCheckApi, "API must not be null"); + Assert.notNull(e2NodebApi, "API must not be null"); + this.e2HealthCheckApi = e2HealthCheckApi; + this.e2NodebApi = e2NodebApi; } private void assertNotNull(Object o) { @@ -82,40 +93,81 @@ public class E2ManagerController { throw new IllegalArgumentException("Empty not permitted"); } + @ApiOperation(value = "Gets the E2 manager client library MANIFEST.MF property Implementation-Version.", response = SuccessTransport.class) + @RequestMapping(value = DashboardConstants.VERSION_PATH, method = RequestMethod.GET) + public SuccessTransport getE2ManagerClientVersion() { + return new SuccessTransport(200, DashboardApplication.getImplementationVersion(HealthCheckApi.class)); + } + @ApiOperation(value = "Gets the health from the E2 manager, expressed as the response code.") @RequestMapping(value = "/health", method = RequestMethod.GET) - public void getHealth(HttpServletResponse response) { - logger.debug("getHealth"); - healthCheckApi.healthCheck(); - response.setStatus(healthCheckApi.getApiClient().getStatusCode().value()); + public void getE2ManagerHealth(HttpServletResponse response) { + e2HealthCheckApi.healthGet(); + response.setStatus(e2HealthCheckApi.getApiClient().getStatusCode().value()); } - @ApiOperation(value = "Gets the unique requests submitted to the E2 manager.", response = SetupRequest.class, responseContainer = "List") + @ApiOperation(value = "Gets the unique requests submitted to the E2 manager.", response = E2SetupResponse.class, responseContainer = "List") @RequestMapping(value = "/setup", method = RequestMethod.GET) - public Iterable getRequests() { + public Iterable getRequests() { logger.debug("getRequests"); - return requests; + return responses; + } + + @ApiOperation(value = "Get RAN by name.", response = GetNodebResponse.class) + @RequestMapping(value = "/nodeb/{" + PP_RANNAME + "}", method = RequestMethod.GET) + public GetNodebResponse getNb(@PathVariable(PP_RANNAME) String ranName) { + logger.debug("getNb {}", ranName); + return e2NodebApi.getNb(ranName); + } + + // TODO replace with actual delete all RAN connections functionality + @ApiOperation(value = "Disconnect all RAN Connections.") + @RequestMapping(value = "/disconnectAllRAN", method = RequestMethod.DELETE) + public void disconnectAllRANConnections() { + logger.debug("disconnectAllRANConnections"); + responses.clear(); } - @ApiOperation(value = "Sets up a RAN connection via the E2 manager.") - @RequestMapping(value = "/setup", method = RequestMethod.POST) - public void setup(@RequestBody SetupRequest setupRequest, HttpServletResponse response) { - logger.debug("setup {}", setupRequest); + @ApiOperation(value = "Sets up an EN-DC RAN connection via the E2 manager.", response = E2SetupResponse.class) + @RequestMapping(value = "/endcSetup", method = RequestMethod.POST) + public E2SetupResponse endcSetup(@RequestBody SetupRequest setupRequest, HttpServletResponse response) { + logger.debug("endcSetup {}", setupRequest); + int responseCode = -1; try { assertNotEmpty(setupRequest.getRanIp()); assertNotEmpty(setupRequest.getRanName()); assertNotNull(setupRequest.getRanPort()); + e2NodebApi.endcSetup(setupRequest); + responseCode = e2NodebApi.getApiClient().getStatusCode().value(); } catch (Exception ex) { - logger.error("Bad request", ex); + logger.warn("endcSetup failed", ex); response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + responseCode = HttpServletResponse.SC_BAD_REQUEST; } + E2SetupResponse r = new E2SetupResponse(E2SetupRequestType.ENDC, setupRequest, responseCode); + responses.add(r); + return r; + } + + @ApiOperation(value = "Sets up an X2 RAN connection via the E2 manager.", response = E2SetupResponse.class) + @RequestMapping(value = "/x2Setup", method = RequestMethod.POST) + public IDashboardResponse x2Setup(@RequestBody SetupRequest setupRequest, HttpServletResponse response) { + logger.debug("x2Setup {}", setupRequest); + int responseCode = -1; try { - requests.add(setupRequest); - x2SetupRequestApi.setup(setupRequest); + assertNotEmpty(setupRequest.getRanIp()); + assertNotEmpty(setupRequest.getRanName()); + assertNotNull(setupRequest.getRanPort()); + e2NodebApi.x2Setup(setupRequest); + responseCode = e2NodebApi.getApiClient().getStatusCode().value(); } catch (Exception ex) { - logger.error("Failed", ex); - response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.warn("x2Setup failed", ex); + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + responseCode = HttpServletResponse.SC_BAD_REQUEST; } + E2SetupResponse r = new E2SetupResponse(E2SetupRequestType.X2, setupRequest, responseCode); + responses.add(r); + return r; } }