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=a6accbbf8e1360695e9e45ab536e4c7b83e5dbd3;hpb=8b92754714856090ad81f5a18aa9c93e6b19fe99;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 a6accbbf..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,15 +20,14 @@
 
 package org.oransc.policyagent.tasks;
 
-import java.util.Vector;
-import org.oransc.policyagent.clients.RicClient;
+import org.oransc.policyagent.clients.A1Client;
 import org.oransc.policyagent.configuration.ApplicationConfig;
 import org.oransc.policyagent.configuration.RicConfig;
-import org.oransc.policyagent.repository.PolicyType;
+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;
@@ -52,36 +51,36 @@ public class StartupService {
     PolicyTypes policyTypes;
 
     @Autowired
-    private RicClient ricClient;
+    private A1Client a1Client;
 
-    StartupService(ApplicationConfig appConfig, Rics rics, PolicyTypes policyTypes, RicClient ricClient) {
+    @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.ricClient = ricClient;
+        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();
-        Vector<RicConfig> ricConfigs = applicationConfig.getRicConfigs();
-        for (RicConfig ricConfig : ricConfigs) {
-            Ric ric = new Ric(ricConfig);
-            String baseUrl = ricConfig.baseUrl();
-            ricClient.deleteAllPolicies(baseUrl);
-            Vector<PolicyType> types = ricClient.getPolicyTypes(baseUrl);
-            for (PolicyType policyType : types) {
-                if (!policyTypes.contains(policyType)) {
-                    policyTypes.put(policyType);
-                }
-            }
-            ric.addSupportedPolicyTypes(types);
-            ric.setState(RicState.ACTIVE);
-            rics.put(ric);
+        for (RicConfig ricConfig : applicationConfig.getRicConfigs()) {
+            rics.put(new Ric(ricConfig));
         }
-
+        RicRecoveryTask recoveryTask = new RicRecoveryTask(a1Client, policyTypes, policies, services);
+        recoveryTask.run(rics.getRics()); // recover all Rics
     }
 
 }