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=251f3437acc3f00a0106b7a665fad5d24ed578ea;hb=592ce20ec359928373de2e7f06214c8f8ad73c20;hp=6612e39acf516f8523f730ae55b687bf17884f0f;hpb=023c1b75327ff105348f9dc8eedc0cbf45e7a419;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 6612e39a..251f3437 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,35 +20,25 @@
 
 package org.oransc.policyagent.tasks;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 import org.oransc.policyagent.clients.A1Client;
 import org.oransc.policyagent.configuration.ApplicationConfig;
-import org.oransc.policyagent.repository.ImmutablePolicyType;
-import org.oransc.policyagent.repository.PolicyType;
+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.stereotype.Service;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * Loads information about RealTime-RICs at startup.
  */
 @Service("startupService")
 public class StartupService {
 
-    private static Gson gson = new GsonBuilder() //
-        .serializeNulls() //
-        .create(); //
-
     private static final Logger logger = LoggerFactory.getLogger(StartupService.class);
 
     @Autowired
@@ -63,67 +53,34 @@ public class StartupService {
     @Autowired
     private A1Client a1Client;
 
-    StartupService(ApplicationConfig appConfig, Rics rics, PolicyTypes policyTypes, A1Client a1Client) {
+    @Autowired
+    private Policies policies;
+
+    @Autowired
+    private Services services;
+
+    // Only for unittesting
+    StartupService(ApplicationConfig appConfig, Rics rics, PolicyTypes policyTypes, A1Client a1Client,
+        Policies policies, Services services) {
         this.applicationConfig = appConfig;
         this.rics = rics;
         this.policyTypes = policyTypes;
         this.a1Client = a1Client;
+        this.policies = policies;
+        this.services = services;
     }
 
     /**
      * Reads the configured Rics and performs the service discovery. The result is put into the repository.
      */
     public void startup() {
+        logger.debug("Starting up");
         applicationConfig.initialize();
-        Flux.fromIterable(applicationConfig.getRicConfigs()) //
-            .map(ricConfig -> new Ric(ricConfig)) //
-            .doOnNext(ric -> logger.debug("Handling ric: {}", ric.getConfig().name())).flatMap(this::handlePolicyTypes)
-            .flatMap(this::setRicToActive) //
-            .flatMap(this::addRicToRepo) //
-            .subscribe();
-    }
-
-    private Mono<Ric> handlePolicyTypes(Ric ric) {
-        a1Client.getAllPolicyTypes(ric.getConfig().baseUrl()) //
-            .map(policyTypeString -> gson.fromJson(policyTypeString, ImmutablePolicyType.class)) //
-            .doOnNext(type -> logger.debug("For ric: {}, handling type: {}", ric.getConfig().name(), type.name()))
-            .flatMap(this::addTypeToRepo) //
-            .flatMap(type -> addTypeToRic(ric, type)) //
-            .flatMap(type -> deletePoliciesForType(ric, type)) //
-            .subscribe();
-        return Mono.just(ric);
-    }
-
-    private Mono<PolicyType> addTypeToRepo(PolicyType policyType) {
-        if (!policyTypes.contains(policyType)) {
-            policyTypes.put(policyType);
+        for (RicConfig ricConfig : applicationConfig.getRicConfigs()) {
+            rics.put(new Ric(ricConfig));
         }
-        return Mono.just(policyType);
+        RicRecoveryTask recoveryTask = new RicRecoveryTask(a1Client, policyTypes, policies, services);
+        recoveryTask.run(rics.getRics()); // recover all Rics
     }
 
-    private Mono<PolicyType> addTypeToRic(Ric ric, PolicyType policyType) {
-        ric.addSupportedPolicyType(policyType);
-        return Mono.just(policyType);
-    }
-
-    private Mono<Void> deletePoliciesForType(Ric ric, PolicyType policyType) {
-        a1Client.getPoliciesForType(ric.getConfig().baseUrl(), policyType.name()) //
-            .doOnNext(policyId -> logger.debug("deleting policy: {}, for ric: {}", policyId, ric.getConfig().name())) //
-            .flatMap(policyId -> a1Client.deletePolicy(ric.getConfig().baseUrl(), policyId)) //
-            .subscribe();
-
-        return Mono.empty();
-    }
-
-    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();
-    }
 }