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%2FE2ManagerController.java;h=f4888fc76e9ad39b8144475199e1dd0101ddca02;hb=50aee48c8b79e3b43b3da0eb471d8db84a361fff;hp=8b1fe7241b85f5f240a022950a7a4734d4ff5699;hpb=2239b1d982aafe5e7dce4dbbec5100f3e3191249;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 8b1fe724..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
@@ -25,7 +25,9 @@ import java.util.Set;
 
 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.GetNodebResponse;
 import org.oransc.ric.e2mgr.client.model.SetupRequest;
 import org.oransc.ric.portal.dashboard.DashboardApplication;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
@@ -39,6 +41,7 @@ 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;
@@ -50,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 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
@@ -60,17 +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 E2ManagerApi e2ManagerApi;
+	private final HealthCheckApi e2HealthCheckApi;
+	private final NodebApi e2NodebApi;
 
 	// Stores the requests and results.
 	// TODO remove when the E2 manager is extended.
 	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) {
@@ -86,17 +95,15 @@ public class E2ManagerController {
 
 	@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 getVersion() {
-		logger.debug("getVersion enter");
-		return new SuccessTransport(200, DashboardApplication.getImplementationVersion(E2ManagerApi.class));
+	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 = E2SetupResponse.class, responseContainer = "List")
@@ -106,6 +113,21 @@ public class E2ManagerController {
 		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 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) {
@@ -115,8 +137,8 @@ public class E2ManagerController {
 			assertNotEmpty(setupRequest.getRanIp());
 			assertNotEmpty(setupRequest.getRanName());
 			assertNotNull(setupRequest.getRanPort());
-			e2ManagerApi.endcSetup(setupRequest);
-			responseCode = e2ManagerApi.getApiClient().getStatusCode().value();
+			e2NodebApi.endcSetup(setupRequest);
+			responseCode = e2NodebApi.getApiClient().getStatusCode().value();
 		} catch (Exception ex) {
 			logger.warn("endcSetup failed", ex);
 			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
@@ -136,8 +158,8 @@ public class E2ManagerController {
 			assertNotEmpty(setupRequest.getRanIp());
 			assertNotEmpty(setupRequest.getRanName());
 			assertNotNull(setupRequest.getRanPort());
-			e2ManagerApi.setup(setupRequest);
-			responseCode = e2ManagerApi.getApiClient().getStatusCode().value();
+			e2NodebApi.x2Setup(setupRequest);
+			responseCode = e2NodebApi.getApiClient().getStatusCode().value();
 		} catch (Exception ex) {
 			logger.warn("x2Setup failed", ex);
 			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);