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=09916057c6ab1805be0f97f0a00ac557e55b99f9;hb=25f05019da2af154f169c147dcf12895acaea159;hp=0ef1679cddd7256579d8792ac233dbf76e637290;hpb=a2ad32a98e7a3f32214d3ecd7ca9730e3602d11f;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 0ef1679c..09916057 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
@@ -95,17 +95,15 @@ public class PolicyController {
             @ApiResponse(code = 200, message = "Policy schemas", response = Object.class, responseContainer = "List"), //
             @ApiResponse(code = 404, message = "RIC is not found", response = String.class)})
     public ResponseEntity<String> getPolicySchemas(@RequestParam(name = "ric", required = false) String ricName) {
-        synchronized (this.policyTypes) {
-            if (ricName == null) {
-                Collection<PolicyType> types = this.policyTypes.getAll();
+        if (ricName == null) {
+            Collection<PolicyType> types = this.policyTypes.getAll();
+            return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
+        } else {
+            try {
+                Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
                 return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
-            } else {
-                try {
-                    Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
-                    return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
-                } catch (ServiceException e) {
-                    return new ResponseEntity<>(e.toString(), HttpStatus.NOT_FOUND);
-                }
+            } catch (ServiceException e) {
+                return new ResponseEntity<>(e.toString(), HttpStatus.NOT_FOUND);
             }
         }
     }
@@ -136,17 +134,15 @@ public class PolicyController {
                 responseContainer = "List"),
             @ApiResponse(code = 404, message = "RIC is not found", response = String.class)})
     public ResponseEntity<String> getPolicyTypes(@RequestParam(name = "ric", required = false) String ricName) {
-        synchronized (this.policyTypes) {
-            if (ricName == null) {
-                Collection<PolicyType> types = this.policyTypes.getAll();
+        if (ricName == null) {
+            Collection<PolicyType> types = this.policyTypes.getAll();
+            return new ResponseEntity<>(toPolicyTypeIdsJson(types), HttpStatus.OK);
+        } else {
+            try {
+                Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
                 return new ResponseEntity<>(toPolicyTypeIdsJson(types), HttpStatus.OK);
-            } else {
-                try {
-                    Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
-                    return new ResponseEntity<>(toPolicyTypeIdsJson(types), HttpStatus.OK);
-                } catch (ServiceException e) {
-                    return new ResponseEntity<>(e.toString(), HttpStatus.NOT_FOUND);
-                }
+            } catch (ServiceException e) {
+                return new ResponseEntity<>(e.toString(), HttpStatus.NOT_FOUND);
             }
         }
     }
@@ -159,9 +155,9 @@ public class PolicyController {
             @ApiResponse(code = 404, message = "Policy is not found")} //
     )
     public ResponseEntity<String> getPolicy( //
-        @RequestParam(name = "instance", required = true) String instance) {
+        @RequestParam(name = "id", required = true) String id) {
         try {
-            Policy p = policies.getPolicy(instance);
+            Policy p = policies.getPolicy(id);
             return new ResponseEntity<>(p.json(), HttpStatus.OK);
         } catch (ServiceException e) {
             return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);
@@ -174,19 +170,16 @@ public class PolicyController {
         value = { //
             @ApiResponse(code = 204, message = "Policy deleted", response = Object.class),
             @ApiResponse(code = 404, message = "Policy is not found", response = String.class),
-            @ApiResponse(code = 423, message = "RIC is locked", response = String.class)})
+            @ApiResponse(code = 423, message = "RIC is not operational", response = String.class)})
     public Mono<ResponseEntity<Object>> deletePolicy( //
-        @RequestParam(name = "instance", required = true) String id) {
-        Policy policy;
+        @RequestParam(name = "id", required = true) String id) {
         try {
-            policy = policies.getPolicy(id);
+            Policy policy = policies.getPolicy(id);
             keepServiceAlive(policy.ownerServiceName());
-            if (policy.ric().getState() != Ric.RicState.IDLE) {
-                return Mono.just(new ResponseEntity<>("Busy, synchronizing", HttpStatus.LOCKED));
-            }
             Ric ric = policy.ric();
-            return ric.getLock().lock(LockType.SHARED) // //
-                .flatMap(lock -> a1ClientFactory.createA1Client(policy.ric())) //
+            return ric.getLock().lock(LockType.SHARED) //
+                .flatMap(notUsed -> assertRicStateIdle(ric)) //
+                .flatMap(notUsed -> a1ClientFactory.createA1Client(policy.ric())) //
                 .doOnNext(notUsed -> policies.remove(policy)) //
                 .flatMap(client -> client.deletePolicy(policy)) //
                 .doOnNext(notUsed -> ric.getLock().unlockBlocking()) //
@@ -204,12 +197,12 @@ public class PolicyController {
         value = { //
             @ApiResponse(code = 201, message = "Policy created", response = Object.class), //
             @ApiResponse(code = 200, message = "Policy updated", response = Object.class), //
-            @ApiResponse(code = 423, message = "RIC is locked", response = String.class), //
+            @ApiResponse(code = 423, message = "RIC is not operational", response = String.class), //
             @ApiResponse(code = 404, message = "RIC or policy type is not found", response = String.class) //
         })
     public Mono<ResponseEntity<Object>> putPolicy( //
         @RequestParam(name = "type", required = false, defaultValue = "") String typeName, //
-        @RequestParam(name = "instance", required = true) String instanceId, //
+        @RequestParam(name = "id", required = true) String instanceId, //
         @RequestParam(name = "ric", required = true) String ricName, //
         @RequestParam(name = "service", required = true) String service, //
         @RequestBody Object jsonBody) {
@@ -218,31 +211,30 @@ public class PolicyController {
         Ric ric = rics.get(ricName);
         PolicyType type = policyTypes.get(typeName);
         keepServiceAlive(service);
-        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();
-
-            final boolean isCreate = this.policies.get(policy.id()) == null;
-
-            return ric.getLock().lock(LockType.SHARED) //
-                .flatMap(p -> validateModifiedPolicy(policy)) //
-                .flatMap(notUsed -> a1ClientFactory.createA1Client(ric)) //
-                .flatMap(client -> client.putPolicy(policy)) //
-                .doOnNext(notUsed -> policies.put(policy)) //
-                .doOnNext(notUsed -> ric.getLock().unlockBlocking()) //
-                .doOnError(t -> ric.getLock().unlockBlocking()) //
-                .flatMap(notUsed -> Mono.just(new ResponseEntity<>(isCreate ? HttpStatus.CREATED : HttpStatus.OK))) //
-                .onErrorResume(this::handleException);
+        if (ric == null || type == null) {
+            return Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND));
         }
-
-        return ric == null || type == null ? Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND))
-            : Mono.just(new ResponseEntity<>(HttpStatus.LOCKED)); // Synchronizing
+        Policy policy = ImmutablePolicy.builder() //
+            .id(instanceId) //
+            .json(jsonString) //
+            .type(type) //
+            .ric(ric) //
+            .ownerServiceName(service) //
+            .lastModified(getTimeStampUtc()) //
+            .build();
+
+        final boolean isCreate = this.policies.get(policy.id()) == null;
+
+        return ric.getLock().lock(LockType.SHARED) //
+            .flatMap(p -> assertRicStateIdle(ric)) //
+            .flatMap(p -> validateModifiedPolicy(policy)) //
+            .flatMap(notUsed -> a1ClientFactory.createA1Client(ric)) //
+            .flatMap(client -> client.putPolicy(policy)) //
+            .doOnNext(notUsed -> policies.put(policy)) //
+            .doOnNext(notUsed -> ric.getLock().unlockBlocking()) //
+            .doOnError(t -> ric.getLock().unlockBlocking()) //
+            .flatMap(notUsed -> Mono.just(new ResponseEntity<>(isCreate ? HttpStatus.CREATED : HttpStatus.OK))) //
+            .onErrorResume(this::handleException);
     }
 
     @SuppressWarnings({"unchecked"})
@@ -275,6 +267,16 @@ public class PolicyController {
         return Mono.just("OK");
     }
 
+    private Mono<Object> assertRicStateIdle(Ric ric) {
+        if (ric.getState() == Ric.RicState.IDLE) {
+            return Mono.just("OK");
+        } else {
+            RejectionException e = new RejectionException(
+                "Ric is not operational, RIC name: " + ric.name() + ", state: " + ric.getState(), HttpStatus.LOCKED);
+            return Mono.error(e);
+        }
+    }
+
     @GetMapping("/policies")
     @ApiOperation(value = "Query policies")
     @ApiResponses(
@@ -292,29 +294,30 @@ public class PolicyController {
         if ((ric != null && this.rics.get(ric) == null)) {
             return new ResponseEntity<>("RIC not found", HttpStatus.NOT_FOUND);
         }
-        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 = filter(policies.getForRic(ric), type, null, service);
-            } else {
-                result = policies.getAll();
-            }
 
-            String policiesJson;
-            try {
-                policiesJson = policiesToJson(result);
-            } catch (ServiceException e) {
-                return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-            }
-            return new ResponseEntity<>(policiesJson, HttpStatus.OK);
+        String filteredPolicies = policiesToJson(filter(type, ric, service));
+        return new ResponseEntity<>(filteredPolicies, HttpStatus.OK);
+    }
+
+    @GetMapping("/policy_ids")
+    @ApiOperation(value = "Query policies, only IDs returned")
+    @ApiResponses(
+        value = {@ApiResponse(code = 200, message = "Policy ids", response = String.class, responseContainer = "List"),
+            @ApiResponse(code = 404, message = "RIC or type not found", response = String.class)})
+    public ResponseEntity<String> getPolicyIds( //
+        @RequestParam(name = "type", required = false) String type, //
+        @RequestParam(name = "ric", required = false) String ric, //
+        @RequestParam(name = "service", required = false) String service) //
+    {
+        if ((type != null && this.policyTypes.get(type) == null)) {
+            return new ResponseEntity<>("Policy type not found", HttpStatus.NOT_FOUND);
         }
+        if ((ric != null && this.rics.get(ric) == null)) {
+            return new ResponseEntity<>("RIC not found", HttpStatus.NOT_FOUND);
+        }
+
+        String policyIdsJson = toPolicyIdsJson(filter(type, ric, service));
+        return new ResponseEntity<>(policyIdsJson, HttpStatus.OK);
     }
 
     @GetMapping("/policy_status")
@@ -325,9 +328,9 @@ public class PolicyController {
             @ApiResponse(code = 404, message = "Policy is not found", response = String.class)} //
     )
     public Mono<ResponseEntity<String>> getPolicyStatus( //
-        @RequestParam(name = "instance", required = true) String instance) {
+        @RequestParam(name = "id", required = true) String id) {
         try {
-            Policy policy = policies.getPolicy(instance);
+            Policy policy = policies.getPolicy(id);
 
             return a1ClientFactory.createA1Client(policy.ric()) //
                 .flatMap(client -> client.getPolicyStatus(policy)) //
@@ -363,7 +366,19 @@ public class PolicyController {
         return filtered;
     }
 
-    private String policiesToJson(Collection<Policy> policies) throws ServiceException {
+    private Collection<Policy> filter(String type, String ric, String service) {
+        if (type != null) {
+            return filter(policies.getForType(type), null, ric, service);
+        } else if (service != null) {
+            return filter(policies.getForService(service), type, ric, null);
+        } else if (ric != null) {
+            return filter(policies.getForRic(ric), type, null, service);
+        } else {
+            return policies.getAll();
+        }
+    }
+
+    private String policiesToJson(Collection<Policy> policies) {
         List<PolicyInfo> v = new ArrayList<>(policies.size());
         for (Policy p : policies) {
             PolicyInfo policyInfo = new PolicyInfo();
@@ -374,7 +389,7 @@ public class PolicyController {
             policyInfo.service = p.ownerServiceName();
             policyInfo.lastModified = p.lastModified();
             if (!policyInfo.validate()) {
-                throw new ServiceException("BUG, all fields must be set");
+                throw new NullPointerException("BUG, all fields must be set");
             }
             v.add(policyInfo);
         }
@@ -408,6 +423,14 @@ public class PolicyController {
         return gson.toJson(v);
     }
 
+    private String toPolicyIdsJson(Collection<Policy> policies) {
+        List<String> v = new ArrayList<>(policies.size());
+        for (Policy p : policies) {
+            v.add(p.id());
+        }
+        return gson.toJson(v);
+    }
+
     private String getTimeStampUtc() {
         return java.time.Instant.now().toString();
     }