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=12fa02c061c36f29d0139156191935759c490e60;hb=35e7ea7bb7a6e2890542f3535aa09b11b2f079a1;hp=a507a2b14a60cf000395ec94a7060f6793dd2c67;hpb=def3c3e28fb8616a444ad3caaf2f789292402a02;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 a507a2b1..12fa02c0 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,96 +17,180 @@ * 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.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; - +import java.util.Collection; import java.util.Vector; import org.oransc.policyagent.configuration.ApplicationConfig; -import org.oransc.policyagent.configuration.RicConfig; +import org.oransc.policyagent.exceptions.ServiceException; +import org.oransc.policyagent.repository.ImmutablePolicy; +import org.oransc.policyagent.repository.Policies; +import org.oransc.policyagent.repository.Policy; +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; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; +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 public class PolicyController { private final ApplicationConfig appConfig; + private final Rics rics; + private final PolicyTypes policyTypes; + private final Policies policies; + private final Services services; private static Gson gson = new GsonBuilder() // .serializeNulls() // .create(); // @Autowired - PolicyController(ApplicationConfig config) { + PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies, Rics rics, Services services) { this.appConfig = config; + this.policyTypes = types; + this.policies = policies; + this.rics = rics; + this.services = services; + } + + @GetMapping("/policy_types") + public ResponseEntity getPolicyTypes() { + + Collection types = this.policyTypes.getAll(); + return new ResponseEntity(policyTypesToJson(types), HttpStatus.OK); } - // http://localhost:8080/policy?type=type3&instance=xxx @GetMapping("/policy") - public String getPolicy(@RequestParam(name = "type", required = false, defaultValue = "type1") String typeName, - @RequestParam(name = "instance", required = false, defaultValue = "new") String instanceId) { - System.out.println("**** getPolicy " + typeName); + public ResponseEntity getPolicy( // + @RequestParam(name = "instance", required = true) String instance) { + try { + Policy p = policies.get(instance); + return new ResponseEntity(p.json(), HttpStatus.OK); + } catch (ServiceException e) { + return new ResponseEntity(e.getMessage(), HttpStatus.NO_CONTENT); + } + } + + @DeleteMapping("/policy") + public ResponseEntity deletePolicy( // + @RequestParam(name = "instance", required = true) String instance) { - return "policy" + typeName + instanceId; + Policy p = policies.removeId(instance); + return new ResponseEntity("OK", HttpStatus.OK); } - public String getHello() { - return "Howdy"; + @GetMapping("/policies") + public ResponseEntity getPolicies( // + @RequestParam(name = "type", required = false) String type, // + @RequestParam(name = "ric", required = false) String ric, // + @RequestParam(name = "service", required = false) String service) // + { + Collection result = null; + + if (type != null) { + result = policies.getForType(type); + result = filter(result, null, ric, service); + } else if (service != null) { + result = policies.getForService(service); + result = filter(result, type, ric, null); + } else if (ric != null) { + result = policies.getForRic(ric); + result = filter(result, type, null, service); + } else { + result = policies.getAll(); + } + + return new ResponseEntity(policiesToJson(result), HttpStatus.OK); } - @GetMapping("/status") - @ApiOperation(value = "Returns status and statistics of the service") - @ApiResponses( - value = { // - @ApiResponse(code = 200, message = "DATAFILE service is living"), - @ApiResponse(code = 401, message = "You are not authorized to view the resource"), - @ApiResponse(code = 403, message = "Accessing the resource you were trying to reach is forbidden"), - @ApiResponse(code = 404, message = "The resource you were trying to reach is not found") // - }) - public Mono> getStatus() { - Mono> response = Mono.just(new ResponseEntity<>("hunky dory", HttpStatus.OK)); - return response; + private boolean include(String filter, String value) { + return filter == null || value.equals(filter); } - // http://localhost:8080/rics?managedElementId=kista_1 - @GetMapping("/rics") - @ApiOperation(value = "Returns defined NearRT RIC:s") - public ResponseEntity getRics( - @RequestParam(name = "managedElementId", required = false, defaultValue = "") String managedElementId) { - Vector result = new Vector(); - Vector config = getRicConfigs(managedElementId); - - for (RicConfig ricConfig : config) { - RicInfo ric = ImmutableRicInfo.builder() // - .managedElementIds(ricConfig.managedElementIds()) // - .name(ricConfig.name()) // - .build(); - result.add(ric); + private Collection filter(Collection collection, String type, String ric, String service) { + if (type == null && ric == null && service == null) { + return collection; } + Vector filtered = new Vector<>(); + for (Policy p : collection) { + if (include(type, p.type().name()) && include(ric, p.ric().name()) + && include(service, p.ownerServiceName())) { + filtered.add(p); + } + } + return filtered; + } - return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK); + private String policiesToJson(Collection policies) { + Vector v = new Vector<>(policies.size()); + for (Policy p : policies) { + PolicyInfo policyInfo = ImmutablePolicyInfo.builder() // + .json(p.json()) // + .id(p.id()) // + .ric(p.ric().name()) // + .type(p.type().name()) // + .service(p.ownerServiceName()) // + .lastModified(p.lastModified()) // + .build(); + v.add(policyInfo); + } + return gson.toJson(v); } - private Vector getRicConfigs(String managedElementId) { - if (managedElementId.equals("")) { - return this.appConfig.getRicConfigs(); + private String policyTypesToJson(Collection types) { + Vector v = new Vector<>(types.size()); + for (PolicyType t : types) { + PolicyTypeInfo policyInfo = ImmutablePolicyTypeInfo.builder() // + .schema(t.jsonSchema()) // + .name(t.name()) // + .build(); + v.add(policyInfo); } + return gson.toJson(v); + } + + private String getTimeStampUTC() { + return java.time.Instant.now().toString(); + } - Vector result = new Vector(1); - appConfig.getRicConfig(managedElementId).ifPresent((config) -> { - result.add(config); - }); - return result; + @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); + } } }