X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FRepositorySupervision.java;h=7984a62a688dae0feb14ea728e209e3912208304;hb=50e6a619a2f568f949c02dcd8d6656218d422a93;hp=d68c123642d802e051e80c26d1ab17beb91b48c5;hpb=9ed2de339dc86499b5497cfb905fbcc8974d7e16;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java index d68c1236..7984a62a 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java @@ -23,14 +23,15 @@ package org.oransc.policyagent.tasks; import org.oransc.policyagent.clients.A1Client; import org.oransc.policyagent.repository.Policies; import org.oransc.policyagent.repository.Ric; -import org.oransc.policyagent.repository.Rics; import org.oransc.policyagent.repository.Ric.RicState; +import org.oransc.policyagent.repository.Rics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -87,20 +88,20 @@ public class RepositorySupervision { private Mono checkActive(Ric ric) { logger.debug("Handling active ric {}", ric); a1Client.getPolicyIdentities(ric.getConfig().baseUrl()) // - .filter(policyId -> !policies.containsPolicy(policyId)) // - .doOnNext(policyId -> logger.debug("Deleting policy {}", policyId)) - .flatMap(policyId -> a1Client.deletePolicy(ric.getConfig().baseUrl(), policyId)) // - .subscribe(); + .filter(policyId -> !policies.containsPolicy(policyId)) // + .doOnNext(policyId -> logger.debug("Deleting policy {}", policyId)) + .flatMap(policyId -> a1Client.deletePolicy(ric.getConfig().baseUrl(), policyId)) // + .subscribe(); return Mono.just(ric); } private Mono checkNotReachable(Ric ric) { logger.debug("Handling not reachable ric {}", ric); a1Client.getPolicyIdentities(ric.getConfig().baseUrl()) // - .filter(policyId -> !policies.containsPolicy(policyId)) // - .doOnNext(policyId -> logger.debug("Deleting policy {}", policyId)) - .flatMap(policyId -> a1Client.deletePolicy(ric.getConfig().baseUrl(), policyId)) // - .subscribe(null, null, () -> ric.setState(RicState.ACTIVE)); + .filter(policyId -> !policies.containsPolicy(policyId)) // + .doOnNext(policyId -> logger.debug("Deleting policy {}", policyId)) + .flatMap(policyId -> a1Client.deletePolicy(ric.getConfig().baseUrl(), policyId)) // + .subscribe(null, null, () -> ric.setState(RicState.ACTIVE)); return Mono.just(ric); }