X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FRicRecoveryTask.java;h=543fdf8220bd0bcc60858a8aff1c6b7390dcff10;hb=f3461cb776023b950d62edd25eca148b6d354c9c;hp=fb41e2607c19f5353312ba5b2861baa60aa4c818;hpb=cc53bb179ee61d77290c3831fc75dc5f3e972aac;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicRecoveryTask.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicRecoveryTask.java
index fb41e260..543fdf82 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicRecoveryTask.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicRecoveryTask.java
@@ -20,10 +20,10 @@
 
 package org.oransc.policyagent.tasks;
 
-import java.util.Collection;
 import java.util.Vector;
 
 import org.oransc.policyagent.clients.A1Client;
+import org.oransc.policyagent.clients.A1ClientFactory;
 import org.oransc.policyagent.clients.AsyncRestClient;
 import org.oransc.policyagent.exceptions.ServiceException;
 import org.oransc.policyagent.repository.ImmutablePolicyType;
@@ -32,7 +32,6 @@ import org.oransc.policyagent.repository.Policy;
 import org.oransc.policyagent.repository.PolicyType;
 import org.oransc.policyagent.repository.PolicyTypes;
 import org.oransc.policyagent.repository.Ric;
-import org.oransc.policyagent.repository.Rics;
 import org.oransc.policyagent.repository.Service;
 import org.oransc.policyagent.repository.Services;
 import org.slf4j.Logger;
@@ -42,32 +41,29 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
- * Loads information about RealTime-RICs at startup.
+ * Recovery handling of RIC, which means:
+ * - load all policy types
+ * - send all policy instances to the RIC
+ * --- if that fails remove all policy instances
+ * - Notify subscribing services
  */
 public class RicRecoveryTask {
 
     private static final Logger logger = LoggerFactory.getLogger(RicRecoveryTask.class);
 
-    private final A1Client a1Client;
+    private final A1ClientFactory a1ClientFactory;
     private final PolicyTypes policyTypes;
     private final Policies policies;
     private final Services services;
 
-    public RicRecoveryTask(A1Client a1Client, PolicyTypes policyTypes, Policies policies, Services services) {
-        this.a1Client = a1Client;
+    public RicRecoveryTask(A1ClientFactory a1ClientFactory, PolicyTypes policyTypes, Policies policies,
+        Services services) {
+        this.a1ClientFactory = a1ClientFactory;
         this.policyTypes = policyTypes;
         this.policies = policies;
         this.services = services;
     }
 
-    public void run(Rics rics) {
-        synchronized (rics) {
-            for (Ric ric : rics.getRics()) {
-                run(ric);
-            }
-        }
-    }
-
     public void run(Ric ric) {
         logger.debug("Handling ric: {}", ric.getConfig().name());
 
@@ -77,16 +73,22 @@ public class RicRecoveryTask {
             }
             ric.setState(Ric.RicState.RECOVERING);
         }
-        Flux<PolicyType> recoveredTypes = recoverPolicyTypes(ric);
-        Flux<?> deletedPolicies = deletePolicies(ric);
-
-        Flux.merge(recoveredTypes, deletedPolicies) //
+        this.a1ClientFactory.createA1Client(ric)//
+            .flatMapMany(client -> startRecover(ric, client)) //
             .subscribe(x -> logger.debug("Recover: " + x), //
-                throwable -> onError(ric, throwable), //
-                () -> onComplete(ric));
+                throwable -> onRecoveryError(ric, throwable), //
+                () -> onRecoveryComplete(ric));
+    }
+
+    private Flux<Object> startRecover(Ric ric, A1Client a1Client) {
+        Flux<PolicyType> recoverTypes = recoverPolicyTypes(ric, a1Client);
+        Flux<?> deletePoliciesInRic = a1Client.deleteAllPolicies();
+        Flux<?> recreatePoliciesInRic = recreateAllPoliciesInRic(ric, a1Client);
+
+        return Flux.concat(recoverTypes, deletePoliciesInRic, recreatePoliciesInRic);
     }
 
-    private void onComplete(Ric ric) {
+    private void onRecoveryComplete(Ric ric) {
         logger.debug("Recovery completed for:" + ric.name());
         ric.setState(Ric.RicState.IDLE);
         notifyAllServices("Recovery completed for:" + ric.name());
@@ -107,8 +109,23 @@ public class RicRecoveryTask {
         }
     }
 
-    private void onError(Ric ric, Throwable t) {
+    private void onRecoveryError(Ric ric, Throwable t) {
         logger.warn("Recovery failed for: {}, reason: {}", ric.name(), t.getMessage());
+        // If recovery fails, try to remove all instances
+        deleteAllPolicies(ric);
+        Flux<PolicyType> recoverTypes = this.a1ClientFactory.createA1Client(ric) //
+            .flatMapMany(a1Client -> recoverPolicyTypes(ric, a1Client));
+        Flux<?> deletePoliciesInRic = this.a1ClientFactory.createA1Client(ric) //
+            .flatMapMany(a1Client -> a1Client.deleteAllPolicies());
+
+        Flux.merge(recoverTypes, deletePoliciesInRic) //
+            .subscribe(x -> logger.debug("Brute recover: " + x), //
+                throwable -> onRemoveAllError(ric, throwable), //
+                () -> onRecoveryComplete(ric));
+    }
+
+    private void onRemoveAllError(Ric ric, Throwable t) {
+        logger.warn("Remove all failed for: {}, reason: {}", ric.name(), t.getMessage());
         ric.setState(Ric.RicState.UNDEFINED);
     }
 
@@ -116,16 +133,16 @@ public class RicRecoveryTask {
         return new AsyncRestClient(url);
     }
 
-    private Flux<PolicyType> recoverPolicyTypes(Ric ric) {
+    private Flux<PolicyType> recoverPolicyTypes(Ric ric, A1Client a1Client) {
         ric.clearSupportedPolicyTypes();
-        return a1Client.getPolicyTypeIdentities(ric.getConfig().baseUrl()) //
+        return a1Client.getPolicyTypeIdentities() //
             .flatMapMany(types -> Flux.fromIterable(types)) //
             .doOnNext(typeId -> logger.debug("For ric: {}, handling type: {}", ric.getConfig().name(), typeId)) //
-            .flatMap((policyTypeId) -> getPolicyType(ric, policyTypeId)) //
+            .flatMap((policyTypeId) -> getPolicyType(ric, policyTypeId, a1Client)) //
             .doOnNext(policyType -> ric.addSupportedPolicyType(policyType)); //
     }
 
-    private Mono<PolicyType> getPolicyType(Ric ric, String policyTypeId) {
+    private Mono<PolicyType> getPolicyType(Ric ric, String policyTypeId, A1Client a1Client) {
         if (policyTypes.contains(policyTypeId)) {
             try {
                 return Mono.just(policyTypes.getType(policyTypeId));
@@ -133,7 +150,7 @@ public class RicRecoveryTask {
                 return Mono.error(e);
             }
         }
-        return a1Client.getPolicyType(ric.getConfig().baseUrl(), policyTypeId) //
+        return a1Client.getPolicyTypeSchema(policyTypeId) //
             .flatMap(schema -> createPolicyType(policyTypeId, schema));
     }
 
@@ -143,17 +160,21 @@ public class RicRecoveryTask {
         return Mono.just(pt);
     }
 
-    private Flux<String> deletePolicies(Ric ric) {
+    private void deleteAllPolicies(Ric ric) {
         synchronized (policies) {
-            Collection<Policy> ricPolicies = new Vector<>(policies.getForRic(ric.name()));
-            for (Policy policy : ricPolicies) {
+            for (Policy policy : policies.getForRic(ric.name())) {
                 this.policies.remove(policy);
             }
         }
+    }
 
-        return a1Client.getPolicyIdentities(ric.getConfig().baseUrl()) //
-            .flatMapMany(policyIds -> Flux.fromIterable(policyIds)) //
-            .doOnNext(policyId -> logger.debug("Deleting policy: {}, for ric: {}", policyId, ric.getConfig().name()))
-            .flatMap(policyId -> a1Client.deletePolicy(ric.getConfig().baseUrl(), policyId)); //
+    private Flux<String> recreateAllPoliciesInRic(Ric ric, A1Client a1Client) {
+        synchronized (policies) {
+            return Flux.fromIterable(new Vector<>(policies.getForRic(ric.name()))) //
+                .doOnNext(
+                    policy -> logger.debug("Recreating policy: {}, for ric: {}", policy.id(), ric.getConfig().name()))
+                .flatMap(policy -> a1Client.putPolicy(policy));
+        }
     }
+
 }