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=97604a4e7140bac4399997e9591b41310fe31646;hb=c40f0d5d74bfa57a8ee28ba818b7fcd67633177d;hp=26b404a500eaecfccfcf590bc7aa63f50f2ee226;hpb=9457e10be41282c973744cdced34cdeff65837f7;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 26b404a5..97604a4e 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,12 +25,15 @@ 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.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;
@@ -59,16 +62,19 @@ public class E2ManagerController {
 	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;
 
 	// 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) {
@@ -82,12 +88,17 @@ 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");
-		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")
@@ -97,6 +108,14 @@ public class E2ManagerController {
 		return responses;
 	}
 
+	// 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) {
@@ -106,8 +125,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);
@@ -127,8 +146,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);