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=d6d65fc796b3bbbcc342cca0ecca8d1014839179;hb=9013ed7ad46ce6927fbf69890487e8df61b7d7ee;hp=965b42f30ec8bc24d40a6bed128bf305109ce2f1;hpb=b40e1b476b25dfdd5ad3ba235ab085d6d4087be3;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 965b42f3..d6d65fc7 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
@@ -28,8 +28,9 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Vector;
+import java.util.List;
 
 import org.oransc.policyagent.clients.A1ClientFactory;
 import org.oransc.policyagent.configuration.ApplicationConfig;
@@ -83,13 +84,13 @@ public class PolicyController {
         synchronized (this.policyTypes) {
             if (ricName == null) {
                 Collection<PolicyType> types = this.policyTypes.getAll();
-                return new ResponseEntity<String>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
+                return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
             } else {
                 try {
                     Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
-                    return new ResponseEntity<String>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
+                    return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
                 } catch (ServiceException e) {
-                    return new ResponseEntity<String>(e.toString(), HttpStatus.NOT_FOUND);
+                    return new ResponseEntity<>(e.toString(), HttpStatus.NOT_FOUND);
                 }
             }
         }
@@ -101,9 +102,9 @@ public class PolicyController {
     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);
+            return new ResponseEntity<>(type.schema(), HttpStatus.OK);
         } catch (ServiceException e) {
-            return new ResponseEntity<String>(e.toString(), HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(e.toString(), HttpStatus.NOT_FOUND);
         }
     }
 
@@ -119,13 +120,13 @@ public class PolicyController {
         synchronized (this.policyTypes) {
             if (ricName == null) {
                 Collection<PolicyType> types = this.policyTypes.getAll();
-                return new ResponseEntity<String>(toPolicyTypeIdsJson(types), HttpStatus.OK);
+                return new ResponseEntity<>(toPolicyTypeIdsJson(types), HttpStatus.OK);
             } else {
                 try {
                     Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
-                    return new ResponseEntity<String>(toPolicyTypeIdsJson(types), HttpStatus.OK);
+                    return new ResponseEntity<>(toPolicyTypeIdsJson(types), HttpStatus.OK);
                 } catch (ServiceException e) {
-                    return new ResponseEntity<String>(e.toString(), HttpStatus.NOT_FOUND);
+                    return new ResponseEntity<>(e.toString(), HttpStatus.NOT_FOUND);
                 }
             }
         }
@@ -142,25 +143,29 @@ public class PolicyController {
         @RequestParam(name = "instance", required = true) String instance) {
         try {
             Policy p = policies.getPolicy(instance);
-            return new ResponseEntity<String>(p.json(), HttpStatus.OK);
+            return new ResponseEntity<>(p.json(), HttpStatus.OK);
         } catch (ServiceException e) {
-            return new ResponseEntity<String>(e.getMessage(), HttpStatus.NO_CONTENT);
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.NO_CONTENT);
         }
     }
 
     @DeleteMapping("/policy")
     @ApiOperation(value = "Delete a policy", response = Object.class)
     @ApiResponses(value = {@ApiResponse(code = 204, message = "Policy deleted", response = Object.class)})
-    public Mono<ResponseEntity<Void>> deletePolicy( //
+    public Mono<ResponseEntity<Object>> 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);
+            Ric ric = policy.ric();
             return a1ClientFactory.createA1Client(policy.ric()) //
+                .doOnNext(notUsed -> ric.getLock().lockBlocking()) //
+                .doOnNext(notUsed -> policies.remove(policy)) //
                 .flatMap(client -> client.deletePolicy(policy)) //
-                .flatMap(notUsed -> {
-                    return Mono.just(new ResponseEntity<>(HttpStatus.NO_CONTENT));
-                });
+                .doOnNext(notUsed -> ric.getLock().unlock()) //
+                .doOnError(notUsed -> ric.getLock().unlock()) //
+                .flatMap(notUsed -> Mono.just(new ResponseEntity<>(HttpStatus.NO_CONTENT)));
+        } else if (policy != null) {
+            return Mono.just(new ResponseEntity<>("Busy, recovering", HttpStatus.LOCKED));
         } else {
             return Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND));
         }
@@ -169,7 +174,7 @@ public class PolicyController {
     @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( //
+    public Mono<ResponseEntity<Object>> putPolicy( //
         @RequestParam(name = "type", required = true) String typeName, //
         @RequestParam(name = "instance", required = true) String instanceId, //
         @RequestParam(name = "ric", required = true) String ricName, //
@@ -187,16 +192,38 @@ public class PolicyController {
                 .type(type) //
                 .ric(ric) //
                 .ownerServiceName(service) //
-                .lastModified(getTimeStampUTC()) //
+                .lastModified(getTimeStampUtc()) //
                 .build();
-            return a1ClientFactory.createA1Client(ric) //
+
+            final boolean isCreate = this.policies.get(policy.id()) == null;
+
+            return Mono.just(policy) //
+                .doOnNext(notUsed -> ric.getLock().lockBlocking()) //
+                .flatMap(p -> validateModifiedPolicy(policy)) //
+                .flatMap(notUsed -> a1ClientFactory.createA1Client(ric)) //
                 .flatMap(client -> client.putPolicy(policy)) //
                 .doOnNext(notUsed -> policies.put(policy)) //
-                .flatMap(notUsed -> {
-                    return Mono.just(new ResponseEntity<>(HttpStatus.OK));
-                });
+                .doOnNext(notUsed -> ric.getLock().unlock()) //
+                .doOnError(t -> ric.getLock().unlock()) //
+                .flatMap(notUsed -> Mono.just(new ResponseEntity<>(isCreate ? HttpStatus.CREATED : HttpStatus.OK))) //
+                .onErrorResume(t -> Mono.just(new ResponseEntity<>(t.getMessage(), HttpStatus.METHOD_NOT_ALLOWED)));
+        }
+
+        return ric == null && type == null ? Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND))
+            : Mono.just(new ResponseEntity<>(HttpStatus.CONFLICT)); // Recovering
+    }
+
+    private Mono<Object> validateModifiedPolicy(Policy policy) {
+        // Check that ric is not updated
+        Policy current = this.policies.get(policy.id());
+        if (current != null) {
+            if (!current.ric().name().equals(policy.ric().name())) {
+                return Mono.error(new Exception("Policy cannot change RIC, policyId: " + current.id() + //
+                    ", RIC name: " + current.ric().name() + //
+                    ", new name: " + policy.ric().name()));
+            }
         }
-        return Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND));
+        return Mono.just("OK");
     }
 
     @GetMapping("/policies")
@@ -219,13 +246,18 @@ public class PolicyController {
                 result = policies.getForService(service);
                 result = filter(result, type, ric, null);
             } else if (ric != null) {
-                result = policies.getForRic(ric);
-                result = filter(result, type, null, service);
+                result = filter(policies.getForRic(ric), type, null, service);
             } else {
                 result = policies.getAll();
             }
 
-            return new ResponseEntity<String>(policiesToJson(result), HttpStatus.OK);
+            String policiesJson;
+            try {
+                policiesJson = policiesToJson(result);
+            } catch (ServiceException e) {
+                return new ResponseEntity<>(e.getMessage(), HttpStatus.NO_CONTENT);
+            }
+            return new ResponseEntity<>(policiesJson, HttpStatus.OK);
         }
     }
 
@@ -243,9 +275,9 @@ public class PolicyController {
 
             return a1ClientFactory.createA1Client(policy.ric()) //
                 .flatMap(client -> client.getPolicyStatus(policy)) //
-                .flatMap(status -> Mono.just(new ResponseEntity<String>(status, HttpStatus.OK)));
+                .flatMap(status -> Mono.just(new ResponseEntity<>(status, HttpStatus.OK)));
         } catch (ServiceException e) {
-            return Mono.just(new ResponseEntity<String>(e.getMessage(), HttpStatus.NO_CONTENT));
+            return Mono.just(new ResponseEntity<>(e.getMessage(), HttpStatus.NO_CONTENT));
         }
     }
 
@@ -257,7 +289,7 @@ public class PolicyController {
         if (type == null && ric == null && service == null) {
             return collection;
         }
-        Vector<Policy> filtered = new Vector<>();
+        List<Policy> filtered = new ArrayList<>();
         for (Policy p : collection) {
             if (include(type, p.type().name()) && include(ric, p.ric().name())
                 && include(service, p.ownerServiceName())) {
@@ -267,8 +299,8 @@ public class PolicyController {
         return filtered;
     }
 
-    private String policiesToJson(Collection<Policy> policies) {
-        Vector<PolicyInfo> v = new Vector<>(policies.size());
+    private String policiesToJson(Collection<Policy> policies) throws ServiceException {
+        List<PolicyInfo> v = new ArrayList<>(policies.size());
         for (Policy p : policies) {
             PolicyInfo policyInfo = new PolicyInfo();
             policyInfo.id = p.id();
@@ -278,7 +310,7 @@ public class PolicyController {
             policyInfo.service = p.ownerServiceName();
             policyInfo.lastModified = p.lastModified();
             if (!policyInfo.validate()) {
-                throw new RuntimeException("BUG, all fields must be set");
+                throw new ServiceException("BUG, all fields must be set");
             }
             v.add(policyInfo);
         }
@@ -305,14 +337,14 @@ public class PolicyController {
     }
 
     private String toPolicyTypeIdsJson(Collection<PolicyType> types) {
-        Vector<String> v = new Vector<>(types.size());
+        List<String> v = new ArrayList<>(types.size());
         for (PolicyType t : types) {
             v.add(t.name());
         }
         return gson.toJson(v);
     }
 
-    private String getTimeStampUTC() {
+    private String getTimeStampUtc() {
         return java.time.Instant.now().toString();
     }