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=965b42f30ec8bc24d40a6bed128bf305109ce2f1;hb=b40e1b476b25dfdd5ad3ba235ab085d6d4087be3;hp=8c6964e8174b9d1c4229e1f6b6cf79592497d546;hpb=bbc4aa48f60dc70154ff07c2143918053f1c9154;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 8c6964e8..965b42f3 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
@@ -22,13 +22,16 @@ 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.A1ClientFactory;
 import org.oransc.policyagent.configuration.ApplicationConfig;
 import org.oransc.policyagent.exceptions.ServiceException;
 import org.oransc.policyagent.repository.ImmutablePolicy;
@@ -38,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;
@@ -48,52 +50,98 @@ 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 A1ClientFactory a1ClientFactory;
+
     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,
+        A1ClientFactory a1ClientFactory) {
         this.policyTypes = types;
         this.policies = policies;
         this.rics = rics;
-        this.services = services;
+        this.a1ClientFactory = a1ClientFactory;
     }
 
-    @GetMapping("/policy_types")
-    @ApiOperation(value = "Returns all the policy types")
+    @GetMapping("/policy_schemas")
+    @ApiOperation(value = "Returns policy type schema definitions")
     @ApiResponses(
         value = {
-            @ApiResponse(code = 200, message = "Policy Types found")
-        })
-    public ResponseEntity<String> getPolicyTypes() {
+            @ApiResponse(code = 200, message = "Policy schemas", response = Object.class, responseContainer = "List")})
+    public ResponseEntity<String> getPolicySchemas(@RequestParam(name = "ric", required = false) String ricName) {
+        synchronized (this.policyTypes) {
+            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 schema", response = Object.class)})
+    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);
+        }
+    }
 
-        Collection<PolicyType> types = this.policyTypes.getAll();
-        return new ResponseEntity<String>(policyTypesToJson(types), HttpStatus.OK);
+    @GetMapping("/policy_types")
+    @ApiOperation(value = "Query policy type names")
+    @ApiResponses(
+        value = {@ApiResponse(
+            code = 200,
+            message = "Policy type names",
+            response = String.class,
+            responseContainer = "List")})
+    public ResponseEntity<String> getPolicyTypes(@RequestParam(name = "ric", required = false) String ricName) {
+        synchronized (this.policyTypes) {
+            if (ricName == null) {
+                Collection<PolicyType> types = this.policyTypes.getAll();
+                return new ResponseEntity<String>(toPolicyTypeIdsJson(types), HttpStatus.OK);
+            } else {
+                try {
+                    Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
+                    return new ResponseEntity<String>(toPolicyTypeIdsJson(types), HttpStatus.OK);
+                } catch (ServiceException e) {
+                    return new ResponseEntity<String>(e.toString(), HttpStatus.NOT_FOUND);
+                }
+            }
+        }
     }
 
     @GetMapping("/policy")
-    @ApiOperation(value = "Returns the policy")
+    @ApiOperation(value = "Returns a policy configuration") //
     @ApiResponses(
-        value = {
-            @ApiResponse(code = 200, message = "Policy found"),
-            @ApiResponse(code = 204, message = "Policy is not found")
-        })
+        value = { //
+            @ApiResponse(code = 200, message = "Policy found", response = Object.class), //
+            @ApiResponse(code = 204, message = "Policy is not found")} //
+    )
     public ResponseEntity<String> getPolicy( //
         @RequestParam(name = "instance", required = true) String instance) {
         try {
-            Policy p = policies.get(instance);
+            Policy p = policies.getPolicy(instance);
             return new ResponseEntity<String>(p.json(), HttpStatus.OK);
         } catch (ServiceException e) {
             return new ResponseEntity<String>(e.getMessage(), HttpStatus.NO_CONTENT);
@@ -101,45 +149,104 @@ 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) {
+    @ApiOperation(value = "Delete a policy", response = Object.class)
+    @ApiResponses(value = {@ApiResponse(code = 204, message = "Policy deleted", response = Object.class)})
+    public Mono<ResponseEntity<Void>> deletePolicy( //
+        @RequestParam(name = "instance", required = true) String id) {
+        Policy policy = policies.get(id);
+        if (policy != null && policy.ric().getState() == Ric.RicState.IDLE) {
+            policies.remove(policy);
+            return a1ClientFactory.createA1Client(policy.ric()) //
+                .flatMap(client -> client.deletePolicy(policy)) //
+                .flatMap(notUsed -> {
+                    return Mono.just(new ResponseEntity<>(HttpStatus.NO_CONTENT));
+                });
+        } else {
+            return Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND));
+        }
+    }
+
+    @PutMapping(path = "/policy")
+    @ApiOperation(value = "Put a policy", response = String.class)
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "Policy created or updated")})
+    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 Object jsonBody) {
 
-        Policy p = policies.removeId(instance);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        String jsonString = gson.toJson(jsonBody);
+
+        Ric ric = rics.get(ricName);
+        PolicyType type = policyTypes.get(typeName);
+        if (ric != null && type != null && ric.getState() == Ric.RicState.IDLE) {
+            Policy policy = ImmutablePolicy.builder() //
+                .id(instanceId) //
+                .json(jsonString) //
+                .type(type) //
+                .ric(ric) //
+                .ownerServiceName(service) //
+                .lastModified(getTimeStampUTC()) //
+                .build();
+            return a1ClientFactory.createA1Client(ric) //
+                .flatMap(client -> client.putPolicy(policy)) //
+                .doOnNext(notUsed -> policies.put(policy)) //
+                .flatMap(notUsed -> {
+                    return Mono.just(new ResponseEntity<>(HttpStatus.OK));
+                });
+        }
+        return Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND));
     }
 
     @GetMapping("/policies")
-    @ApiOperation(value = "Returns the policies")
+    @ApiOperation(value = "Query policies")
     @ApiResponses(
         value = {
-            @ApiResponse(code = 200, message = "Polcies found")
-        })
+            @ApiResponse(code = 200, message = "Policies", response = PolicyInfo.class, responseContainer = "List")})
     public ResponseEntity<String> getPolicies( //
         @RequestParam(name = "type", required = false) String type, //
         @RequestParam(name = "ric", required = false) String ric, //
         @RequestParam(name = "service", required = false) String service) //
     {
-        Collection<Policy> 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();
+        synchronized (policies) {
+            Collection<Policy> 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<String>(policiesToJson(result), HttpStatus.OK);
         }
+    }
 
-        return new ResponseEntity<String>(policiesToJson(result), HttpStatus.OK);
+    @GetMapping("/policy_status")
+    @ApiOperation(value = "Returns a policy status") //
+    @ApiResponses(
+        value = { //
+            @ApiResponse(code = 200, message = "Policy status", response = Object.class), //
+            @ApiResponse(code = 204, message = "Policy is not found", response = String.class)} //
+    )
+    public Mono<ResponseEntity<String>> getPolicyStatus( //
+        @RequestParam(name = "instance", required = true) String instance) {
+        try {
+            Policy policy = policies.getPolicy(instance);
+
+            return a1ClientFactory.createA1Client(policy.ric()) //
+                .flatMap(client -> client.getPolicyStatus(policy)) //
+                .flatMap(status -> Mono.just(new ResponseEntity<String>(status, HttpStatus.OK)));
+        } catch (ServiceException e) {
+            return Mono.just(new ResponseEntity<String>(e.getMessage(), HttpStatus.NO_CONTENT));
+        }
     }
 
     private boolean include(String filter, String value) {
@@ -163,26 +270,44 @@ public class PolicyController {
     private String policiesToJson(Collection<Policy> policies) {
         Vector<PolicyInfo> 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();
+            PolicyInfo policyInfo = new PolicyInfo();
+            policyInfo.id = p.id();
+            policyInfo.json = fromJson(p.json());
+            policyInfo.ric = p.ric().name();
+            policyInfo.type = p.type().name();
+            policyInfo.service = p.ownerServiceName();
+            policyInfo.lastModified = p.lastModified();
+            if (!policyInfo.validate()) {
+                throw new RuntimeException("BUG, all fields must be set");
+            }
             v.add(policyInfo);
         }
         return gson.toJson(v);
     }
 
-    private String policyTypesToJson(Collection<PolicyType> types) {
-        Vector<PolicyTypeInfo> v = new Vector<>(types.size());
+    private Object fromJson(String jsonStr) {
+        return gson.fromJson(jsonStr, Object.class);
+    }
+
+    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);
     }
@@ -191,35 +316,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);
-        }
-    }
-
 }