X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FStartupService.java;h=590b010789129220504aa0ffc3dd7ee9adde9a1b;hb=61d78df4c74f93d77bc56eaa51280a8cead66209;hp=cd816739475af1bbe13808df1e5aed5a0e182192;hpb=3e827b5c2bc00500577af25e9cb559b6243e1abd;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java
index cd816739..590b0107 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java
@@ -20,33 +20,37 @@
 
 package org.oransc.policyagent.tasks;
 
-import org.oransc.policyagent.clients.A1Client;
+import org.oransc.policyagent.clients.A1ClientFactory;
 import org.oransc.policyagent.configuration.ApplicationConfig;
-import org.oransc.policyagent.repository.ImmutablePolicyType;
-import org.oransc.policyagent.repository.PolicyType;
+import org.oransc.policyagent.configuration.ApplicationConfig.RicConfigUpdate;
+import org.oransc.policyagent.configuration.RicConfig;
+import org.oransc.policyagent.repository.Policies;
 import org.oransc.policyagent.repository.PolicyTypes;
 import org.oransc.policyagent.repository.Ric;
-import org.oransc.policyagent.repository.Ric.RicState;
 import org.oransc.policyagent.repository.Rics;
+import org.oransc.policyagent.repository.Services;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * Loads information about RealTime-RICs at startup.
  */
 @Service("startupService")
-public class StartupService {
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class StartupService implements ApplicationConfig.Observer {
 
     private static final Logger logger = LoggerFactory.getLogger(StartupService.class);
 
     @Autowired
     ApplicationConfig applicationConfig;
 
+    @Autowired
+    RefreshConfigTask refreshConfigTask;
+
     @Autowired
     private Rics rics;
 
@@ -54,70 +58,59 @@ public class StartupService {
     PolicyTypes policyTypes;
 
     @Autowired
-    private A1Client a1Client;
+    private A1ClientFactory a1ClientFactory;
+
+    @Autowired
+    private Policies policies;
+
+    @Autowired
+    private Services services;
 
-    StartupService(ApplicationConfig appConfig, Rics rics, PolicyTypes policyTypes, A1Client a1Client) {
+    // Only for unit testing
+    StartupService(ApplicationConfig appConfig, RefreshConfigTask refreshTask, Rics rics, PolicyTypes policyTypes,
+        A1ClientFactory a1ClientFactory, Policies policies, Services services) {
         this.applicationConfig = appConfig;
+        this.refreshConfigTask = refreshTask;
         this.rics = rics;
         this.policyTypes = policyTypes;
-        this.a1Client = a1Client;
+        this.a1ClientFactory = a1ClientFactory;
+        this.policies = policies;
+        this.services = services;
+    }
+
+    @Override
+    public void onRicConfigUpdate(RicConfig ricConfig, RicConfigUpdate event) {
+        synchronized (this.rics) {
+            switch (event) {
+                case ADDED:
+                case CHANGED:
+                    Ric ric = new Ric(ricConfig);
+                    rics.put(ric);
+                    RicSynchronizationTask synchronizationTask = createSynchronizationTask();
+                    synchronizationTask.run(ric);
+                    break;
+
+                case REMOVED:
+                    rics.remove(ricConfig.name());
+                    policies.removePoliciesForRic(ricConfig.name());
+                    break;
+
+                default:
+                    logger.error("Unhandled ric event: {}", event);
+            }
+        }
     }
 
     /**
      * Reads the configured Rics and performs the service discovery. The result is put into the repository.
      */
     public void startup() {
-        applicationConfig.initialize();
-        Flux.fromIterable(applicationConfig.getRicConfigs()) //
-            .map(ricConfig -> new Ric(ricConfig)) //
-            .doOnNext(ric -> logger.debug("Handling ric: {}", ric.getConfig().name())) //
-            .flatMap(this::addPolicyTypesForRic) //
-            .flatMap(this::deletePoliciesForRic) //
-            .flatMap(this::setRicToActive) //
-            .flatMap(this::addRicToRepo) //
-            .subscribe();
-    }
-
-    private Mono<Ric> addPolicyTypesForRic(Ric ric) {
-        a1Client.getPolicyTypeIdentities(ric.getConfig().baseUrl()) //
-            .doOnNext(typeId -> logger.debug("For ric: {}, handling type: {}", ric.getConfig().name(), typeId))
-            .flatMap(this::addTypeToRepo) //
-            .flatMap(type -> addTypeToRic(ric, type)) //
-            .subscribe();
-        return Mono.just(ric);
+        logger.debug("Starting up");
+        applicationConfig.addObserver(this);
+        refreshConfigTask.start();
     }
 
-    private Mono<PolicyType> addTypeToRepo(String policyTypeId) {
-        ImmutablePolicyType type = ImmutablePolicyType.builder().name(policyTypeId).build();
-        if (!policyTypes.contains(policyTypeId)) {
-            policyTypes.put(type);
-        }
-        return Mono.just(type);
-    }
-
-    private Mono<Void> addTypeToRic(Ric ric, PolicyType policyType) {
-        ric.addSupportedPolicyType(policyType);
-        return Mono.empty();
-    }
-
-    private Mono<Ric> deletePoliciesForRic(Ric ric) {
-        a1Client.getPolicyIdentities(ric.getConfig().baseUrl()) //
-            .doOnNext(policyId -> logger.debug("deleting policy: {}, for ric: {}", policyId, ric.getConfig().name())) //
-            .flatMap(policyId -> a1Client.deletePolicy(ric.getConfig().baseUrl(), policyId)) //
-            .subscribe();
-
-        return Mono.just(ric);
-    }
-
-    private Mono<Ric> setRicToActive(Ric ric) {
-        ric.setState(RicState.ACTIVE);
-
-        return Mono.just(ric);
-    }
-
-    private Mono<Void> addRicToRepo(Ric ric) {
-        rics.put(ric);
-
-        return Mono.empty();
+    RicSynchronizationTask createSynchronizationTask() {
+        return new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services);
     }
 }