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%2FAcXappController.java;h=46a4aab04b1543c41b1f49a33aa1d99cd790d132;hb=226fd436a085f717d4cbf81bf1719bdaf1468414;hp=859efb8d039f9050f4d9209ad82dd7a51c1f2cae;hpb=2239b1d982aafe5e7dce4dbbec5100f3e3191249;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AcXappController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AcXappController.java
index 859efb8d..46a4aab0 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AcXappController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AcXappController.java
@@ -32,7 +32,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
@@ -44,8 +43,10 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 /**
- * Provides methods to manage policies of the Admission Control xApp. All
- * messages go via the A1 Mediatior.
+ * * Proxies calls from the front end to the AC xApp via the A1 Mediator API.
+ * All methods answer 502 on failure: <blockquote>HTTP server received an
+ * invalid response from a server it consulted when acting as a proxy or
+ * gateway.</blockquote>
  */
 @RestController
 @RequestMapping(value = DashboardConstants.ENDPOINT_PREFIX + "/xapp/ac", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -53,7 +54,8 @@ public class AcXappController {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-	private static final String POLICY_NAME = "policyname";
+	// A "control" is an element in the XApp descriptor
+	private static final String AC_CONTROL_NAME = "admission_control_policy";
 
 	// Populated by the autowired constructor
 	private final A1MediatorApi a1MediatorApi;
@@ -62,30 +64,37 @@ public class AcXappController {
 	public AcXappController(final A1MediatorApi a1MediatorApi) {
 		Assert.notNull(a1MediatorApi, "API must not be null");
 		this.a1MediatorApi = a1MediatorApi;
+		if (logger.isDebugEnabled())
+			logger.debug("ctor: configured with client type {}", a1MediatorApi.getClass().getName());
 	}
 
 	@ApiOperation(value = "Gets the A1 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");
+	public SuccessTransport getA1MediatorClientVersion() {
 		return new SuccessTransport(200, DashboardApplication.getImplementationVersion(A1MediatorApi.class));
 	}
 
-	@ApiOperation(value = "Gets the named policy for AC xApp via the A1 Mediator")
-	@RequestMapping(value = "policy/{" + POLICY_NAME + "}", method = RequestMethod.GET)
-	public Object getPolicy(@PathVariable(POLICY_NAME) String policyName) {
-		logger.debug("getPolicy: policy {}", policyName);
-		a1MediatorApi.a1ControllerGetHandler(policyName);
+	/*
+	 * GET policy is not supported at present by A1 Mediator! Always returns 501.
+	 */
+	@ApiOperation(value = "Gets the admission control policy for AC xApp via the A1 Mediator")
+	@RequestMapping(value = "admctrl", method = RequestMethod.GET)
+	public Object getAdmissionControlPolicy(HttpServletResponse response) {
+		logger.debug("getAdmissionControlPolicy");
+		response.setStatus(HttpServletResponse.SC_NOT_IMPLEMENTED);
 		return null;
 	}
 
-	@ApiOperation(value = "Sets the named policy for AC xApp via the A1 Mediator")
-	@RequestMapping(value = "policy/{" + POLICY_NAME + "}", method = RequestMethod.PUT)
-	public void putPolicy(@PathVariable(POLICY_NAME) String policyName, //
-			@ApiParam(value = "JSON formatted policy") @RequestBody JsonNode policy, //
+	/*
+	 * This controller is deliberately kept ignorant of the data expected by AC. The
+	 * fields are defined in the ACAdmissionIntervalControl Typescript interface.
+	 */
+	@ApiOperation(value = "Sets the admission control policy for AC xApp via the A1 Mediator")
+	@RequestMapping(value = "catime", method = RequestMethod.PUT)
+	public void setAdmissionControlPolicy(@ApiParam(value = "Admission control policy") @RequestBody JsonNode acPolicy, //
 			HttpServletResponse response) {
-		logger.debug("putPolicy: policy {}", policyName);
-		a1MediatorApi.a1ControllerPutHandler(policyName, policy);
+		logger.debug("setAdmissionControlPolicy {}", acPolicy);
+		a1MediatorApi.a1ControllerPutHandler(AC_CONTROL_NAME, acPolicy);
 		response.setStatus(a1MediatorApi.getApiClient().getStatusCode().value());
 	}