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=e0971c5068c7d8379152877163478dd4e7bf99d0;hb=46bcb815f77e8949beba7f38eb7ceee6729fadde;hp=12deb819918a61129fcdc83cdff823d5f7ae669a;hpb=296116b25bb7ef0971dc7234554436b2e2b090e6;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 12deb819..e0971c50 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 @@ -108,7 +108,7 @@ public class PolicyController { } @GetMapping("/policy_types") - @ApiOperation(value = "Returns policy types") + @ApiOperation(value = "Query policy type names") @ApiResponses( value = {@ApiResponse( code = 200, @@ -138,7 +138,6 @@ public class PolicyController { @ApiResponse(code = 200, message = "Policy found", response = Object.class), // @ApiResponse(code = 204, message = "Policy is not found")} // ) - public ResponseEntity getPolicy( // @RequestParam(name = "instance", required = true) String instance) { try { @@ -150,7 +149,7 @@ public class PolicyController { } @DeleteMapping("/policy") - @ApiOperation(value = "Deletes the policy", response = Object.class) + @ApiOperation(value = "Delete a policy", response = Object.class) @ApiResponses(value = {@ApiResponse(code = 204, message = "Policy deleted", response = Object.class)}) public Mono> deletePolicy( // @RequestParam(name = "instance", required = true) String id) { @@ -201,7 +200,7 @@ public class PolicyController { } @GetMapping("/policies") - @ApiOperation(value = "Returns the policies") + @ApiOperation(value = "Query policies") @ApiResponses( value = { @ApiResponse(code = 200, message = "Policies", response = PolicyInfo.class, responseContainer = "List")}) @@ -230,6 +229,26 @@ public class PolicyController { } } + @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> 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(status, HttpStatus.OK))); + } catch (ServiceException e) { + return Mono.just(new ResponseEntity(e.getMessage(), HttpStatus.NO_CONTENT)); + } + } + private boolean include(String filter, String value) { return filter == null || value.equals(filter); }