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%2FApplicationConfigParser.java;h=14e836bebe24ffdeed6d09b294e219a87d02813a;hb=6a39814272307d0207222c9229b0d765ac062bf0;hp=400a681e9e12caf3e78a296c8d4df536c8874e72;hpb=bca519150103ccd308dd492e07744bc494a4a4ec;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
index 400a681e..14e836be 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
@@ -20,49 +20,150 @@
 
 package org.oransc.policyagent.configuration;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
+import javax.validation.constraints.NotNull;
+
+import org.immutables.gson.Gson;
+import org.immutables.value.Value;
 import org.oransc.policyagent.exceptions.ServiceException;
 
-class ApplicationConfigParser {
+/**
+ * Parser for the Json representing of the component configuration.
+ */
+public class ApplicationConfigParser {
 
     private static final String CONFIG = "config";
-    private static Gson gson = new GsonBuilder() //
-        .serializeNulls() //
-        .create(); //
+    private static final String CONTROLLER = "controller";
+
+    @Value.Immutable
+    @Gson.TypeAdapters
+    public interface ConfigParserResult {
+        List<RicConfig> ricConfigs();
+
+        Map<String, ControllerConfig> controllerConfigs();
 
-    private Vector<RicConfig> ricConfig;
+        String dmaapConsumerTopicUrl();
+
+        String dmaapProducerTopicUrl();
 
-    public ApplicationConfigParser() {
     }
 
-    public void parse(JsonObject root) throws ServiceException {
-        JsonObject config = root.getAsJsonObject(CONFIG);
-        ricConfig = parseRics(config);
+    public ConfigParserResult parse(JsonObject root) throws ServiceException {
+
+        String dmaapProducerTopicUrl = "";
+        String dmaapConsumerTopicUrl = "";
+
+        JsonObject agentConfigJson = root.getAsJsonObject(CONFIG);
+
+        if (agentConfigJson == null) {
+            throw new ServiceException("Missing root configuration \"" + CONFIG + "\" in JSON: " + root);
+        }
+
+        JsonObject json = agentConfigJson.getAsJsonObject("streams_publishes");
+        if (json != null) {
+            dmaapProducerTopicUrl = parseDmaapConfig(json);
+        }
+
+        json = agentConfigJson.getAsJsonObject("streams_subscribes");
+        if (json != null) {
+            dmaapConsumerTopicUrl = parseDmaapConfig(json);
+        }
+
+        List<RicConfig> ricConfigs = parseRics(agentConfigJson);
+        Map<String, ControllerConfig> controllerConfigs = parseControllerConfigs(agentConfigJson);
+        checkConfigurationConsistency(ricConfigs, controllerConfigs);
+
+        return ImmutableConfigParserResult.builder() //
+            .dmaapConsumerTopicUrl(dmaapConsumerTopicUrl) //
+            .dmaapProducerTopicUrl(dmaapProducerTopicUrl) //
+            .ricConfigs(ricConfigs) //
+            .controllerConfigs(controllerConfigs) //
+            .build();
     }
 
-    public Vector<RicConfig> getRicConfigs() {
-        return this.ricConfig;
+    private void checkConfigurationConsistency(List<RicConfig> ricConfigs,
+        Map<String, ControllerConfig> controllerConfigs) throws ServiceException {
+        Set<String> ricUrls = new HashSet<>();
+        Set<String> ricNames = new HashSet<>();
+        for (RicConfig ric : ricConfigs) {
+            if (!ricUrls.add(ric.baseUrl())) {
+                throw new ServiceException("Configuration error, more than one RIC URL: " + ric.baseUrl());
+            }
+            if (!ricNames.add(ric.name())) {
+                throw new ServiceException("Configuration error, more than one RIC with name: " + ric.name());
+            }
+            if (!ric.controllerName().isEmpty() && controllerConfigs.get(ric.controllerName()) == null) {
+                throw new ServiceException(
+                    "Configuration error, controller configuration not found: " + ric.controllerName());
+            }
+
+        }
     }
 
-    private Vector<RicConfig> parseRics(JsonObject config) throws ServiceException {
-        Vector<RicConfig> result = new Vector<RicConfig>();
+    private List<RicConfig> parseRics(JsonObject config) throws ServiceException {
+        List<RicConfig> result = new ArrayList<>();
         for (JsonElement ricElem : getAsJsonArray(config, "ric")) {
-            result.add(gson.fromJson(ricElem.getAsJsonObject(), ImmutableRicConfig.class));
+            JsonObject ricAsJson = ricElem.getAsJsonObject();
+            JsonElement controllerNameElement = ricAsJson.get(CONTROLLER);
+            ImmutableRicConfig ricConfig = ImmutableRicConfig.builder() //
+                .name(get(ricAsJson, "name").getAsString()) //
+                .baseUrl(get(ricAsJson, "baseUrl").getAsString()) //
+                .managedElementIds(parseManagedElementIds(get(ricAsJson, "managedElementIds").getAsJsonArray())) //
+                .controllerName(controllerNameElement != null ? controllerNameElement.getAsString() : "") //
+                .build();
+            result.add(ricConfig);
+        }
+        return result;
+    }
+
+    Map<String, ControllerConfig> parseControllerConfigs(JsonObject config) throws ServiceException {
+        if (config.get(CONTROLLER) == null) {
+            return new HashMap<>();
+        }
+        Map<String, ControllerConfig> result = new HashMap<>();
+        for (JsonElement element : getAsJsonArray(config, CONTROLLER)) {
+            JsonObject controllerAsJson = element.getAsJsonObject();
+            ImmutableControllerConfig controllerConfig = ImmutableControllerConfig.builder() //
+                .name(get(controllerAsJson, "name").getAsString()) //
+                .baseUrl(get(controllerAsJson, "baseUrl").getAsString()) //
+                .password(get(controllerAsJson, "password").getAsString()) //
+                .userName(get(controllerAsJson, "userName").getAsString()) // )
+                .build();
+
+            if (result.put(controllerConfig.name(), controllerConfig) != null) {
+                throw new ServiceException(
+                    "Configuration error, more than one controller with name: " + controllerConfig.name());
+            }
         }
         return result;
     }
 
+    private List<String> parseManagedElementIds(JsonArray asJsonObject) {
+        Iterator<JsonElement> iterator = asJsonObject.iterator();
+        List<String> managedElementIds = new ArrayList<>();
+        while (iterator.hasNext()) {
+            managedElementIds.add(iterator.next().getAsString());
+
+        }
+        return managedElementIds;
+    }
+
     private static JsonElement get(JsonObject obj, String memberName) throws ServiceException {
         JsonElement elem = obj.get(memberName);
         if (elem == null) {
-            throw new ServiceException("Could not find member: " + memberName + " in: " + obj);
+            throw new ServiceException("Could not find member: '" + memberName + "' in: " + obj);
         }
         return elem;
     }
@@ -71,4 +172,18 @@ class ApplicationConfigParser {
         return get(obj, memberName).getAsJsonArray();
     }
 
+    private String parseDmaapConfig(JsonObject streamCfg) throws ServiceException {
+        Set<Entry<String, JsonElement>> streamConfigEntries = streamCfg.entrySet();
+        if (streamConfigEntries.size() != 1) {
+            throw new ServiceException(
+                "Invalid configuration. Number of streams must be one, config: " + streamConfigEntries);
+        }
+        JsonObject streamConfigEntry = streamConfigEntries.iterator().next().getValue().getAsJsonObject();
+        JsonObject dmaapInfo = get(streamConfigEntry, "dmaap_info").getAsJsonObject();
+        return getAsString(dmaapInfo, "topic_url");
+    }
+
+    private static @NotNull String getAsString(JsonObject obj, String memberName) throws ServiceException {
+        return get(obj, memberName).getAsString();
+    }
 }