X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fconfiguration%2FApplicationConfig.java;h=d8da5ee89af883713cbce391a4e4907d6d1f4d82;hb=3ed724aaef96d30347f9a60ca111627b28133721;hp=c7ab0ce5957020beb0fa66242b35b09853a316ec;hpb=41cbc8cef42c7b1d4ee78c8789f14bffd7d829dd;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfig.java b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfig.java
index c7ab0ce5..d8da5ee8 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfig.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfig.java
@@ -32,8 +32,10 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.ServiceLoader;
+import java.util.Vector;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -45,10 +47,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
-@Component
 @EnableConfigurationProperties
 @ConfigurationProperties("app")
 public class ApplicationConfig {
@@ -60,6 +60,8 @@ public class ApplicationConfig {
     @NotEmpty
     private String filepath;
 
+    private Vector<RicConfig> ricConfigs;
+
     @Autowired
     public ApplicationConfig() {
     }
@@ -68,11 +70,30 @@ public class ApplicationConfig {
         this.filepath = filepath;
     }
 
-    /**
-     * Reads the cloud configuration.
-     */
+    public Vector<RicConfig> getRicConfigs() {
+        return this.ricConfigs;
+    }
+
+    public Optional<RicConfig> lookupRicConfigForManagedElement(String managedElementId) {
+        for (RicConfig ricConfig : getRicConfigs()) {
+            if (ricConfig.managedElementIds().contains(managedElementId)) {
+                return Optional.of(ricConfig);
+            }
+        }
+        return Optional.empty();
+    }
+
+    public RicConfig getRic(String ricName) throws ServiceException {
+        for (RicConfig ricConfig : getRicConfigs()) {
+            if (ricConfig.name().equals(ricName)) {
+                return ricConfig;
+            }
+        }
+        throw new ServiceException("Could not find ric: " + ricName);
+    }
+
     public void initialize() {
-        loadConfigurationFromFile();
+        loadConfigurationFromFile(this.filepath);
     }
 
     Mono<Environment.Variables> getEnvironment(Properties systemEnvironment) {
@@ -82,7 +103,7 @@ public class ApplicationConfig {
     /**
      * Reads the configuration from file.
      */
-    void loadConfigurationFromFile() {
+    protected void loadConfigurationFromFile(String filepath) {
         GsonBuilder gsonBuilder = new GsonBuilder();
         ServiceLoader.load(TypeAdapterFactory.class).forEach(gsonBuilder::registerTypeAdapterFactory);
 
@@ -94,6 +115,7 @@ public class ApplicationConfig {
             }
             ApplicationConfigParser appParser = new ApplicationConfigParser();
             appParser.parse(rootObject);
+            this.ricConfigs = appParser.getRicConfigs();
             logger.info("Local configuration file loaded: {}", filepath);
         } catch (JsonSyntaxException | ServiceException | IOException e) {
             logger.trace("Local configuration file not loaded: {}", filepath, e);