X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foranosc%2Fric%2Fportal%2Fdash%2Fcontroller%2FXappManagerController.java;h=094d518b486cd058f6617b9de567f47f3b832436;hb=bda70e88ca63203c5a8cc034e824ec5855c32e4b;hp=1e4e52248fe3e5d6b10960576ffae952ca408722;hpb=e2cbc4d0304646febf7e2cbe0dccdf9840189222;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/XappManagerController.java b/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/XappManagerController.java
index 1e4e5224..094d518b 100644
--- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/XappManagerController.java
+++ b/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/XappManagerController.java
@@ -21,20 +21,33 @@ package org.oranosc.ric.portal.dash.controller;
 
 import java.lang.invoke.MethodHandles;
 
+import javax.servlet.http.HttpServletResponse;
+
 import org.oranosc.ric.portal.dash.DashboardConstants;
-import org.oranosc.ric.portal.dashboard.xmc.api.DefaultApi;
-import org.oranosc.ric.portal.dashboard.xmc.model.AllXapps;
+import org.oranosc.ric.portal.dash.model.ErrorTransport;
+import org.oranosc.ric.xappmgr.client.api.DefaultApi;
+import org.oranosc.ric.xappmgr.client.model.AllXapps;
+import org.oranosc.ric.xappmgr.client.model.XAppInfo;
+import org.oranosc.ric.xappmgr.client.model.Xapp;
 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;
 import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.annotations.ApiOperation;
 
+/**
+ * Mimics the xApp Manager API. These controller methods just proxy calls from
+ * the front-end thru to the real back-end.
+ *
+ */
 @Configuration
 @RestController
 @RequestMapping(value = DashboardConstants.ENDPOINT_PREFIX + "/xappmgr", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -42,15 +55,60 @@ public class XappManagerController {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+	// Populated by the autowired constructor
+	private final DefaultApi xappMgrClient;
+
 	@Autowired
-	private DefaultApi xappManagerClient;
+	public XappManagerController(final DefaultApi xappMgrClient) {
+		Assert.notNull(xappMgrClient, "client must not be null");
+		this.xappMgrClient = xappMgrClient;
+	}
+
+	@ApiOperation(value = "Calls the xApp Manager health check.")
+	@RequestMapping(value = "/health", method = RequestMethod.GET)
+	public void getHealth(HttpServletResponse response) {
+		logger.debug("getHealth");
+		xappMgrClient.getHealth();
+		response.setStatus(xappMgrClient.getApiClient().getStatusCode().value());
+	}
 
-	@ApiOperation(value = "Gets the list of xApps from the xApp manager.", response = AllXapps.class)
+	@ApiOperation(value = "Calls the xApp Manager to get the list of xApps.", response = AllXapps.class)
 	@RequestMapping(value = "/xapps", method = RequestMethod.GET)
 	public AllXapps getAllXapps() {
-		logger.debug("getAllXapps via " + xappManagerClient.getApiClient().getBasePath());
-		AllXapps all = xappManagerClient.getAllXapps();
-		return all;
+		logger.debug("getAllXapps via " + xappMgrClient.getApiClient().getBasePath());
+		return xappMgrClient.getAllXapps();
+	}
+
+	@ApiOperation(value = "Calls the xApp Manager to get the named xApp.", response = Xapp.class)
+	@RequestMapping(value = "/xapps/{xAppName}", method = RequestMethod.GET)
+	public Xapp getXapp(@PathVariable("xAppName") String xAppName) {
+		logger.debug("getXapp {}", xAppName);
+		return xappMgrClient.getXappByName(xAppName);
+	}
+
+	@ApiOperation(value = "Calls the xApp Manager to deploy the specified Xapp.", response = Xapp.class)
+	@RequestMapping(value = "/xapps", method = RequestMethod.POST)
+	public Object deployXapp(@RequestBody XAppInfo xAppInfo, HttpServletResponse response) {
+		logger.debug("deployXapp {}", xAppInfo);
+		try {
+			return xappMgrClient.deployXapp(xAppInfo);
+		} catch (Exception ex) {
+			logger.error("deployXapp failed", ex);
+			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+			return new ErrorTransport(500, "deployXapp failed", ex);
+		}
+	}
+
+	@ApiOperation(value = "Calls the xApp Manager to undeploy the named Xapp.")
+	@RequestMapping(value = "/xapps/{xAppName}", method = RequestMethod.DELETE)
+	public void undeployXapp(@PathVariable("xAppName") String xAppName, HttpServletResponse response) {
+		logger.debug("undeployXapp {}", xAppName);
+		try {
+			xappMgrClient.undeployXapp(xAppName);
+		} catch (Exception ex) {
+			logger.error("deployXapp failed", ex);
+			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+		}
 	}
 
 }