Dashboard using 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 34fc4c1..960532a 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
@@ -17,6 +17,7 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
+
 package org.oransc.policyagent.controllers;
 
 import com.google.gson.Gson;
@@ -31,6 +32,8 @@ 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;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -42,13 +45,17 @@ import org.springframework.web.bind.annotation.RestController;
 public class RicRepositoryController {
 
     private final ApplicationConfig appConfig;
+
+    @Autowired
+    private Rics rics;
+
     private static Gson gson = new GsonBuilder() //
         .serializeNulls() //
         .create(); //
 
     @Autowired
-    RicRepositoryController(ApplicationConfig config) {
-        this.appConfig = config;
+    RicRepositoryController(ApplicationConfig appConfig) {
+        this.appConfig = appConfig;
     }
 
     /**
@@ -84,14 +91,14 @@ public class RicRepositoryController {
             @ApiResponse(code = 200, message = "OK") //
         })
     public ResponseEntity<String> getRics() {
-        Vector<RicInfo> result = new Vector<RicInfo>();
-        for (RicConfig ricConfig : this.appConfig.getRicConfigs()) {
-            RicInfo ric = ImmutableRicInfo.builder() //
-                .managedElementIds(ricConfig.managedElementIds()) //
-                .name(ricConfig.name()) //
-                .build();
-            result.add(ric);
+        Vector<RicInfo> result = new Vector<>();
+        for (Ric ric : rics.getRics()) {
+            result.add(ImmutableRicInfo.builder() //
+                .name(ric.name()) //
+                .nodeNames(ric.getManagedNodes()) //
+                .build());
         }
+
         return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
     }