/*-
* ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
* %%
* Copyright (C) 2019 AT&T Intellectual Property and Nokia
* %%
import javax.servlet.http.HttpServletResponse;
-import org.oransc.ric.e2mgr.client.api.E2ManagerApi;
+import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
+import org.oransc.ric.e2mgr.client.api.NodebApi;
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;
*
* 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.
+ * connections. So this class mocks up some of that functionality.
*/
@Configuration
@RestController
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// Populated by the autowired constructor
- private final E2ManagerApi e2ManagerApi;
+ 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<SetupRequest> requests = new HashSet<>();
+ private Set<E2SetupResponse> responses = new HashSet<>();
@Autowired
- public E2ManagerController(final E2ManagerApi e2ManagerApi) {
- Assert.notNull(e2ManagerApi, "API must not be null");
- this.e2ManagerApi = e2ManagerApi;
+ 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) {
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");
- e2ManagerApi.healthCheck();
- response.setStatus(e2ManagerApi.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<SetupRequest> getRequests() {
+ public Iterable<E2SetupResponse> getRequests() {
logger.debug("getRequests");
- return requests;
+ return responses;
}
- @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);
+ // 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 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);
- e2ManagerApi.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;
}
}
Code Review / portal / ric-dashboard.git / blobdiff