X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fcontrollers%2FRicRepositoryController.java;h=b7b1c3058c8e6e23488763cfaf5e06e5e25b303a;hb=d3920fdf9938291fcd01388deea763d097b0d6c8;hp=7c63dcd815ac6b2fc12e28540e4795654acfba62;hpb=ce1713127bd5445b3890efddf4609cb8b8d58054;p=nonrtric.git

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 7c63dcd8..b7b1c305 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java
@@ -22,13 +22,17 @@ package org.oransc.policyagent.controllers;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
+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.List;
 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.PolicyTypes;
 import org.oransc.policyagent.repository.Ric;
 import org.oransc.policyagent.repository.Rics;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,61 +43,62 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@Api(tags = "RIC Repository")
 public class RicRepositoryController {
 
-    private final ApplicationConfig appConfig;
-
     @Autowired
     private Rics rics;
 
+    @Autowired
+    PolicyTypes types;
+
     private static Gson gson = new GsonBuilder() //
         .serializeNulls() //
         .create(); //
 
-    @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 found", response = String.class), //
+            @ApiResponse(code = 404, message = "RIC is not found", response = String.class) //
         })
     public ResponseEntity<String> getRic(
-        @RequestParam(name = "managedElementId", required = false, defaultValue = "") String managedElementId) {
+        @RequestParam(name = "managedElementId", required = true) 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);
+            return new ResponseEntity<>("No RIC found", HttpStatus.NOT_FOUND);
         }
     }
 
     /**
-     * @return a Json array of all RIC data
-     *         Example: http://localhost:8080/ric
+     * @return a Json array of all RIC data Example: http://localhost:8081/ric
      */
     @GetMapping("/rics")
-    @ApiOperation(value = "Returns defined NearRT RIC:s as Json")
+    @ApiOperation(value = "Query Near-RT RIC information")
     @ApiResponses(
         value = { //
-            @ApiResponse(code = 200, message = "OK") //
-        })
-    public ResponseEntity<String> getRics() {
-        Vector<RicInfo> result = new Vector<>();
+            @ApiResponse(code = 200, message = "OK", response = RicInfo.class, responseContainer = "List"), //
+            @ApiResponse(code = 404, message = "Policy type is not found", response = String.class)})
+    public ResponseEntity<String> getRics(
+        @RequestParam(name = "policyType", required = false) String supportingPolicyType) {
+
+        if ((supportingPolicyType != null) && (this.types.get(supportingPolicyType) == null)) {
+            return new ResponseEntity<>("Policy type not found", HttpStatus.NOT_FOUND);
+        }
+
+        List<RicInfo> result = new ArrayList<>();
         for (Ric ric : rics.getRics()) {
-            result.add(ImmutableRicInfo.builder() //
-                .name(ric.name()) //
-                .managedElementIds(ric.getManagedNodes()) //
-                .build());
+            if (supportingPolicyType == null || ric.isSupportingType(supportingPolicyType)) {
+                result.add(new RicInfo(ric.name(), ric.getManagedElementIds(), ric.getSupportedPolicyTypeNames()));
+            }
         }
 
         return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);