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=69864d9df29a56e752a178bab996662fe4f48bfb;hpb=29ce34b03e4099786f14cd7fc5473305da8750d6;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 69864d9d..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 @@ -43,8 +43,10 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; /** - * Provides methods to manage policies of the Admission Control xApp, which - * initially defines just one. All requests 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:
HTTP server received an + * invalid response from a server it consulted when acting as a proxy or + * gateway.
*/ @RestController @RequestMapping(value = DashboardConstants.ENDPOINT_PREFIX + "/xapp/ac", produces = MediaType.APPLICATION_JSON_VALUE) @@ -62,6 +64,8 @@ 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) @@ -75,18 +79,18 @@ public class AcXappController { */ @ApiOperation(value = "Gets the admission control policy for AC xApp via the A1 Mediator") @RequestMapping(value = "admctrl", method = RequestMethod.GET) - public Object getAdmissionControlPolicy() { + public Object getAdmissionControlPolicy(HttpServletResponse response) { logger.debug("getAdmissionControlPolicy"); - a1MediatorApi.a1ControllerGetHandler(AC_CONTROL_NAME); + response.setStatus(HttpServletResponse.SC_NOT_IMPLEMENTED); return null; } /* - * This controller is deliberately kept ignorant of the - * ACAdmissionIntervalControl Typescript interface. + * 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 = "admctrl", method = RequestMethod.PUT) + @RequestMapping(value = "catime", method = RequestMethod.PUT) public void setAdmissionControlPolicy(@ApiParam(value = "Admission control policy") @RequestBody JsonNode acPolicy, // HttpServletResponse response) { logger.debug("setAdmissionControlPolicy {}", acPolicy);