X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=enrichment-coordinator-service%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fenrichment%2Ftasks%2FProducerSupervision.java;h=db7c29bacc4357718c75aa08cac28754068414c5;hb=8fd8e9fc86a24be49d61841e381423120a41296d;hp=b4c21d4658ebf9027f4783320322199673686141;hpb=bfe1c4049297589c4ade863b12e3d6a6cb7abc99;p=nonrtric.git

diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/tasks/ProducerSupervision.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/tasks/ProducerSupervision.java
index b4c21d46..db7c29ba 100644
--- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/tasks/ProducerSupervision.java
+++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/tasks/ProducerSupervision.java
@@ -20,14 +20,13 @@
 
 package org.oransc.enrichment.tasks;
 
-import org.oransc.enrichment.clients.AsyncRestClient;
-import org.oransc.enrichment.clients.AsyncRestClientFactory;
 import org.oransc.enrichment.configuration.ApplicationConfig;
-import org.oransc.enrichment.controllers.consumer.ConsumerCallbacks;
-import org.oransc.enrichment.repository.EiJobs;
-import org.oransc.enrichment.repository.EiProducer;
-import org.oransc.enrichment.repository.EiProducers;
-import org.oransc.enrichment.repository.EiTypes;
+import org.oransc.enrichment.controllers.a1e.A1eCallbacks;
+import org.oransc.enrichment.controllers.r1producer.ProducerCallbacks;
+import org.oransc.enrichment.repository.InfoJob;
+import org.oransc.enrichment.repository.InfoJobs;
+import org.oransc.enrichment.repository.InfoProducer;
+import org.oransc.enrichment.repository.InfoProducers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +36,10 @@ import org.springframework.stereotype.Component;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.util.retry.Retry;
 
 /**
- * Regularly checks the availability of the EI Producers
+ * Regularly checks the availability of the Info Producers
  */
 @Component
 @EnableScheduling
@@ -47,20 +47,17 @@ import reactor.core.publisher.Mono;
 public class ProducerSupervision {
     private static final Logger logger = LoggerFactory.getLogger(ProducerSupervision.class);
 
-    private final EiProducers eiProducers;
-    private final EiJobs eiJobs;
-    private final EiTypes eiTypes;
-    private final AsyncRestClient restClient;
-    private final ConsumerCallbacks consumerCallbacks;
+    private final InfoProducers infoProducers;
+    private final InfoJobs infoJobs;
+    private final ProducerCallbacks producerCallbacks;
+    private final A1eCallbacks consumerCallbacks;
 
     @Autowired
-    public ProducerSupervision(ApplicationConfig applicationConfig, EiProducers eiProducers, EiJobs eiJobs,
-        EiTypes eiTypes, ConsumerCallbacks consumerCallbacks) {
-        AsyncRestClientFactory restClientFactory = new AsyncRestClientFactory(applicationConfig.getWebClientConfig());
-        this.restClient = restClientFactory.createRestClientNoHttpProxy("");
-        this.eiJobs = eiJobs;
-        this.eiProducers = eiProducers;
-        this.eiTypes = eiTypes;
+    public ProducerSupervision(ApplicationConfig applicationConfig, InfoProducers infoProducers, InfoJobs infoJobs,
+        ProducerCallbacks producerCallbacks, A1eCallbacks consumerCallbacks) {
+        this.infoProducers = infoProducers;
+        this.infoJobs = infoJobs;
+        this.producerCallbacks = producerCallbacks;
         this.consumerCallbacks = consumerCallbacks;
     }
 
@@ -70,31 +67,46 @@ public class ProducerSupervision {
         createTask().subscribe(null, null, () -> logger.debug("Checking all Producers completed"));
     }
 
-    public Flux<EiProducer> createTask() {
-        return Flux.fromIterable(eiProducers.getAllProducers()) //
+    public Flux<InfoProducer> createTask() {
+        return Flux.fromIterable(infoProducers.getAllProducers()) //
             .flatMap(this::checkOneProducer);
     }
 
-    private Mono<EiProducer> checkOneProducer(EiProducer producer) {
-        return restClient.get(producer.getProducerSupervisionCallbackUrl()) //
+    private Mono<InfoProducer> checkOneProducer(InfoProducer producer) {
+        return this.producerCallbacks.healthCheck(producer) //
             .onErrorResume(throwable -> {
                 handleNonRespondingProducer(throwable, producer);
                 return Mono.empty();
             })//
             .doOnNext(response -> handleRespondingProducer(response, producer))
-            .flatMap(response -> Mono.just(producer));
+            .flatMap(response -> checkProducerJobs(producer)) //
+            .flatMap(responses -> Mono.just(producer));
     }
 
-    private void handleNonRespondingProducer(Throwable throwable, EiProducer producer) {
+    private Mono<?> checkProducerJobs(InfoProducer producer) {
+        final int MAX_CONCURRENCY = 10;
+        return getEiJobs(producer) //
+            .filter(infoJob -> !producer.isJobEnabled(infoJob)) //
+            .flatMap(infoJob -> producerCallbacks.startInfoJob(producer, infoJob, Retry.max(1)), MAX_CONCURRENCY) //
+            .collectList() //
+            .flatMapMany(startedJobs -> consumerCallbacks.notifyJobStatus(producer.getInfoTypes())) //
+            .collectList();
+    }
+
+    private Flux<InfoJob> getEiJobs(InfoProducer producer) {
+        return Flux.fromIterable(producer.getInfoTypes()) //
+            .flatMap(infoType -> Flux.fromIterable(infoJobs.getJobsForType(infoType)));
+    }
+
+    private void handleNonRespondingProducer(Throwable throwable, InfoProducer producer) {
         logger.warn("Unresponsive producer: {} exception: {}", producer.getId(), throwable.getMessage());
         producer.setAliveStatus(false);
         if (producer.isDead()) {
-            this.eiProducers.deregisterProducer(producer, this.eiTypes, this.eiJobs);
-            this.consumerCallbacks.notifyConsumersProducerDeleted(producer);
+            this.infoProducers.deregisterProducer(producer);
         }
     }
 
-    private void handleRespondingProducer(String response, EiProducer producer) {
+    private void handleRespondingProducer(String response, InfoProducer producer) {
         logger.debug("{}", response);
         producer.setAliveStatus(true);
     }