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=378265647c73477d81aacd875d1d9e97325d4198;hb=b38f759a93759fca79cec46491639c935132d577;hp=c1aac8f3073f1e2f181f328340cccb1285274904;hpb=39d82c359a22483a74532f76c8d1696aa909478c;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 c1aac8f3..37826564 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 @@ -44,7 +44,7 @@ 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. + * initially defines just one. All requests go via the A1 Mediator. */ @RestController @RequestMapping(value = DashboardConstants.ENDPOINT_PREFIX + "/xapp/ac", produces = MediaType.APPLICATION_JSON_VALUE) @@ -66,8 +66,7 @@ public class AcXappController { @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)); } @@ -76,18 +75,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);