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=refs%2Fchanges%2F25%2F2625%2F4;hp=ce80cea467437f817d94fab36fb1ca6ef30f1e6e;hpb=1cb59dc1ce7300bf6f94629c4b7b19ae1c94525e;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 ce80cea4..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
@@ -27,10 +27,10 @@ import io.swagger.annotations.Api;
 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.List;
-import java.util.Vector;
 
 import org.oransc.policyagent.clients.A1ClientFactory;
 import org.oransc.policyagent.configuration.ApplicationConfig;
@@ -79,7 +79,7 @@ public class PolicyController {
     @ApiOperation(value = "Returns policy type schema definitions")
     @ApiResponses(
         value = {
-            @ApiResponse(code = 200, message = "Policy schemas", response = String.class, responseContainer = "List")})
+            @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) {
@@ -152,14 +152,20 @@ public class PolicyController {
     @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)) //
+                .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));
         }
@@ -168,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, //
@@ -188,12 +194,36 @@ public class PolicyController {
                 .ownerServiceName(service) //
                 .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 -> 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")
@@ -274,7 +304,7 @@ public class PolicyController {
         for (Policy p : policies) {
             PolicyInfo policyInfo = new PolicyInfo();
             policyInfo.id = p.id();
-            policyInfo.json = p.json();
+            policyInfo.json = fromJson(p.json());
             policyInfo.ric = p.ric().name();
             policyInfo.type = p.type().name();
             policyInfo.service = p.ownerServiceName();
@@ -287,6 +317,10 @@ public class PolicyController {
         return gson.toJson(v);
     }
 
+    private Object fromJson(String jsonStr) {
+        return gson.fromJson(jsonStr, Object.class);
+    }
+
     private String toPolicyTypeSchemasJson(Collection<PolicyType> types) {
         StringBuilder result = new StringBuilder();
         result.append("[");