X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fcontrollers%2FPolicyController.java;h=e33fb7e46e56cb55155a15974616933b361e95a8;hb=7a4a590fb0ebf8772169625cdda327da43c79c6d;hp=c0932a4cb1c508b18408150eaae01856e4858c7f;hpb=f0273617b916cdc8633382291b9986e33cc13fa1;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java b/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java index c0932a4c..e33fb7e4 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java @@ -17,14 +17,21 @@ * limitations under the License. * ========================LICENSE_END=================================== */ + package org.oransc.policyagent.controllers; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; + import java.util.Collection; import java.util.Vector; +import org.oransc.policyagent.clients.A1Client; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.exceptions.ServiceException; import org.oransc.policyagent.repository.ImmutablePolicy; @@ -34,7 +41,6 @@ import org.oransc.policyagent.repository.PolicyType; import org.oransc.policyagent.repository.PolicyTypes; import org.oransc.policyagent.repository.Ric; import org.oransc.policyagent.repository.Rics; -import org.oransc.policyagent.repository.Services; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -44,40 +50,84 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Mono; @RestController +@Api(value = "Policy Management API") public class PolicyController { - private final ApplicationConfig appConfig; private final Rics rics; private final PolicyTypes policyTypes; private final Policies policies; - private final Services services; + private final A1Client a1Client; + private static Gson gson = new GsonBuilder() // .serializeNulls() // .create(); // @Autowired - PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies, Rics rics, Services services) { - this.appConfig = config; + PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies, Rics rics, A1Client a1Client) { this.policyTypes = types; this.policies = policies; this.rics = rics; - this.services = services; + this.a1Client = a1Client; } - @GetMapping("/policy_types") - public ResponseEntity getPolicyTypes() { + @GetMapping("/policy_schemas") + @ApiOperation(value = "Returns policy type schema definitions") + @ApiResponses(value = {@ApiResponse(code = 200, message = "Policy Types found")}) + public ResponseEntity getPolicySchemas(@RequestParam(name = "ric", required = false) String ricName) { + if (ricName == null) { + Collection types = this.policyTypes.getAll(); + return new ResponseEntity(toPolicyTypeSchemasJson(types), HttpStatus.OK); + } else { + try { + Collection types = rics.getRic(ricName).getSupportedPolicyTypes(); + return new ResponseEntity(toPolicyTypeSchemasJson(types), HttpStatus.OK); + } catch (ServiceException e) { + return new ResponseEntity(e.toString(), HttpStatus.NOT_FOUND); + } + } + } - Collection types = this.policyTypes.getAll(); - return new ResponseEntity(policyTypesToJson(types), HttpStatus.OK); + @GetMapping("/policy_schema") + @ApiOperation(value = "Returns one policy type schema definition") + @ApiResponses(value = {@ApiResponse(code = 200, message = "Policy Type found")}) + public ResponseEntity getPolicySchema(@RequestParam(name = "id", required = true) String id) { + try { + PolicyType type = policyTypes.getType(id); + return new ResponseEntity(type.schema(), HttpStatus.OK); + } catch (ServiceException e) { + return new ResponseEntity(e.toString(), HttpStatus.NOT_FOUND); + } + } + + @GetMapping("/policy_types") + @ApiOperation(value = "Returns policy types") + @ApiResponses(value = {@ApiResponse(code = 200, message = "Policy Types found")}) + public ResponseEntity getPolicyTypes(@RequestParam(name = "ric", required = false) String ricName) { + if (ricName == null) { + Collection types = this.policyTypes.getAll(); + return new ResponseEntity(toPolicyTypeIdsJson(types), HttpStatus.OK); + } else { + try { + Collection types = rics.getRic(ricName).getSupportedPolicyTypes(); + return new ResponseEntity(toPolicyTypeIdsJson(types), HttpStatus.OK); + } catch (ServiceException e) { + return new ResponseEntity(e.toString(), HttpStatus.NOT_FOUND); + } + } } @GetMapping("/policy") + @ApiOperation(value = "Returns the policy") + @ApiResponses( + value = {@ApiResponse(code = 200, message = "Policy found"), + @ApiResponse(code = 204, message = "Policy is not found")}) public ResponseEntity getPolicy( // @RequestParam(name = "instance", required = true) String instance) { try { - Policy p = policies.get(instance); + Policy p = policies.getPolicy(instance); return new ResponseEntity(p.json(), HttpStatus.OK); } catch (ServiceException e) { return new ResponseEntity(e.getMessage(), HttpStatus.NO_CONTENT); @@ -85,14 +135,55 @@ public class PolicyController { } @DeleteMapping("/policy") - public ResponseEntity deletePolicy( // - @RequestParam(name = "instance", required = true) String instance) { + @ApiOperation(value = "Deletes the policy") + @ApiResponses(value = {@ApiResponse(code = 204, message = "Policy deleted")}) + public Mono> deletePolicy( // + @RequestParam(name = "instance", required = true) String id) { + Policy policy = policies.get(id); + if (policy != null && policy.ric().state().equals(Ric.RicState.ACTIVE)) { + return a1Client.deletePolicy(policy.ric().getConfig().baseUrl(), id) // + .doOnEach(notUsed -> policies.removeId(id)) // + .flatMap(notUsed -> { + return Mono.just(new ResponseEntity<>(HttpStatus.NO_CONTENT)); + }); + } else { + return Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND)); + } + } - Policy p = policies.removeId(instance); - return new ResponseEntity("OK", HttpStatus.OK); + @PutMapping(path = "/policy") + @ApiOperation(value = "Create the policy") + @ApiResponses(value = {@ApiResponse(code = 201, message = "Policy created")}) + public Mono> putPolicy( // + @RequestParam(name = "type", required = true) String typeName, // + @RequestParam(name = "instance", required = true) String instanceId, // + @RequestParam(name = "ric", required = true) String ricName, // + @RequestParam(name = "service", required = true) String service, // + @RequestBody String jsonBody) { + + Ric ric = rics.get(ricName); + PolicyType type = policyTypes.get(typeName); + if (ric != null && type != null && ric.state().equals(Ric.RicState.ACTIVE)) { + Policy policy = ImmutablePolicy.builder() // + .id(instanceId) // + .json(jsonBody) // + .type(type) // + .ric(ric) // + .ownerServiceName(service) // + .lastModified(getTimeStampUTC()) // + .build(); + return a1Client.putPolicy(policy) // + .doOnNext(notUsed -> policies.put(policy)) // + .flatMap(notUsed -> { + return Mono.just(new ResponseEntity<>(HttpStatus.CREATED)); + }); + } + return Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND)); } @GetMapping("/policies") + @ApiOperation(value = "Returns the policies") + @ApiResponses(value = {@ApiResponse(code = 200, message = "Policies found")}) public ResponseEntity getPolicies( // @RequestParam(name = "type", required = false) String type, // @RequestParam(name = "ric", required = false) String ric, // @@ -150,14 +241,25 @@ public class PolicyController { return gson.toJson(v); } - private String policyTypesToJson(Collection types) { - Vector v = new Vector<>(types.size()); + private String toPolicyTypeSchemasJson(Collection types) { + StringBuilder result = new StringBuilder(); + result.append("["); + boolean first = true; for (PolicyType t : types) { - PolicyTypeInfo policyInfo = ImmutablePolicyTypeInfo.builder() // - .schema(t.jsonSchema()) // - .name(t.name()) // - .build(); - v.add(policyInfo); + if (!first) { + result.append(","); + } + first = false; + result.append(t.schema()); + } + result.append("]"); + return result.toString(); + } + + private String toPolicyTypeIdsJson(Collection types) { + Vector v = new Vector<>(types.size()); + for (PolicyType t : types) { + v.add(t.name()); } return gson.toJson(v); } @@ -166,30 +268,4 @@ public class PolicyController { return java.time.Instant.now().toString(); } - @PutMapping(path = "/policy") - public ResponseEntity putPolicy( // - @RequestParam(name = "type", required = true) String type, // - @RequestParam(name = "instance", required = true) String instanceId, // - @RequestParam(name = "ric", required = true) String ric, // - @RequestParam(name = "service", required = true) String service, // - @RequestBody String jsonBody) { - - try { - // services.getService(service).ping(); - Ric ricObj = rics.getRic(ric); - Policy policy = ImmutablePolicy.builder() // - .id(instanceId) // - .json(jsonBody) // - .type(policyTypes.getType(type)) // - .ric(ricObj) // - .ownerServiceName(service) // - .lastModified(getTimeStampUTC()) // - .build(); - policies.put(policy); - return new ResponseEntity(HttpStatus.OK); - } catch (ServiceException e) { - return new ResponseEntity(e.getMessage(), HttpStatus.NOT_FOUND); - } - } - }