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=6d849b1b8e86ac0a1fd91f06f2a191b5981e57ae;hb=de026fb34e3dc3200acdb022782fe68615176ead;hp=aab03633c5cf8ad862ebc26b8b6d3a8544fe0faa;hpb=50e6a619a2f568f949c02dcd8d6656218d422a93;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 aab03633..6d849b1b 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
@@ -31,6 +31,7 @@ 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;
@@ -49,6 +50,7 @@ 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")
@@ -57,28 +59,60 @@ public class PolicyController {
     private final Rics rics;
     private final PolicyTypes policyTypes;
     private final Policies policies;
+    private final A1Client a1Client;
+
     private static Gson gson = new GsonBuilder() //
         .serializeNulls() //
         .create(); //
 
     @Autowired
-    PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies, Rics rics) {
+    PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies, Rics rics, A1Client a1Client) {
         this.policyTypes = types;
         this.policies = policies;
         this.rics = rics;
+        this.a1Client = a1Client;
+    }
+
+    @GetMapping("/policy_schemas")
+    @ApiOperation(value = "Returns policy type schema definitions")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "Policy Types found")})
+    public ResponseEntity<String> getPolicySchemas(@RequestParam(name = "ric", required = false) String ricName) {
+        if (ricName == null) {
+            Collection<PolicyType> types = this.policyTypes.getAll();
+            return new ResponseEntity<String>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
+        } else {
+            try {
+                Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
+                return new ResponseEntity<String>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
+            } catch (ServiceException e) {
+                return new ResponseEntity<String>(e.toString(), HttpStatus.NOT_FOUND);
+            }
+        }
+    }
+
+    @GetMapping("/policy_schema")
+    @ApiOperation(value = "Returns one policy type schema definition")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "Policy Type found")})
+    public ResponseEntity<String> getPolicySchema(@RequestParam(name = "id", required = true) String id) {
+        try {
+            PolicyType type = policyTypes.getType(id);
+            return new ResponseEntity<String>(type.schema(), HttpStatus.OK);
+        } catch (ServiceException e) {
+            return new ResponseEntity<String>(e.toString(), HttpStatus.NOT_FOUND);
+        }
     }
 
     @GetMapping("/policy_types")
-    @ApiOperation(value = "Returns all the policy types")
+    @ApiOperation(value = "Returns policy types")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "Policy Types found")})
     public ResponseEntity<String> getPolicyTypes(@RequestParam(name = "ric", required = false) String ricName) {
         if (ricName == null) {
             Collection<PolicyType> types = this.policyTypes.getAll();
-            return new ResponseEntity<String>(policyTypesToJson(types), HttpStatus.OK);
+            return new ResponseEntity<String>(toPolicyTypeIdsJson(types), HttpStatus.OK);
         } else {
             try {
                 Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
-                return new ResponseEntity<String>(policyTypesToJson(types), HttpStatus.OK);
+                return new ResponseEntity<String>(toPolicyTypeIdsJson(types), HttpStatus.OK);
             } catch (ServiceException e) {
                 return new ResponseEntity<String>(e.toString(), HttpStatus.NOT_FOUND);
             }
@@ -103,16 +137,53 @@ public class PolicyController {
     @DeleteMapping("/policy")
     @ApiOperation(value = "Deletes the policy")
     @ApiResponses(value = {@ApiResponse(code = 204, message = "Policy deleted")})
-    public ResponseEntity<Void> deletePolicy( //
-        @RequestParam(name = "instance", required = true) String instance) {
+    public Mono<ResponseEntity<Void>> 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));
+        }
+    }
 
-        policies.removeId(instance);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    @PutMapping(path = "/policy")
+    @ApiOperation(value = "Create the policy")
+    @ApiResponses(value = {@ApiResponse(code = 201, message = "Policy created")})
+    public Mono<ResponseEntity<String>> 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.ric().getConfig().baseUrl(), policy.id(), policy.json()) //
+                .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 = "Polcies found")})
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "Policies found")})
     public ResponseEntity<String> getPolicies( //
         @RequestParam(name = "type", required = false) String type, //
         @RequestParam(name = "ric", required = false) String ric, //
@@ -170,13 +241,25 @@ public class PolicyController {
         return gson.toJson(v);
     }
 
-    private String policyTypesToJson(Collection<PolicyType> types) {
-        Vector<PolicyTypeInfo> v = new Vector<>(types.size());
+    private String toPolicyTypeSchemasJson(Collection<PolicyType> types) {
+        StringBuilder result = new StringBuilder();
+        result.append("[");
+        boolean first = true;
         for (PolicyType t : types) {
-            PolicyTypeInfo policyInfo = ImmutablePolicyTypeInfo.builder() //
-                .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<PolicyType> types) {
+        Vector<String> v = new Vector<>(types.size());
+        for (PolicyType t : types) {
+            v.add(t.name());
         }
         return gson.toJson(v);
     }
@@ -185,32 +268,4 @@ public class PolicyController {
         return java.time.Instant.now().toString();
     }
 
-    @PutMapping(path = "/policy")
-    @ApiOperation(value = "Create the policy")
-    @ApiResponses(value = {@ApiResponse(code = 201, message = "Policy created")})
-    public ResponseEntity<String> 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<String>(HttpStatus.CREATED);
-        } catch (ServiceException e) {
-            return new ResponseEntity<String>(e.getMessage(), HttpStatus.NOT_FOUND);
-        }
-    }
-
 }