Updates of the policy agent NBI

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / controllers / RicRepositoryController.java

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
index db17fb2..38369a8 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
@@ -32,7 +32,6 @@ import java.util.Optional;
 import java.util.Vector;
 
 import org.oransc.policyagent.configuration.ApplicationConfig;
-import org.oransc.policyagent.configuration.RicConfig;
 import org.oransc.policyagent.repository.Ric;
 import org.oransc.policyagent.repository.Rics;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,8 +45,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "RIC Management API")
 public class RicRepositoryController {
 
-    private final ApplicationConfig appConfig;
-
     @Autowired
     private Rics rics;
 
@@ -57,26 +54,25 @@ public class RicRepositoryController {
 
     @Autowired
     RicRepositoryController(ApplicationConfig appConfig) {
-        this.appConfig = appConfig;
     }
 
     /**
-     * Example: http://localhost:8080/rics?managedElementId=kista_1
+     * Example: http://localhost:8081/rics?managedElementId=kista_1
      */
     @GetMapping("/ric")
     @ApiOperation(value = "Returns the name of a RIC managing one Mananged Element")
     @ApiResponses(
         value = { //
-            @ApiResponse(code = 200, message = "RIC is fond"), //
-            @ApiResponse(code = 404, message = "RIC is not fond") //
+            @ApiResponse(code = 200, message = "RIC is fond", response = String.class), //
+            @ApiResponse(code = 404, message = "RIC is not fond", response = String.class) //
         })
     public ResponseEntity<String> getRic(
         @RequestParam(name = "managedElementId", required = false, defaultValue = "") String managedElementId) {
 
-        Optional<RicConfig> config = appConfig.lookupRicConfigForManagedElement(managedElementId);
+        Optional<Ric> ric = this.rics.lookupRicForManagedElement(managedElementId);
 
-        if (config.isPresent()) {
-            return new ResponseEntity<>(config.get().name(), HttpStatus.OK);
+        if (ric.isPresent()) {
+            return new ResponseEntity<>(ric.get().name(), HttpStatus.OK);
         } else {
             return new ResponseEntity<>("", HttpStatus.NOT_FOUND);
         }
@@ -84,24 +80,23 @@ public class RicRepositoryController {
 
     /**
      * @return a Json array of all RIC data
-     *         Example: http://localhost:8080/ric
+     *         Example: http://localhost:8081/ric
      */
     @GetMapping("/rics")
-    @ApiOperation(value = "Returns defined NearRT RIC:s as Json")
+    @ApiOperation(value = "Query NearRT RIC information")
     @ApiResponses(
         value = { //
-            @ApiResponse(code = 200, message = "OK") //
+            @ApiResponse(code = 200, message = "OK", response = RicInfo.class, responseContainer = "List") //
         })
     public ResponseEntity<String> getRics(
         @RequestParam(name = "policyType", required = false) String supportingPolicyType) {
+
         Vector<RicInfo> result = new Vector<>();
-        for (Ric ric : rics.getRics()) {
-            if (supportingPolicyType == null || ric.isSupportingType(supportingPolicyType)) {
-                result.add(ImmutableRicInfo.builder() //
-                    .name(ric.name()) //
-                    .nodeNames(ric.getManagedNodes()) //
-                    .policyTypes(ric.getSupportedPolicyTypeNames()) //
-                    .build());
+        synchronized (rics) {
+            for (Ric ric : rics.getRics()) {
+                if (supportingPolicyType == null || ric.isSupportingType(supportingPolicyType)) {
+                    result.add(new RicInfo(ric.name(), ric.getManagedElementIds(), ric.getSupportedPolicyTypeNames()));
+                }
             }
         }