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=dfbd081159b02601a48162a647848223a9303ebf;hp=21521b77b4a31f76c66a451861405bc10bf6ab74;hpb=3ed724aaef96d30347f9a60ca111627b28133721;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 21521b77..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,17 +17,29 @@ * limitations under the License. * ========================LICENSE_END=================================== */ + package org.oransc.policyagent.controllers; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import java.util.Collection; +import java.util.Vector; + import org.oransc.policyagent.configuration.ApplicationConfig; 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; @@ -38,23 +50,121 @@ import org.springframework.web.bind.annotation.RestController; public class PolicyController { private final ApplicationConfig appConfig; - private final PolicyTypes types; + 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, PolicyTypes types, Policies policies) { + PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies, Rics rics, Services services) { this.appConfig = config; - this.types = types; + 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 ResponseEntity getPolicy( // - @RequestParam(name = "type", required = false, defaultValue = "type1") String typeName, // - @RequestParam(name = "instance", required = false, defaultValue = "new") String instanceId) { + @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) { + + Policy p = policies.removeId(instance); + return new ResponseEntity("OK", HttpStatus.OK); + } + + @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); + } + + private boolean include(String filter, String value) { + return filter == null || value.equals(filter); + } + + 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("policy" + typeName + instanceId, 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 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(); } @PutMapping(path = "/policy") @@ -65,35 +175,22 @@ public class PolicyController { @RequestParam(name = "service", required = true) String service, // @RequestBody String jsonBody) { - System.out.println("*********************** " + jsonBody); - try { + // services.getService(service).ping(); + Ric ricObj = rics.getRic(ric); Policy policy = ImmutablePolicy.builder() // .id(instanceId) // .json(jsonBody) // - .type(types.getType(type)) // - .ric(appConfig.getRic(ric)) // + .type(policyTypes.getType(type)) // + .ric(ricObj) // .ownerServiceName(service) // + .lastModified(getTimeStampUTC()) // .build(); - policies.put(instanceId, policy); + policies.put(policy); return new ResponseEntity(HttpStatus.OK); } catch (ServiceException e) { - System.out.println("*********************** " + e.getMessage()); - return new ResponseEntity(e.getMessage(), HttpStatus.NOT_FOUND); } - - } - - @PutMapping(path = "/policyX") - public ResponseEntity putPolicyX( // - // @RequestParam(name = "type", required = false) String type, // - // @RequestParam(name = "instance", required = true) String instance, // - // @RequestParam(name = "ric", required = true) String ric, // - @RequestBody String jsonBody) { - System.out.println("*********************** " + jsonBody); - // System.out.println("policy" + type + instance); - return new ResponseEntity(HttpStatus.OK); } }