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.net.MalformedURLException;
import java.net.URL;
+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.Properties;
import java.util.Set;
-import java.util.Vector;
+
import javax.validation.constraints.NotNull;
+
+import org.immutables.gson.Gson;
+import org.immutables.value.Value;
import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
import org.oransc.policyagent.exceptions.ServiceException;
import org.springframework.http.MediaType;
+/**
+ * Parser for the Json representing of the component configuration.
+ */
public class ApplicationConfigParser {
private static final String CONFIG = "config";
+ private static final String CONTROLLER = "controller";
- private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
- .create(); //
+ @Value.Immutable
+ @Gson.TypeAdapters
+ public interface ConfigParserResult {
+ List<RicConfig> ricConfigs();
- private Vector<RicConfig> ricConfig;
- private Properties dmaapPublisherConfig;
- private Properties dmaapConsumerConfig;
+ Properties dmaapPublisherConfig();
- public ApplicationConfigParser() {
+ Properties dmaapConsumerConfig();
+
+ Map<String, ControllerConfig> controllerConfigs();
}
- public void parse(JsonObject root) throws ServiceException {
- JsonObject ricConfigJson = root.getAsJsonObject(CONFIG);
- ricConfig = parseRics(ricConfigJson);
- JsonObject dmaapPublisherConfigJson = root.getAsJsonObject("streams_publishes");
- if (dmaapPublisherConfigJson == null) {
- dmaapPublisherConfig = new Properties();
- } else {
- dmaapPublisherConfig = parseDmaapConfig(dmaapPublisherConfigJson);
+ public ConfigParserResult parse(JsonObject root) throws ServiceException {
+
+ Properties dmaapPublisherConfig = new Properties();
+ Properties dmaapConsumerConfig = new Properties();
+
+ JsonObject agentConfigJson = root.getAsJsonObject(CONFIG);
+ List<RicConfig> ricConfigs = parseRics(agentConfigJson);
+ Map<String, ControllerConfig> controllerConfigs = parseControllerConfigs(agentConfigJson);
+
+ JsonObject json = agentConfigJson.getAsJsonObject("streams_publishes");
+ if (json != null) {
+ dmaapPublisherConfig = parseDmaapConfig(json);
}
- JsonObject dmaapConsumerConfigJson = root.getAsJsonObject("streams_subscribes");
- if (dmaapConsumerConfigJson == null) {
- dmaapConsumerConfig = new Properties();
- } else {
- dmaapConsumerConfig = parseDmaapConfig(dmaapConsumerConfigJson);
+
+ json = agentConfigJson.getAsJsonObject("streams_subscribes");
+ if (json != null) {
+ dmaapConsumerConfig = parseDmaapConfig(json);
}
- }
- public Vector<RicConfig> getRicConfigs() {
- return this.ricConfig;
- }
+ checkConfigurationConsistency(ricConfigs, controllerConfigs);
- public Properties getDmaapPublisherConfig() {
- return dmaapPublisherConfig;
+ return ImmutableConfigParserResult.builder() //
+ .dmaapConsumerConfig(dmaapConsumerConfig) //
+ .dmaapPublisherConfig(dmaapPublisherConfig) //
+ .ricConfigs(ricConfigs) //
+ .controllerConfigs(controllerConfigs) //
+ .build();
}
- public Properties getDmaapConsumerConfig() {
- return dmaapConsumerConfig;
+ 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;
}
return get(obj, memberName).getAsJsonArray();
}
- private Properties parseDmaapConfig(JsonObject consumerCfg) throws ServiceException {
- Set<Entry<String, JsonElement>> topics = consumerCfg.entrySet();
- if (topics.size() != 1) {
- throw new ServiceException("Invalid configuration, number of topic must be one, config: " + topics);
+ private Properties 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 topic = topics.iterator().next().getValue().getAsJsonObject();
- JsonObject dmaapInfo = get(topic, "dmaap_info").getAsJsonObject();
+ JsonObject streamConfigEntry = streamConfigEntries.iterator().next().getValue().getAsJsonObject();
+ JsonObject dmaapInfo = get(streamConfigEntry, "dmaap_info").getAsJsonObject();
String topicUrl = getAsString(dmaapInfo, "topic_url");
- Properties dmaapProps = new Properties();
try {
+ Properties dmaapProps = new Properties();
URL url = new URL(topicUrl);
String passwd = "";
String userName = "";
String urlPath = url.getPath();
DmaapUrlPath path = parseDmaapUrlPath(urlPath);
- dmaapProps.put("ServiceName", url.getHost()+":"+url.getPort()+"/events");
+ dmaapProps.put("ServiceName", url.getHost() + ":" + url.getPort() + "/events");
dmaapProps.put("topic", path.dmaapTopicName);
- dmaapProps.put("host", url.getHost()+":"+url.getPort());
+ dmaapProps.put("host", url.getHost() + ":" + url.getPort());
dmaapProps.put("contenttype", MediaType.APPLICATION_JSON.toString());
dmaapProps.put("userName", userName);
dmaapProps.put("password", passwd);
dmaapProps.put("id", path.consumerId);
dmaapProps.put("TransportType", ProtocolTypeConstants.HTTPNOAUTH.toString());
dmaapProps.put("timeout", 15000);
- dmaapProps.put("limit", 1000);
+ dmaapProps.put("limit", 100);
+ dmaapProps.put("maxBatchSize", "10");
+ dmaapProps.put("maxAgeMs", "10000");
+ dmaapProps.put("compress", true);
+ dmaapProps.put("MessageSentThreadOccurance", "2");
+ return dmaapProps;
} catch (MalformedURLException e) {
throw new ServiceException("Could not parse the URL", e);
}
-
- return dmaapProps;
}
private static @NotNull String getAsString(JsonObject obj, String memberName) throws ServiceException {
throw new ServiceException("The path has incorrect syntax: " + urlPath);
}
- final String dmaapTopicName = tokens[2]; // /events/A1-P
+ final String dmaapTopicName = tokens[2]; // /events/A1-P
String consumerGroup = ""; // users
String consumerId = ""; // sdnc1
if (tokens.length == 5) {
Code Review / nonrtric.git / blobdiff