X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fconfiguration%2FApplicationConfig.java;h=7e5228425c957d124e0c3b44a1a6c3078f60c784;hb=f694dec2ff16069e6bb5c9de845278f44e8c9591;hp=c7ab0ce5957020beb0fa66242b35b09853a316ec;hpb=3bdae60a11a5f154500b4e7c5de4090326af1f98;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..7e522842 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,12 +32,24 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.time.Duration; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +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; +import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient; +import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClientFactory; +import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsRequests; +import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest; +import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.EnvProperties; +import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; import org.oransc.policyagent.exceptions.ServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,10 +57,11 @@ 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.Disposable; +import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -@Component @EnableConfigurationProperties @ConfigurationProperties("app") public class ApplicationConfig { @@ -57,6 +70,11 @@ public class ApplicationConfig { @Value("#{systemEnvironment}") Properties systemEnvironment; + private Disposable refreshConfigTask = null; + private Collection observers = new Vector<>(); + + private Map ricConfigs = new HashMap<>(); + @NotEmpty private String filepath; @@ -64,25 +82,158 @@ public class ApplicationConfig { public ApplicationConfig() { } + protected String getLocalConfigurationFilePath() { + return this.filepath; + } + public synchronized void setFilepath(String filepath) { this.filepath = filepath; } - /** - * Reads the cloud configuration. - */ + public synchronized Collection getRicConfigs() { + return this.ricConfigs.values(); + } + + public synchronized Optional 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() { + stop(); loadConfigurationFromFile(); + + refreshConfigTask = createRefreshTask() // + .subscribe(notUsed -> logger.info("Refreshed configuration data"), + throwable -> logger.error("Configuration refresh terminated due to exception", throwable), + () -> logger.error("Configuration refresh terminated")); + } + + public static enum RicConfigUpdate { + ADDED, CHANGED, REMOVED + } + + public interface Observer { + void onRicConfigUpdate(RicConfig ric, RicConfigUpdate event); + } + + public void addObserver(Observer o) { + this.observers.add(o); + } + + Mono getEnvironment(Properties systemEnvironment) { + return EnvironmentProcessor.readEnvironmentVariables(systemEnvironment); + } + + Flux createRefreshTask() { + return getEnvironment(systemEnvironment) // + .flatMap(this::createCbsClient) // + .flatMapMany(this::periodicConfigurationUpdates) // + .map(this::parseRicConfigurationfromConsul) // + .onErrorResume(this::onErrorResume); + } + + Mono createCbsClient(EnvProperties env) { + return CbsClientFactory.createCbsClient(env); + } + + private Flux periodicConfigurationUpdates(CbsClient cbsClient) { + final Duration initialDelay = Duration.ZERO; + final Duration refreshPeriod = Duration.ofMinutes(1); + final CbsRequest getConfigRequest = CbsRequests.getAll(RequestDiagnosticContext.create()); + return cbsClient.updates(getConfigRequest, initialDelay, refreshPeriod); + } + + private Mono onErrorResume(Throwable trowable) { + logger.error("Could not refresh application configuration {}", trowable.toString()); + return Mono.empty(); } - Mono getEnvironment(Properties systemEnvironment) { - return Environment.readEnvironmentVariables(systemEnvironment); + private ApplicationConfig parseRicConfigurationfromConsul(JsonObject jsonObject) { + try { + ApplicationConfigParser parser = new ApplicationConfigParser(); + parser.parse(jsonObject); + setConfiguration(parser.getRicConfigs()); + + } catch (ServiceException e) { + logger.error("Could not parse configuration {}", e.toString(), e); + } + return this; + } + + private class Notification { + final RicConfig ric; + final RicConfigUpdate event; + + Notification(RicConfig ric, RicConfigUpdate event) { + this.ric = ric; + this.event = event; + } + } + + private void setConfiguration(@NotNull Collection ricConfigs) { + Collection notifications = new Vector<>(); + synchronized (this) { + Map newRicConfigs = new HashMap<>(); + for (RicConfig newConfig : ricConfigs) { + RicConfig oldConfig = this.ricConfigs.get(newConfig.name()); + if (oldConfig == null) { + newRicConfigs.put(newConfig.name(), newConfig); + notifications.add(new Notification(newConfig, RicConfigUpdate.ADDED)); + this.ricConfigs.remove(newConfig.name()); + } else if (!newConfig.equals(newConfig)) { + notifications.add(new Notification(newConfig, RicConfigUpdate.CHANGED)); + newRicConfigs.put(newConfig.name(), newConfig); + this.ricConfigs.remove(newConfig.name()); + } else { + newRicConfigs.put(oldConfig.name(), oldConfig); + } + } + for (RicConfig deletedConfig : this.ricConfigs.values()) { + notifications.add(new Notification(deletedConfig, RicConfigUpdate.REMOVED)); + } + this.ricConfigs = newRicConfigs; + } + notifyObservers(notifications); + } + + private void notifyObservers(Collection notifications) { + for (Observer observer : this.observers) { + for (Notification notif : notifications) { + observer.onRicConfigUpdate(notif.ric, notif.event); + } + } + } + + public void stop() { + if (refreshConfigTask != null) { + refreshConfigTask.dispose(); + refreshConfigTask = null; + } } /** * Reads the configuration from file. */ - void loadConfigurationFromFile() { + public void loadConfigurationFromFile() { + String filepath = getLocalConfigurationFilePath(); + if (filepath == null) { + logger.debug("No localconfiguration file used"); + return; + } GsonBuilder gsonBuilder = new GsonBuilder(); ServiceLoader.load(TypeAdapterFactory.class).forEach(gsonBuilder::registerTypeAdapterFactory); @@ -94,6 +245,7 @@ public class ApplicationConfig { } ApplicationConfigParser appParser = new ApplicationConfigParser(); appParser.parse(rootObject); + setConfiguration(appParser.getRicConfigs()); logger.info("Local configuration file loaded: {}", filepath); } catch (JsonSyntaxException | ServiceException | IOException e) { logger.trace("Local configuration file not loaded: {}", filepath, e); @@ -107,5 +259,4 @@ public class ApplicationConfig { InputStream createInputStream(@NotNull String filepath) throws IOException { return new BufferedInputStream(new FileInputStream(filepath)); } - }