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%2FXappManagerController.java;h=ad62bb0e3b2aee6450262994ca0b834280bfb4c7;hb=60ea93eb75e4c0d54cf4b6959a60f0c7a0c8e292;hp=ef1a9186304fbf9920e9ac79c2eeb1104b70d83c;hpb=5577df1ec38f5810920100116ea0b4023f2649ef;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java
index ef1a9186..ad62bb0e 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java
@@ -23,8 +23,10 @@ import java.lang.invoke.MethodHandles;
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.oransc.ric.portal.dashboard.DashboardApplication;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.model.ErrorTransport;
+import org.oransc.ric.portal.dashboard.model.SuccessTransport;
 import org.oransc.ric.xappmgr.client.api.HealthApi;
 import org.oransc.ric.xappmgr.client.api.XappApi;
 import org.oransc.ric.xappmgr.client.model.AllXapps;
@@ -71,11 +73,26 @@ public class XappManagerController {
 		this.xappApi = xappApi;
 	}
 
-	@ApiOperation(value = "Calls the xApp Manager health check.")
-	@RequestMapping(value = "/health", method = RequestMethod.GET)
+	@ApiOperation(value = "Gets the XApp 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(HealthApi.class));
+	}
+
+	@ApiOperation(value = "Calls the xApp Manager liveness health check.")
+	@RequestMapping(value = "/health/alive", method = RequestMethod.GET)
 	public void getHealth(HttpServletResponse response) {
-		logger.debug("getHealt");
-		healthApi.getHealth();
+		logger.debug("getHealth");
+		healthApi.getHealthAlive();
+		response.setStatus(healthApi.getApiClient().getStatusCode().value());
+	}
+
+	@ApiOperation(value = "Calls the xApp Manager readiness health check.")
+	@RequestMapping(value = "/health/ready", method = RequestMethod.GET)
+	public void getHealthReady(HttpServletResponse response) {
+		logger.debug("getHealthReady");
+		healthApi.getHealthReady();
 		response.setStatus(healthApi.getApiClient().getStatusCode().value());
 	}